openstack/python-senlinclient
Code Issues Proposed changes

Merge "Make sort keys work for node-list and action-list"

Browse Source
This commit is contained in:
Jenkins
2016-01-04 07:54:36 +00:00
committed by Gerrit Code Review
parent c00408632e df9cbca298
commit 9a25f13533
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1083,7 +1083,7 @@ class ShellTest(testtools.TestCase):
@mock.patch.object(utils, 'print_list')
def test_do_node_list(self, mock_print):
service = mock.Mock()
fields = ['id', 'name', 'status', 'cluster_id', 'physical_id',
fields = ['id', 'name', 'index', 'status', 'cluster_id', 'physical_id',
'profile_name', 'created_at', 'updated_at']
args = {
'cluster': 'cluster1',
@@ -1318,7 +1318,7 @@ class ShellTest(testtools.TestCase):
def test_do_action_list(self, mock_print):
service = mock.Mock()
fields = ['id', 'name', 'action', 'status', 'target', 'depends_on',
'depended_by']
'depended_by', 'created_at']
args = {
'sort_keys': 'status',
'sort_dir': 'asc',

4
senlinclient/v1/shell.py
View File

@@ -873,7 +873,7 @@ def do_cluster_policy_disable(service, args):
def do_node_list(service, args):
"""Show list of nodes."""
fields = ['id', 'name', 'status', 'cluster_id', 'physical_id',
fields = ['id', 'name', 'index', 'status', 'cluster_id', 'physical_id',
'profile_name', 'created_at', 'updated_at']
sort_keys = ['index', 'name', 'created_at', 'updated_at', 'status']
@@ -1255,7 +1255,7 @@ def do_action_list(service, args):
"""List actions."""
fields = ['id', 'name', 'action', 'status', 'target', 'depends_on',
'depended_by']
'depended_by', 'created_at']
sort_keys = ['name', 'target', 'action', 'created_at', 'status']
queries = {