diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-12 09:02:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-12 09:02:14 +0000 |
| commit | 6f88ee6be9a3ae5c78587f1a2bc8cd2e9a5a2fa7 (patch) | |
| tree | 612bd3f4879b2f33a3b39a5bfca70aff14f476f1 | |
| parent | 7a127e25d009a981f2b96e7e84bdc277e5ec08ca (diff) | |
| parent | 37bf3efb287e755cff7ab4855ea03d6c15bf9752 (diff) | |
| download | ceilometer-6f88ee6be9a3ae5c78587f1a2bc8cd2e9a5a2fa7.tar.gz | |
Merge "Fix Non-OpenStack dynamic pollster credentials handling"19.0.0.0rc119.0.0
| -rw-r--r-- | ceilometer/polling/dynamic_pollster.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ceilometer/polling/dynamic_pollster.py b/ceilometer/polling/dynamic_pollster.py index bb45b85f..2e9ea4ac 100644 --- a/ceilometer/polling/dynamic_pollster.py +++ b/ceilometer/polling/dynamic_pollster.py @@ -850,6 +850,9 @@ class NonOpenStackApisSamplesGatherer(PollsterSampleGatherer): if 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) authenticator_module_name = definitions['module'] @@ -878,6 +881,17 @@ class NonOpenStackApisSamplesGatherer(PollsterSampleGatherer): 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): request_arguments = super( NonOpenStackApisSamplesGatherer, self).create_request_arguments( |