openstack/python-novaclient
Code Issues Proposed changes

Merge "Don't display duplicated security groups"

Browse Source
This commit is contained in:
Jenkins 2014-09-16 03:44:24 +00:00 committed by Gerrit Code Review
commit ce115063bb
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
novaclient/v1_1/shell.py
View File

@ -1626,8 +1626,11 @@ def _print_server(cs, args, server=None):
flavor_id) flavor_id)
if 'security_groups' in info: if 'security_groups' in info:
info['security_groups'] = \ # when we have multiple nics the info will include the
', '.join(group['name'] for group in info['security_groups']) # security groups N times where N == number of nics. Be nice
# and only display it once.
info['security_groups'] = ', '.join(
sorted(set(group['name'] for group in info['security_groups'])))
image = info.get('image', {}) image = info.get('image', {})
if image: if image:

7
novaclient/v3/shell.py
View File

@ -1334,6 +1334,13 @@ def _print_server(cs, args, server=None):
info['flavor'] = '%s (%s)' % (_find_flavor(cs, flavor_id).name, info['flavor'] = '%s (%s)' % (_find_flavor(cs, flavor_id).name,
flavor_id) flavor_id)
if 'security_groups' in info:
# when we have multiple nics the info will include the
# security groups N times where N == number of nics. Be nice
# and only display it once.
info['security_groups'] = ', '.join(
sorted(set(group['name'] for group in info['security_groups'])))
image = info.get('image', {}) image = info.get('image', {})
if image: if image:
image_id = image.get('id', '') image_id = image.get('id', '')