openstack/octavia
Code Issues Proposed changes

Merge "Fix initialization of Barbican client"

Browse Source
This commit is contained in:
Zuul 2019-03-31 09:06:05 +00:00 committed by Gerrit Code Review
commit 9e5e5cd22f
2 changed files with 7 additions and 2 deletions
octavia
certificates/common/auth
barbican_acl.py
tests/unit/certificates/common/auth
test_barbican_acl.py

5
octavia/certificates/common/auth/barbican_acl.py

@ -90,4 +90,7 @@ class BarbicanACLAuth(barbican_common.BarbicanAuth):
user_session = session.Session(auth=user_auth)
# create a special barbican client with our user's session
return barbican_client.Client(session=user_session)
return barbican_client.Client(
session=user_session,
region_name=CONF.certificates.region_name,
interface=CONF.certificates.endpoint_type)

4
octavia/tests/unit/certificates/common/auth/test_barbican_acl.py

@ -33,7 +33,7 @@ class TestBarbicanACLAuth(base.TestCase):
# Reset the client
keystone._SESSION = None
self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
self.conf.config(group="certificates", region_name=None)
self.conf.config(group="certificates", region_name='RegionOne')
self.conf.config(group="certificates", endpoint_type='publicURL')
@mock.patch('keystoneauth1.session.Session', mock.Mock())
@ -91,3 +91,5 @@ class TestBarbicanACLAuth(base.TestCase):
bc = acl_auth_object.get_barbican_client_user_auth(mock.Mock())
self.assertTrue(hasattr(bc, 'containers') and
hasattr(bc.containers, 'register_consumer'))
self.assertEqual('publicURL', bc.client.interface)
self.assertEqual('RegionOne', bc.client.region_name)