From 77d1e32c9465d63965109a3cbefc93f6aaf54052 Mon Sep 17 00:00:00 2001 From: "OTSUKA, Yuanying" Date: Wed, 2 Sep 2015 13:24:45 +0900 Subject: [PATCH] Fix keystone client usage in barbican client In magnum.common.clients, barbican client uses `keystone()._client` directly, but `keystone().client` is better. Because, keystone()._client is None is it is not loaded. This fixes it. Closes-Bug: #1491257 Change-Id: I3771ebef9c2a1d3756ea4ed2f964751d1c2da43f --- magnum/common/clients.py | 2 +- magnum/tests/unit/common/test_clients.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/magnum/common/clients.py b/magnum/common/clients.py index 5f5474cac9..597a3f68c1 100644 --- a/magnum/common/clients.py +++ b/magnum/common/clients.py @@ -182,7 +182,7 @@ class OpenStackClients(object): endpoint = self.url_for(service_type='key-manager', endpoint_type=endpoint_type, region_name=region_name) - session = self.keystone()._client.session + session = self.keystone().client.session self._barbican = barbicanclient.Client(session=session, endpoint=endpoint) diff --git a/magnum/tests/unit/common/test_clients.py b/magnum/tests/unit/common/test_clients.py index a1914ba3e2..a216a10687 100644 --- a/magnum/tests/unit/common/test_clients.py +++ b/magnum/tests/unit/common/test_clients.py @@ -169,14 +169,14 @@ class ClientsTest(base.BaseTestCase): con.auth_url = "keystone_url" mock_url.return_value = "url_from_keystone" keystone = mock.MagicMock() - keystone._client.session = mock.MagicMock() + keystone.client.session = mock.MagicMock() mock_keystone.return_value = keystone obj = clients.OpenStackClients(con) obj._barbican = None obj.barbican() mock_call.assert_called_once_with( endpoint='url_from_keystone', - session=keystone._client.session) + session=keystone.client.session) mock_keystone.assert_called_once_with() mock_url.assert_called_once_with(service_type='key-manager', @@ -211,7 +211,7 @@ class ClientsTest(base.BaseTestCase): con.auth_url = "keystone_url" mock_url.return_value = "url_from_keystone" keystone = mock.MagicMock() - keystone._client.session = mock.MagicMock() + keystone.client.session = mock.MagicMock() mock_keystone.return_value = keystone obj = clients.OpenStackClients(con) obj._barbican = None