From 82a82b7b41b379aa74678f6580fe00b98357f8ab Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Mon, 21 May 2018 12:01:01 +0000 Subject: [PATCH] Fix identity v3 ext discovery Change-Id: I98e46bde0c07be761197ddebaa981af2480e2268 --- config_tempest/services/identity.py | 3 +-- config_tempest/tests/base.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config_tempest/services/identity.py b/config_tempest/services/identity.py index 6706e8ce..a1329bb4 100644 --- a/config_tempest/services/identity.py +++ b/config_tempest/services/identity.py @@ -59,7 +59,6 @@ class IdentityService(VersionedService): As keystone V3 uses a JSON Home to store the extensions. This method implements a different discovery method. - :param keystone_v3_url: Keystone V3 auth url :return: A list with the discovered extensions """ try: @@ -70,7 +69,7 @@ class IdentityService(VersionedService): LOG.error("Request on service '%s' with url '%s' failed", 'identity', self.service_url) raise re - ext_h = 'http://docs.openstack.org/api/openstack-identity/3/ext/' + ext_h = 'https://docs.openstack.org/api/openstack-identity/3/ext/' res = [x for x in json.loads(r.content)['resources'].keys()] ext = [ex for ex in res if 'ext' in ex] ext = [str(e).replace(ext_h, '').split('/')[0] for e in ext] diff --git a/config_tempest/tests/base.py b/config_tempest/tests/base.py index 19e9aa48..5a1079b7 100644 --- a/config_tempest/tests/base.py +++ b/config_tempest/tests/base.py @@ -202,7 +202,7 @@ class BaseServiceTest(base.BaseTestCase): ) class FakeRequestResponse(object): - URL = 'http://docs.openstack.org/api/openstack-identity/3/ext/' + URL = 'https://docs.openstack.org/api/openstack-identity/3/ext/' FAKE_V3_EXTENSIONS = ( { 'resources': {