From bfcf4b2f69a1b66994388baf9def797ef3276081 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 3 Feb 2021 22:48:23 +0900 Subject: [PATCH] Simplify the reference to barbican parameters ... so that we can easily identify the logics which are referring to configuration parameters. Change-Id: I93427a64b83f474c7c2dd45c8c200e7a3c9bc6f9 --- castellan/key_manager/barbican_key_manager.py | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/castellan/key_manager/barbican_key_manager.py b/castellan/key_manager/barbican_key_manager.py index 374bd552..15027d2a 100644 --- a/castellan/key_manager/barbican_key_manager.py +++ b/castellan/key_manager/barbican_key_manager.py @@ -191,31 +191,30 @@ class BarbicanKeyManager(key_manager.KeyManager): raise exception.Forbidden(reason=msg) def _get_barbican_endpoint(self, auth, sess): - barbican = self.conf.barbican - if barbican.barbican_endpoint: - return barbican.barbican_endpoint + if self.conf.barbican.barbican_endpoint: + return self.conf.barbican.barbican_endpoint elif getattr(auth, 'service_catalog', None): endpoint_data = auth.service_catalog.endpoint_data_for( service_type='key-manager', - interface=barbican.barbican_endpoint_type, - region_name=barbican.barbican_region_name) + interface=self.conf.barbican.barbican_endpoint_type, + region_name=self.conf.barbican.barbican_region_name) return endpoint_data.url else: - service_parameters = {'service_type': 'key-manager', - 'interface': barbican.barbican_endpoint_type, - 'region_name': barbican.barbican_region_name} - return auth.get_endpoint(sess, **service_parameters) + return auth.get_endpoint( + sess, + service_type='key-manager', + interface=self.conf.barbican.barbican_endpoint_type, + region_name=self.conf.barbican.barbican_region_name) def _create_base_url(self, auth, sess, endpoint): - barbican = self.conf.barbican api_version = None - if barbican.barbican_api_version: - api_version = barbican.barbican_api_version + if self.conf.barbican.barbican_api_version: + api_version = self.conf.barbican.barbican_api_version elif getattr(auth, 'service_catalog', None): endpoint_data = auth.service_catalog.endpoint_data_for( service_type='key-manager', - interface=barbican.barbican_endpoint_type, - region_name=barbican.barbican_region_name) + interface=self.conf.barbican.barbican_endpoint_type, + region_name=self.conf.barbican.barbican_region_name) api_version = endpoint_data.api_version elif getattr(auth, 'get_discovery', None): discovery = auth.get_discovery(sess, url=endpoint)