From bc7250eb9af4f641170b4f69c8014733b40ed8a1 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Wed, 4 Oct 2017 05:59:05 -0400 Subject: [PATCH] Fixed get_version method for identity v3 * Since there is no extension or versions for identity v3. which leds to 'version' key error. Change-Id: Ida8d35eaead90b8f87ee0cecc07f0c88e1114120 --- config_tempest/api_discovery.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/config_tempest/api_discovery.py b/config_tempest/api_discovery.py index f7e6d232..59629ded 100644 --- a/config_tempest/api_discovery.py +++ b/config_tempest/api_discovery.py @@ -134,11 +134,9 @@ class IdentityService(VersionedService): version = '' if 'v2' in self.service_url: version = '/v2.0' - if 'v3' in self.service_url: - version = '' - url_parse = urlparse.urlparse(self.service_url) - self.service_url = '{}://{}{}'.format( - url_parse.scheme, url_parse.netloc, version) + url_parse = urlparse.urlparse(self.service_url) + self.service_url = '{}://{}{}'.format(url_parse.scheme, + url_parse.netloc, version) def get_extensions(self): if 'v2' in self.service_url: @@ -158,7 +156,10 @@ class IdentityService(VersionedService): return [] def deserialize_versions(self, body): - return map(lambda x: x['id'], body['versions']['values']) + if 'v2' in self.service_url: + return map(lambda x: x['id'], body['versions']['values']) + else: + return [] def get_versions(self): return super(IdentityService, self).get_versions(top_level=False)