Fix event list sorting
At the client side, we should not attempt to do sorting again when listing events. Events are already sorted based on timestamp and id. Closes-Bug: #1558882 Change-Id: I2c42123bbde532080d752769a0d821f107e3aad1
This commit is contained in:
@@ -1238,7 +1238,6 @@ class ShellTest(testtools.TestCase):
|
||||
del queries['filters']
|
||||
queries['action'] = 'NODE_DELETE'
|
||||
args = self._make_args(args)
|
||||
sortby_index = None
|
||||
formatters = {}
|
||||
events = mock.Mock()
|
||||
service.events.return_value = events
|
||||
@@ -1247,8 +1246,7 @@ class ShellTest(testtools.TestCase):
|
||||
|
||||
service.events.assert_called_once_with(**queries)
|
||||
mock_print.assert_called_once_with(events, fields,
|
||||
formatters=formatters,
|
||||
sortby_index=sortby_index)
|
||||
formatters=formatters)
|
||||
|
||||
@mock.patch.object(utils, 'print_dict')
|
||||
def test_do_event_show(self, mock_print):
|
||||
|
||||
@@ -1148,15 +1148,13 @@ 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]
|
||||
formatters['obj_id'] = lambda x: x.obj_id[:8] if x.obj_id else ''
|
||||
|
||||
events = service.events(**queries)
|
||||
utils.print_list(events, fields, formatters=formatters,
|
||||
sortby_index=sortby_index)
|
||||
utils.print_list(events, fields, formatters=formatters)
|
||||
|
||||
|
||||
@utils.arg('id', metavar='<EVENT>',
|
||||
|
||||
Reference in New Issue
Block a user