openstack
/
ceilometer
Code Issues Proposed changes

Merge "Fix swift pollsters that use get_account"

This commit is contained in:
Zuul 2022-06-28 10:35:08 +00:00 committed by Gerrit Code Review
parent b29515fec3 05ac6c5d52
commit 41ac16b5ed
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/objectstore/swift.py
View File

@ -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)

2
ceilometer/tests/unit/objectstore/test_swift.py
View File

@ -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)