openstack/ceilometer
Code Issues Proposed changes

Merge "Fix Non-OpenStack dynamic pollster credentials handling"

Browse Source
This commit is contained in:
Zuul 2022-09-12 09:02:14 +00:00 committed by Gerrit Code Review
commit 6f88ee6be9
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ceilometer/polling/dynamic_pollster.py
View File

@ -850,6 +850,9 @@ class NonOpenStackApisSamplesGatherer(PollsterSampleGatherer):
if override_credentials: if override_credentials:
credentials = override_credentials credentials = override_credentials
if not isinstance(credentials, str):
credentials = self.normalize_credentials_to_string(credentials)
url = self.get_request_linked_samples_url(kwargs, definitions) url = self.get_request_linked_samples_url(kwargs, definitions)
authenticator_module_name = definitions['module'] authenticator_module_name = definitions['module']
@ -878,6 +881,17 @@ class NonOpenStackApisSamplesGatherer(PollsterSampleGatherer):
return resp, url return resp, url
@staticmethod
def normalize_credentials_to_string(credentials):
if isinstance(credentials, bytes):
credentials = credentials.decode('utf-8')
else:
credentials = str(credentials)
LOG.debug("Credentials [%s] were not defined as a string. "
"Therefore, we converted it to a string like object.",
credentials)
return credentials
def create_request_arguments(self, definitions): def create_request_arguments(self, definitions):
request_arguments = super( request_arguments = super(
NonOpenStackApisSamplesGatherer, self).create_request_arguments( NonOpenStackApisSamplesGatherer, self).create_request_arguments(