event-list cannot display correctly according to the sort option
Closed-Bug:1631572
Sorting related code has been omitted in do_event_list.
Change-Id: I00aa71f0e76062e1e8b7d20f966925d34ba12bbc
(cherry picked from commit cb4d754aad
)
This commit is contained in:
parent
b7e0976d48
commit
65732aac36
|
@ -1545,6 +1545,7 @@ class ShellTest(testtools.TestCase):
|
|||
service = mock.Mock()
|
||||
fields = ['id', 'timestamp', 'obj_type', 'obj_id', 'obj_name',
|
||||
'action', 'status', 'level', 'cluster_id']
|
||||
|
||||
args = {
|
||||
'sort': 'timestamp:asc',
|
||||
'limit': 20,
|
||||
|
@ -1559,6 +1560,7 @@ class ShellTest(testtools.TestCase):
|
|||
queries['action'] = 'NODE_DELETE'
|
||||
args = self._make_args(args)
|
||||
formatters = {}
|
||||
sortby_index = None
|
||||
events = mock.Mock()
|
||||
service.events.return_value = events
|
||||
|
||||
|
@ -1566,7 +1568,8 @@ class ShellTest(testtools.TestCase):
|
|||
|
||||
service.events.assert_called_once_with(**queries)
|
||||
mock_print.assert_called_once_with(events, fields,
|
||||
formatters=formatters)
|
||||
formatters=formatters,
|
||||
sortby_index=sortby_index)
|
||||
|
||||
@mock.patch.object(utils, 'print_dict')
|
||||
def test_do_event_show(self, mock_print):
|
||||
|
|
|
@ -1441,6 +1441,7 @@ def do_event_list(service, args):
|
|||
show_deprecated('senlin event-list', 'openstack cluster event list')
|
||||
fields = ['id', 'timestamp', 'obj_type', 'obj_id', 'obj_name', 'action',
|
||||
'status', 'level', 'cluster_id']
|
||||
|
||||
queries = {
|
||||
'sort': args.sort,
|
||||
'limit': args.limit,
|
||||
|
@ -1451,6 +1452,8 @@ def do_event_list(service, args):
|
|||
if args.filters:
|
||||
queries.update(utils.format_parameters(args.filters))
|
||||
|
||||
sortby_index = None if args.sort else 0
|
||||
|
||||
formatters = {}
|
||||
if not args.full_id:
|
||||
formatters['id'] = lambda x: x.id[:8]
|
||||
|
@ -1459,7 +1462,8 @@ def do_event_list(service, args):
|
|||
if x.cluster_id else '')
|
||||
|
||||
events = service.events(**queries)
|
||||
utils.print_list(events, fields, formatters=formatters)
|
||||
utils.print_list(events, fields, formatters=formatters,
|
||||
sortby_index=sortby_index)
|
||||
|
||||
|
||||
@utils.arg('id', metavar='<EVENT>',
|
||||
|
|
Loading…
Reference in New Issue