openstack/python-openstackclient
Code Issues Proposed changes

Merge "fix some small issues in catalog show"

Browse Source
This commit is contained in:
Jenkins 2015-01-12 18:14:44 +00:00 committed by Gerrit Code Review
commit a7a1a576e0
1 changed files with 7 additions and 12 deletions

11
openstackclient/identity/v2_0/catalog.py

@ -83,17 +83,12 @@ class ShowCatalog(show.ShowOne):
data = None data = None
for service in sc.get_data(): for service in sc.get_data():
if ( if (service.get('name') == parsed_args.service or
'name' in service and service.get('type') == parsed_args.service):
service['name'] != parsed_args.service and
'type' in service and
service['type'] != parsed_args.service
):
continue
data = service data = service
data['endpoints'] = _format_endpoints(data['endpoints']) data['endpoints'] = _format_endpoints(data['endpoints'])
if 'endpoints_links' in data: if 'endpoints_links' in data:
data.pop('endpoints_links') data.pop('endpoints_links')
break
return zip(*sorted(six.iteritems(data))) return zip(*sorted(six.iteritems(data)))