openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Factorize endpoint retrieval in access"

Browse Source
This commit is contained in:
Jenkins
2013-01-24 22:16:12 +00:00
committed by Gerrit Code Review
parent 2e0ed7fe7b 1f8a263fc4
commit 9392732a3f
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
keystoneclient/access.py
View File

@@ -131,6 +131,17 @@ class AccessInfo(dict):
""" Synonym for project_id """
return self.tenant_id
def _get_identity_endpoint(self, endpoint_type):
if not self.get('serviceCatalog'):
return
identity_services = [x for x in self['serviceCatalog']
if x['type'] == 'identity']
return tuple(endpoint[endpoint_type]
for svc in identity_services
for endpoint in svc['endpoints']
if endpoint_type in endpoint)
@property
def auth_url(self):
""" Returns a tuple of URLs from publicURL and adminURL for the service
@@ -140,17 +151,7 @@ class AccessInfo(dict):
:returns: tuple of urls
"""
return_list = []
if 'serviceCatalog' in self and self['serviceCatalog']:
identity_services = [x for x in self['serviceCatalog']
if x['type'] == 'identity']
for svc in identity_services:
for endpoint in svc['endpoints']:
if 'publicURL' in endpoint:
return_list.append(endpoint['publicURL'])
if len(return_list) > 0:
return tuple(return_list)
return None
return self._get_identity_endpoint('publicURL')
@property
def management_url(self):
@@ -160,14 +161,4 @@ class AccessInfo(dict):
:returns: tuple of urls
"""
return_list = []
if 'serviceCatalog' in self and self['serviceCatalog']:
identity_services = [x for x in self['serviceCatalog']
if x['type'] == 'identity']
for svc in identity_services:
for endpoint in svc['endpoints']:
if 'adminURL' in endpoint:
return_list.append(endpoint['adminURL'])
if len(return_list) > 0:
return tuple(return_list)
return None
return self._get_identity_endpoint('adminURL')