diff options
| author | Zuul <zuul@review.opendev.org> | 2022-06-28 10:35:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-06-28 10:35:08 +0000 |
| commit | 41ac16b5ed2bb1b58c686f246d611db0b3914c33 (patch) | |
| tree | aa48482b8e474b99c37b4833cbf852c1ecb63bd9 /ceilometer | |
| parent | b29515fec3cba9f3987b7d9b329d09811b899907 (diff) | |
| parent | 05ac6c5d52f94ee4129c521974430fa582323bb6 (diff) | |
| download | ceilometer-41ac16b5ed2bb1b58c686f246d611db0b3914c33.tar.gz | |
Merge "Fix swift pollsters that use get_account"
Diffstat (limited to 'ceilometer')
| -rw-r--r-- | ceilometer/objectstore/swift.py | 2 | ||||
| -rw-r--r-- | ceilometer/tests/unit/objectstore/test_swift.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py index c0a27201..9a5b852c 100644 --- a/ceilometer/objectstore/swift.py +++ b/ceilometer/objectstore/swift.py @@ -93,7 +93,7 @@ class _Base(plugin_base.PollsterBase): yield (t.id, swift_api_method( None, keystone_client.get_auth_token(ksclient), - http_conn)) + http_conn=http_conn)) except ClientException as e: if e.http_status == 404: LOG.warning("Swift tenant id %s not found.", t.id) diff --git a/ceilometer/tests/unit/objectstore/test_swift.py b/ceilometer/tests/unit/objectstore/test_swift.py index c2bdd3fc..31283087 100644 --- a/ceilometer/tests/unit/objectstore/test_swift.py +++ b/ceilometer/tests/unit/objectstore/test_swift.py @@ -207,7 +207,7 @@ class TestSwiftPollster(testscenarios.testcase.WithScenarios, self.assertEqual(expected, mock_connection.call_args_list) expected = [mock.call(None, self.manager._auth_token, - mock_connection.return_value) + http_conn=mock_connection.return_value) for t in ASSIGNED_TENANTS] self.assertEqual(expected, mock_method.call_args_list) |