openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Revert "Allow display project-id for server groups""

This commit is contained in:
Jenkins 2015-10-05 20:56:52 +00:00 committed by Gerrit Code Review
parent f62086fb38 469d06837c
commit 03f1f67ccd
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
novaclient/tests/unit/v2/test_shell.py
View File

@ -2497,8 +2497,7 @@ class ShellTest(utils.TestCase):
self.run_command('server-group-create wjsg affinity')
self.assert_called('POST', '/os-server-groups',
{'server_group': {'name': 'wjsg',
'policies': ['affinity']}},
pos=0)
'policies': ['affinity']}})
def test_delete_multi_server_groups(self):
self.run_command('server-group-delete 12345 56789')

8
novaclient/v2/shell.py
View File

@ -4473,13 +4473,7 @@ def do_availability_zone_list(cs, _args):
def _print_server_group_details(server_group):
# This is for compatible with Nova v2 API, remove after v2
# is dropped.
if hasattr(server_group, 'project_id'):
columns = ['Id', 'Name', 'Project_id', 'Policies',
'Members', 'Metadata']
else:
columns = ['Id', 'Name', 'Policies', 'Members', 'Metadata']
columns = ['Id', 'Name', 'Policies', 'Members', 'Metadata']
utils.print_list(server_group, columns)