openstack/barbican-tempest-plugin
Code Issues Proposed changes

Merge "Add option to select service type"

Browse Source
This commit is contained in:
Zuul
2026-05-15 15:45:34 +00:00
committed by Gerrit Code Review
parent 7e1a73c2b7 d1cab776db
commit e528bf4c8e
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
barbican_tempest_plugin/config.py
+3
View File
@@ -44,6 +44,9 @@ KeyManagerOpts = [
"If both values are not specified, Tempest avoids tests "
"which require a microversion. Valid values are string "
"with format 'X.Y' or string 'latest'"),
cfg.StrOpt("catalog_type",
default="key-manager",
help="Catalog type of the key manager service."),
cfg.StrOpt('region',
default='regionOne',
help="The barbican region name to use. If no such region is"
barbican_tempest_plugin/services/key_manager/json/base.py
+1 -1
View File
@@ -14,7 +14,7 @@ from tempest.lib.common import rest_client
CONF = config.CONF
_DEFAULT_SERVICE_TYPE = 'key-manager'
_DEFAULT_SERVICE_TYPE = CONF.key_manager.catalog_type
_DEFAULT_REGION = CONF.key_manager.region
_MICROVERSION_HEADER = 'OpenStack-API-Version'
barbican_tempest_plugin/services/key_manager/json/container_client.py
+4 -2
View File
@@ -56,7 +56,8 @@ class ContainerClient(base.BarbicanTempestClient):
def add_secret_to_container(self, container_id, secret_id, **kwargs):
uri = "v1/containers/%s/secrets" % container_id
kwargs['secret_ref'] = "%s/v1/secrets/%s" % (
self.auth_provider.base_url({"service": "key-manager"}),
self.auth_provider.base_url(
{"service": CONF.key_manager.catalog_type}),
secret_id
)
@@ -70,7 +71,8 @@ class ContainerClient(base.BarbicanTempestClient):
def delete_secret_from_container(self, container_id, secret_id, **kwargs):
uri = "v1/containers/%s/secrets" % container_id
kwargs['secret_ref'] = "%s/v1/secrets/%s" % (
self.auth_provider.base_url({"service": "key-manager"}),
self.auth_provider.base_url(
{"service": CONF.key_manager.catalog_type}),
secret_id
)
barbican_tempest_plugin/tests/scenario/barbican_manager.py
+9 -5
View File
@@ -95,16 +95,20 @@ class BarbicanScenarioTest(mgr.ScenarioTest):
os = getattr(cls, 'os_%s' % cls.credentials[0])
os_adm = getattr(cls, 'os_%s' % cls.credentials[1])
cls.consumer_client = os.secret_v1.ConsumerClient(
service='key-manager'
service=CONF.key_manager.catalog_type
)
cls.container_client = os.secret_v1.ContainerClient(
service='key-manager'
service=CONF.key_manager.catalog_type,
)
cls.order_client = os.secret_v1.OrderClient(
service=CONF.key_manager.catalog_type
)
cls.secret_client = os.secret_v1.SecretClient(
service=CONF.key_manager.catalog_type
)
cls.order_client = os.secret_v1.OrderClient(service='key-manager')
cls.secret_client = os.secret_v1.SecretClient(service='key-manager')
cls.secret_consumer_client = os.secret_v1_1.SecretConsumerClient()
cls.secret_metadata_client = os.secret_v1.SecretMetadataClient(
service='key-manager'
service=CONF.key_manager.catalog_type,
)
cls.secret_consumer_client = os.secret_v1_1.VersionClient()