Update tests to use keystoneauth1
With keystoneauth1 sessions the service catalog search function, url_for takes argument interface, no longer named endpoint_type. This change updates tests to use this argument name. Change-Id: I79b4a842772a4f1a850495eb15bb38afd83cda96
This commit is contained in:
parent
51d5f834c4
commit
8eeab53c6d
|
@ -272,7 +272,7 @@ class SoftHSMBasicDeployment(OpenStackAmuletDeployment):
|
||||||
demo_user, admin_role, tenant=tenant))
|
demo_user, admin_role, tenant=tenant))
|
||||||
# now we can finally get the barbican client and create the secret
|
# now we can finally get the barbican client and create the secret
|
||||||
keystone_ep = self.keystone.service_catalog.url_for(
|
keystone_ep = self.keystone.service_catalog.url_for(
|
||||||
service_type='identity', endpoint_type='publicURL')
|
service_type='identity', interface='publicURL')
|
||||||
auth = keystone_identity.v2.Password(
|
auth = keystone_identity.v2.Password(
|
||||||
username=demo_user.name,
|
username=demo_user.name,
|
||||||
password='pass',
|
password='pass',
|
||||||
|
@ -329,7 +329,7 @@ class SoftHSMBasicDeployment(OpenStackAmuletDeployment):
|
||||||
project=demo_project)
|
project=demo_project)
|
||||||
# now we can finally get the barbican client and create the secret
|
# now we can finally get the barbican client and create the secret
|
||||||
keystone_ep = self.keystone.service_catalog.url_for(
|
keystone_ep = self.keystone.service_catalog.url_for(
|
||||||
service_type='identity', endpoint_type='publicURL')
|
service_type='identity', interface='publicURL')
|
||||||
auth = keystone_identity.v3.Password(
|
auth = keystone_identity.v3.Password(
|
||||||
user_domain_name=domain.name,
|
user_domain_name=domain.name,
|
||||||
username=demo_user.name,
|
username=demo_user.name,
|
||||||
|
@ -342,7 +342,7 @@ class SoftHSMBasicDeployment(OpenStackAmuletDeployment):
|
||||||
sess = keystone_session.Session(auth=auth)
|
sess = keystone_session.Session(auth=auth)
|
||||||
# Authenticate admin with barbican endpoint
|
# Authenticate admin with barbican endpoint
|
||||||
barbican_ep = self.keystone.service_catalog.url_for(
|
barbican_ep = self.keystone.service_catalog.url_for(
|
||||||
service_type='key-manager', endpoint_type='publicURL')
|
service_type='key-manager', interface='publicURL')
|
||||||
barbican = barbican_client.Client(session=sess,
|
barbican = barbican_client.Client(session=sess,
|
||||||
endpoint=barbican_ep)
|
endpoint=barbican_ep)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue