openstack/python-senlinclient
Code Issues Proposed changes

event-list cannot display correctly according to the sort option

Browse Source 
Closed-Bug:1631572
Sorting related code has been omitted in do_event_list.

Change-Id: I00aa71f0e76062e1e8b7d20f966925d34ba12bbc
This commit is contained in:
miaohb 2016-10-08 15:32:43 +08:00
parent 178232d38b
commit cb4d754aad
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
senlinclient/tests/unit/v1/test_shell.py
View File

@ -1563,6 +1563,7 @@ class ShellTest(testtools.TestCase):
queries['action'] = 'NODE_DELETE' queries['action'] = 'NODE_DELETE'
args = self._make_args(args) args = self._make_args(args)
formatters = {} formatters = {}
sortby_index = None
events = mock.Mock() events = mock.Mock()
service.events.return_value = events service.events.return_value = events
@ -1571,6 +1572,7 @@ class ShellTest(testtools.TestCase):
service.events.assert_called_once_with(**queries) service.events.assert_called_once_with(**queries)
mock_print.assert_called_once_with(events, fields, mock_print.assert_called_once_with(events, fields,
formatters=formatters, formatters=formatters,
sortby_index=sortby_index,
field_labels=field_labels) field_labels=field_labels)
@mock.patch.object(utils, 'print_dict') @mock.patch.object(utils, 'print_dict')

4
senlinclient/v1/shell.py
View File

@ -1455,6 +1455,8 @@ def do_event_list(service, args):
if args.filters: if args.filters:
queries.update(utils.format_parameters(args.filters)) queries.update(utils.format_parameters(args.filters))
sortby_index = None if args.sort else 0
formatters = {} formatters = {}
if not args.full_id: if not args.full_id:
formatters['id'] = lambda x: x.id[:8] formatters['id'] = lambda x: x.id[:8]
@ -1464,7 +1466,7 @@ def do_event_list(service, args):
events = service.events(**queries) events = service.events(**queries)
utils.print_list(events, fields, formatters=formatters, utils.print_list(events, fields, formatters=formatters,
field_labels=field_labels) sortby_index=sortby_index, field_labels=field_labels)
@utils.arg('id', metavar='<EVENT>', @utils.arg('id', metavar='<EVENT>',