openstack/charm-barbican
Code Issues Proposed changes

Drop use of admin-token in tests

Browse Source 
The keystone charm no longer supports the use of the admin-token;
drop its use in the barbican charm functional test suite.

Lowercase domain names when matching to deal with 'Default' as
setup by the new keystone bootstrap process.

Change-Id: Iee2091941d614aa803366e6f5c04d00909f7b1b3
TODO: rewrite tests using Zaza
This commit is contained in:
James Page 2020-03-30 10:40:01 +01:00
parent f87010e246
commit 426f636ad8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/basic_deployment.py
View File

@ -66,7 +66,6 @@ class BarbicanBasicDeployment(OpenStackAmuletDeployment):
"""Configure all of the services.""" """Configure all of the services."""
keystone_config = { keystone_config = {
'admin-password': 'openstack', 'admin-password': 'openstack',
'admin-token': 'ubuntutesting',
} }
# say we don't need an HSM for these tests # say we don't need an HSM for these tests
barbican_config = { barbican_config = {
@ -209,7 +208,6 @@ class BarbicanBasicDeployment(OpenStackAmuletDeployment):
id_relation = unit.relation(*relation) id_relation = unit.relation(*relation)
id_ip = id_relation['private-address'] id_ip = id_relation['private-address']
expected = { expected = {
'admin_token': 'ubuntutesting',
'auth_host': id_ip, 'auth_host': id_ip,
'auth_port': "35357", 'auth_port': "35357",
'auth_protocol': 'http', 'auth_protocol': 'http',
@ -303,7 +301,7 @@ class BarbicanBasicDeployment(OpenStackAmuletDeployment):
# find or create the 'default' domain # find or create the 'default' domain
domain = self._find_or_create( domain = self._find_or_create(
items=self.keystone.domains.list(), items=self.keystone.domains.list(),
key=lambda u: u.name == 'default', key=lambda u: u.name.lower() == 'default',
create=lambda: self.keystone.domains.create( create=lambda: self.keystone.domains.create(
"default", "default",
description="domain for barbican testing", description="domain for barbican testing",