openinfra/python-tempestconf
Code Issues Proposed changes

Merge "Fix identity v3 ext discovery"

Browse Source
This commit is contained in:
Zuul 2018-05-22 13:57:35 +00:00 committed by Gerrit Code Review
commit 3c0bc84983
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config_tempest/services/identity.py
View File

@ -59,7 +59,6 @@ class IdentityService(VersionedService):
As keystone V3 uses a JSON Home to store the extensions. As keystone V3 uses a JSON Home to store the extensions.
This method implements a different discovery method. This method implements a different discovery method.
:param keystone_v3_url: Keystone V3 auth url
:return: A list with the discovered extensions :return: A list with the discovered extensions
""" """
try: try:
@ -70,7 +69,7 @@ class IdentityService(VersionedService):
LOG.error("Request on service '%s' with url '%s' failed", LOG.error("Request on service '%s' with url '%s' failed",
'identity', self.service_url) 'identity', self.service_url)
raise re 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()] res = [x for x in json.loads(r.content)['resources'].keys()]
ext = [ex for ex in res if 'ext' in ex] ext = [ex for ex in res if 'ext' in ex]
ext = [str(e).replace(ext_h, '').split('/')[0] for e in ext] ext = [str(e).replace(ext_h, '').split('/')[0] for e in ext]

2
config_tempest/tests/base.py
View File

@ -202,7 +202,7 @@ class BaseServiceTest(base.BaseTestCase):
) )
class FakeRequestResponse(object): 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 = ( FAKE_V3_EXTENSIONS = (
{ {
'resources': { 'resources': {