openstack/python-cinderclient
Code Issues Proposed changes

Pretty print of endpoints for ambiguous error

Browse Source 
Pretty print the list of endpoints by region for ambigous endpoint error

Change-Id: Ia99b6d46b1944db631fc4bd446aeae77abb08262
Closes-Bug: #1241177
This commit is contained in:
Terry Howe 2014-02-24 12:17:49 -07:00
parent 6fd8d8e12e
commit 7f56f0a8c3
1 changed files with 5 additions and 2 deletions

7
cinderclient/service_catalog.py

@ -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]