Merge "Tests with signed volumes"
diff --git a/.zuul.yaml b/.zuul.yaml
index 1f543fc..2f38e5d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -7,6 +7,7 @@
jobs:
- barbican-tempest-plugin-simple-crypto
- barbican-tempest-plugin-simple-crypto-secure-rbac
+ - barbican-tempest-plugin-simple-crypto-2023-1
- barbican-tempest-plugin-simple-crypto-zed
- barbican-tempest-plugin-simple-crypto-yoga
- barbican-tempest-plugin-simple-crypto-xena
@@ -58,6 +59,19 @@
- barbican-tempest-plugin
- job:
+ name: barbican-tempest-plugin-simple-crypto-2023-1
+ parent: barbican-tempest-plugin-simple-crypto
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2023.1
+ vars:
+ devstack_local_conf:
+ test-config:
+ $TEMPEST_CONFIG:
+ key_manager:
+ min_microversion: '1.0'
+ max_microversion: '1.1'
+
+- job:
name: barbican-tempest-plugin-simple-crypto-zed
parent: barbican-tempest-plugin-simple-crypto
nodeset: openstack-single-node-focal
@@ -95,6 +109,9 @@
parent: barbican-tempest-plugin-simple-crypto
nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
+ required-projects:
+ - name: opendev.org/openstack/barbican-tempest-plugin
+ override-checkout: wallaby-last
vars: *microversion_v1_0
- job:
@@ -102,6 +119,9 @@
parent: barbican-tempest-plugin-simple-crypto
nodeset: openstack-single-node-focal
override-checkout: stable/victoria
+ required-projects:
+ - name: opendev.org/openstack/barbican-tempest-plugin
+ override-checkout: victoria-last
vars: *microversion_v1_0
- job:
@@ -109,6 +129,9 @@
parent: barbican-tempest-plugin-simple-crypto
nodeset: openstack-single-node-bionic
override-checkout: stable/ussuri
+ required-projects:
+ - name: opendev.org/openstack/barbican-tempest-plugin
+ override-checkout: ussuri-last
vars: *microversion_v1_0
- job:
@@ -116,6 +139,9 @@
parent: barbican-tempest-plugin-simple-crypto
nodeset: openstack-single-node-bionic
override-checkout: stable/train
+ required-projects:
+ - name: opendev.org/openstack/barbican-tempest-plugin
+ override-checkout: train-last
vars: *microversion_v1_0
- job:
@@ -128,19 +154,21 @@
oslo_policy:
enforce_new_defaults: True
enforce_scope: True
- secretstore:
- enable_multiple_secret_stores: True
- stores_lookup_suffix: simple_crypto
- secretstore:simple_crypto:
- secret_store_plugin: store_crypto
- crypto_plugin: simple_crypto
- global_default: true
+ # (lpiwowar): Uncomment once this bug is resolved:
+ # https://bugs.launchpad.net/barbican/+bug/2043457
+ # secretstore:
+ # enable_multiple_secret_stores: True
+ # stores_lookup_suffix: simple_crypto
+ # secretstore:simple_crypto:
+ # secret_store_plugin: store_crypto
+ # crypto_plugin: simple_crypto
+ # global_default: true
test-config:
$TEMPEST_CONFIG:
barbican_rbac_scope_verification:
enforce_scope: True
- barbican_tempest:
- enable_multiple_secret_stores: True
+ # barbican_tempest:
+ # enable_multiple_secret_stores: True
- job:
name: barbican-tempest-plugin-simple-crypto-secure-rbac-yoga
@@ -161,6 +189,9 @@
parent: barbican-tempest-plugin-simple-crypto-secure-rbac
nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
+ required-projects:
+ - name: opendev.org/openstack/barbican-tempest-plugin
+ override-checkout: wallaby-last
vars: *microversion_v1_0
- job:
@@ -189,6 +220,9 @@
parent: barbican-tempest-plugin-simple-crypto-ipv6-only
nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
+ required-projects:
+ - name: opendev.org/openstack/barbican-tempest-plugin
+ override-checkout: wallaby-last
vars: *microversion_v1_0
- job:
@@ -196,6 +230,9 @@
parent: barbican-tempest-plugin-simple-crypto-ipv6-only
nodeset: openstack-single-node-focal
override-checkout: stable/victoria
+ required-projects:
+ - name: opendev.org/openstack/barbican-tempest-plugin
+ override-checkout: victoria-last
vars: *microversion_v1_0
- job:
@@ -203,6 +240,9 @@
parent: barbican-tempest-plugin-simple-crypto-ipv6-only
nodeset: openstack-single-node-bionic
override-checkout: stable/ussuri
+ required-projects:
+ - name: opendev.org/openstack/barbican-tempest-plugin
+ override-checkout: ussuri-last
vars: *microversion_v1_0
- job:
@@ -210,6 +250,9 @@
parent: barbican-tempest-plugin-simple-crypto-ipv6-only
nodeset: openstack-single-node-bionic
override-checkout: stable/train
+ required-projects:
+ - name: opendev.org/openstack/barbican-tempest-plugin
+ override-checkout: train-last
vars: *microversion_v1_0
- job:
diff --git a/barbican_tempest_plugin/tests/rbac/v1/test_secrets.py b/barbican_tempest_plugin/tests/rbac/v1/test_secrets.py
index bdd56b2..baccb97 100644
--- a/barbican_tempest_plugin/tests/rbac/v1/test_secrets.py
+++ b/barbican_tempest_plugin/tests/rbac/v1/test_secrets.py
@@ -645,6 +645,18 @@
super().setup_clients()
cls.client = cls.admin_secret_client
+ def test_delete_other_project_secret(self):
+ other_secret_id = self.create_other_project_secret(
+ 'get_other_payload',
+ payload='loremipsumloremipsum')
+ self.client.delete_secret(other_secret_id)
+
+ def test_get_other_project_secret(self):
+ other_secret_id = self.create_other_project_secret(
+ 'get_other_secret',
+ payload='¡Muy secreto!')
+ self.client.get_secret_metadata(other_secret_id)
+
class ProjectAdminV1_1Tests(ProjectMemberV1_1Tests):
diff --git a/barbican_tempest_plugin/tests/scenario/manager.py b/barbican_tempest_plugin/tests/scenario/manager.py
index b7f8914..cb4e52c 100644
--- a/barbican_tempest_plugin/tests/scenario/manager.py
+++ b/barbican_tempest_plugin/tests/scenario/manager.py
@@ -16,7 +16,6 @@
from oslo_log import log
-from tempest.common import image as common_image
from tempest.common import waiters
from tempest import config
from tempest.lib.common.utils import data_utils
@@ -46,24 +45,16 @@
'name': name,
'container_format': fmt,
'disk_format': disk_format or fmt,
+ 'visibility': 'private'
}
- if CONF.image_feature_enabled.api_v1:
- params['is_public'] = 'False'
- params['properties'] = properties
- params = {'headers': common_image.image_meta_to_headers(**params)}
- else:
- params['visibility'] = 'private'
- # Additional properties are flattened out in the v2 API.
- params.update(properties)
+ # Additional properties are flattened out in the v2 API.
+ params.update(properties)
body = self.image_client.create_image(**params)
image = body['image'] if 'image' in body else body
self.addCleanup(self.image_client.delete_image, image['id'])
self.assertEqual("queued", image['status'])
with open(path, 'rb') as image_file:
- if CONF.image_feature_enabled.api_v1:
- self.image_client.update_image(image['id'], data=image_file)
- else:
- self.image_client.store_image_file(image['id'], image_file)
+ self.image_client.store_image_file(image['id'], image_file)
if CONF.image_feature_enabled.import_image:
available_stores = []