arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attempt to force ldap tests to use keystone v3 api

Browse Source
This commit is contained in:
Adam Dyess
2020-01-29 09:17:28 -06:00
parent 416c85b08f
commit 51f7f2cfa7
2 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zaza/openstack/charm_tests/keystone/__init__.py
View File

@@ -13,6 +13,7 @@
# limitations under the License.
"""Collection of code for setting up and testing keystone."""
import contextlib
import zaza
import zaza.openstack.charm_tests.test_utils as test_utils
import zaza.openstack.utilities.openstack as openstack_utils
@@ -59,3 +60,12 @@ class BaseKeystoneTest(test_utils.OpenStackBaseTest):
openstack_utils.get_keystone_session_client(
cls.admin_keystone_session,
client_api_version=cls.default_api_version))
@contextlib.contextmanager
def v3_keystone_preferred(self):
"""Set the preferred keystone api to v3 within called context."""
with self.config_change(
{'preferred-api-version': self.default_api_version},
{'preferred-api-version': '3'},
application_name="keystone"):
yield

55
zaza/openstack/charm_tests/keystone/tests.py
View File

@@ -188,10 +188,7 @@ class AuthenticationAuthorizationTest(BaseKeystoneTest):
openstack_utils.get_os_release('trusty_mitaka')):
logging.info('skipping test < trusty_mitaka')
return
with self.config_change(
{'preferred-api-version': self.default_api_version},
{'preferred-api-version': '3'},
application_name="keystone"):
with self.v3_keystone_preferred():
for ip in self.keystone_ips:
try:
logging.info('keystone IP {}'.format(ip))
@@ -221,10 +218,7 @@ class AuthenticationAuthorizationTest(BaseKeystoneTest):
openstack_utils.get_os_release('xenial_ocata')):
logging.info('skipping test < xenial_ocata')
return
with self.config_change(
{'preferred-api-version': self.default_api_version},
{'preferred-api-version': '3'},
application_name="keystone"):
with self.v3_keystone_preferred():
for ip in self.keystone_ips:
openrc = {
'API_VERSION': 3,
@@ -405,18 +399,28 @@ class LdapTests(BaseKeystoneTest):
:return: return username if found
:rtype: Optional[str]
"""
client = openstack_utils.get_keystone_session_client(
self.admin_keystone_session,
client_api_version=3)
for ip in self.keystone_ips:
try:
logging.info('keystone IP {}'.format(ip))
ks_session = openstack_utils.get_keystone_session(
openstack_utils.get_overcloud_auth(address=ip))
ks_client = openstack_utils.get_keystone_session_client(
ks_session)
domain_users = ks_client.users.list(
domain=ks_client.domains.find(name=domain).id
)
usernames = []
for user in domain_users:
usernames.append(user.name)
if username.lower() == user.name.lower():
return user
except keystoneauth1.exceptions.http.HTTPError as e:
raise zaza_exceptions.KeystoneAuthorizationStrict(
'Retrieve domain list as admin FAILED. ({})'.format(e)
)
domain_users = client.users.list(
domain=client.domains.find(name=domain).id
)
usernames = []
for user in domain_users:
usernames.append(user.name)
if username.lower() == user.name.lower():
return user
logging.debug(
"User {} was not in these users: {}. Returning None."
.format(username, usernames)
@@ -440,9 +444,10 @@ class LdapTests(BaseKeystoneTest):
states=test_config.get("target_deploy_status", {})
)
# NOTE(jamespage): Test fixture should have johndoe and janedoe
# accounts
johndoe = self._find_keystone_v3_user('john doe', 'userdomain')
self.assertIsNotNone(johndoe, "user 'john doe' was unknown")
janedoe = self._find_keystone_v3_user('jane doe', 'userdomain')
self.assertIsNotNone(janedoe, "user 'jane doe' was unknown")
with self.v3_keystone_preferred():
# NOTE(jamespage): Test fixture should have johndoe and janedoe
# accounts
johndoe = self._find_keystone_v3_user('john doe', 'userdomain')
self.assertIsNotNone(johndoe, "user 'john doe' was unknown")
janedoe = self._find_keystone_v3_user('jane doe', 'userdomain')
self.assertIsNotNone(janedoe, "user 'jane doe' was unknown")