diff options
| author | Zuul <zuul@review.opendev.org> | 2023-05-10 17:23:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-05-10 17:23:18 +0000 |
| commit | dcf0a545da784da163b78e1db6032db8732bb042 (patch) | |
| tree | 75b9505fbc665980db795c42ac4c6512782b2039 | |
| parent | ebeae1540aa512f7dda1f667051b48123a272148 (diff) | |
| parent | dcae2040026da432721687a36716b6b9c3e01078 (diff) | |
| download | ceilometer-dcf0a545da784da163b78e1db6032db8732bb042.tar.gz | |
Merge "Fix barbican credentials retrieval" into stable/yoga
| -rw-r--r-- | ceilometer/polling/discovery/non_openstack_credentials_discovery.py | 2 | ||||
| -rw-r--r-- | ceilometer/tests/unit/polling/test_non_openstack_credentials_discovery.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ceilometer/polling/discovery/non_openstack_credentials_discovery.py b/ceilometer/polling/discovery/non_openstack_credentials_discovery.py index 61459452..0b3ccec8 100644 --- a/ceilometer/polling/discovery/non_openstack_credentials_discovery.py +++ b/ceilometer/polling/discovery/non_openstack_credentials_discovery.py @@ -38,7 +38,7 @@ class NonOpenStackCredentialsDiscovery(EndpointDiscovery): if not param: return [barbican_secret] barbican_endpoints = super(NonOpenStackCredentialsDiscovery, - self).discover("key-manager") + self).discover(manager, "key-manager") if not barbican_endpoints: LOG.warning("No Barbican endpoints found to execute the" " credentials discovery process to [%s].", diff --git a/ceilometer/tests/unit/polling/test_non_openstack_credentials_discovery.py b/ceilometer/tests/unit/polling/test_non_openstack_credentials_discovery.py index c1fffd87..4e257415 100644 --- a/ceilometer/tests/unit/polling/test_non_openstack_credentials_discovery.py +++ b/ceilometer/tests/unit/polling/test_non_openstack_credentials_discovery.py @@ -95,8 +95,8 @@ class TestNonOpenStackCredentialsDiscovery(base.BaseTestCase): @mock.patch('keystoneclient.v2_0.client.Client') def test_discover_response_ok(self, client_mock): - def discover_mock(self, manager, param=None): - return ["barbican_url"] + discover_mock = mock.MagicMock() + discover_mock.return_value = ["barbican_url"] original_discover_method = EndpointDiscovery.discover EndpointDiscovery.discover = discover_mock @@ -108,9 +108,11 @@ class TestNonOpenStackCredentialsDiscovery(base.BaseTestCase): client_mock.session.get.return_value = return_value - response = self.discovery.discover( - manager=self.FakeManager(client_mock), param="param") + fake_manager = self.FakeManager(client_mock) + response = self.discovery.discover(manager=fake_manager, param="param") self.assertEqual(["content"], response) + discover_mock.assert_has_calls([ + mock.call(fake_manager, "key-manager")]) EndpointDiscovery.discover = original_discover_method |