openstack/python-cinderclient
Code Issues Proposed changes

Merge "Pretty print of endpoints for ambiguous error"

Browse Source
This commit is contained in:
Jenkins
2014-06-16 15:48:56 +00:00
committed by Gerrit Code Review
parent 0039f1d389 7f56f0a8c3
commit a87ee75285
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cinderclient/service_catalog.py
View File

@@ -79,7 +79,10 @@ class ServiceCatalog(object):
if not matching_endpoints: if not matching_endpoints:
raise cinderclient.exceptions.EndpointNotFound() raise cinderclient.exceptions.EndpointNotFound()
elif len(matching_endpoints) > 1: elif len(matching_endpoints) > 1:
raise cinderclient.exceptions.AmbiguousEndpoints( try:
endpoints=matching_endpoints) eplist = [ep[attr] for ep in matching_endpoints]
except KeyError:
eplist = matching_endpoints
raise cinderclient.exceptions.AmbiguousEndpoints(endpoints=eplist)
else: else:
return matching_endpoints[0][endpoint_type] return matching_endpoints[0][endpoint_type]