openinfra/python-tempestconf
Code Issues Proposed changes

Fixed get_version method for identity v3

Browse Source 
* Since there is no extension or versions for identity v3.
  which leds to 'version' key error.

Change-Id: Ida8d35eaead90b8f87ee0cecc07f0c88e1114120
This commit is contained in:
Chandan Kumar
2017-10-04 05:59:05 -04:00
parent aac0c65661
commit bc7250eb9a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config_tempest/api_discovery.py
View File

@@ -134,11 +134,9 @@ class IdentityService(VersionedService):
version = '' version = ''
if 'v2' in self.service_url: if 'v2' in self.service_url:
version = '/v2.0' version = '/v2.0'
if 'v3' in self.service_url:
version = ''
url_parse = urlparse.urlparse(self.service_url) url_parse = urlparse.urlparse(self.service_url)
self.service_url = '{}://{}{}'.format( self.service_url = '{}://{}{}'.format(url_parse.scheme,
url_parse.scheme, url_parse.netloc, version) url_parse.netloc, version)
def get_extensions(self): def get_extensions(self):
if 'v2' in self.service_url: if 'v2' in self.service_url:
@@ -158,7 +156,10 @@ class IdentityService(VersionedService):
return [] return []
def deserialize_versions(self, body): def deserialize_versions(self, body):
if 'v2' in self.service_url:
return map(lambda x: x['id'], body['versions']['values']) return map(lambda x: x['id'], body['versions']['values'])
else:
return []
def get_versions(self): def get_versions(self):
return super(IdentityService, self).get_versions(top_level=False) return super(IdentityService, self).get_versions(top_level=False)