openstack/cinder-tempest-plugin
Code Issues Proposed changes

Merge "Deprecate volume_image_dep_tests"

Browse Source
This commit is contained in:
Zuul
2025-03-05 20:10:37 +00:00
committed by Gerrit Code Review
parent 6083cccd5d 4ae1dc8478
commit bb5594c061
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cinder_tempest_plugin/api/volume/test_volume_dependency.py
View File

@@ -147,8 +147,9 @@ class VolumeImageDependencyTests(base.BaseVolumeTest):
images_client.delete_image(image_id) images_client.delete_image(image_id)
images_client.wait_for_resource_deletion(image_id) images_client.wait_for_resource_deletion(image_id)
@testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, @testtools.skipUnless(
reason='Volume/image dependency tests not enabled.') CONF.volume_feature_enabled.enable_volume_image_dep_tests,
reason='Volume/image dependency tests not enabled.')
@utils.services('image', 'volume') @utils.services('image', 'volume')
@decorators.idempotent_id('7a9fba78-2e4b-42b1-9898-bb4a60685320') @decorators.idempotent_id('7a9fba78-2e4b-42b1-9898-bb4a60685320')
def test_image_volume_dependencies_1(self): def test_image_volume_dependencies_1(self):
@@ -174,8 +175,9 @@ class VolumeImageDependencyTests(base.BaseVolumeTest):
self.del_image(image['id']) self.del_image(image['id'])
@testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, @testtools.skipUnless(
reason='Volume/image dependency tests not enabled.') CONF.volume_feature_enabled.enable_volume_image_dep_tests,
reason='Volume/image dependency tests not enabled.')
@utils.services('image', 'volume') @utils.services('image', 'volume')
@decorators.idempotent_id('0e20bd6e-440f-41d8-9b5d-fc047ac00423') @decorators.idempotent_id('0e20bd6e-440f-41d8-9b5d-fc047ac00423')
def test_image_volume_dependencies_2(self): def test_image_volume_dependencies_2(self):
@@ -210,8 +212,9 @@ class VolumeImageDependencyTests(base.BaseVolumeTest):
self.del_image(image['id']) self.del_image(image['id'])
@testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, @testtools.skipUnless(
reason='Volume/image dependency tests not enabled.') CONF.volume_feature_enabled.enable_volume_image_dep_tests,
reason='Volume/image dependency tests not enabled.')
@decorators.idempotent_id('e6050452-06bd-4c7f-9912-45178c83e379') @decorators.idempotent_id('e6050452-06bd-4c7f-9912-45178c83e379')
@utils.services('image', 'volume') @utils.services('image', 'volume')
def test_image_volume_dependencies_3(self): def test_image_volume_dependencies_3(self):

8
cinder_tempest_plugin/config.py
View File

@@ -24,7 +24,13 @@ cinder_option = [
help='Enable to run Cinder volume revert tests'), help='Enable to run Cinder volume revert tests'),
cfg.BoolOpt('volume_image_dep_tests', cfg.BoolOpt('volume_image_dep_tests',
default=True, default=True,
help='Run tests for dependencies between images and volumes') help='Run tests for dependencies between images and volumes',
deprecated_for_removal=True,
deprecated_reason='Dependency test config setting '
'`volume_image_dep_tests` '
'in cinder-tempest-plugin is deprecated.Alternatively '
'`CONF.volume_feature_enabled.enable_volume_image_dep_tests` '
'can be used for dependency tests.')
] ]
# The barbican service is discovered by config_tempest [1], and will appear # The barbican service is discovered by config_tempest [1], and will appear

5
cinder_tempest_plugin/scenario/test_snapshots.py
View File

@@ -130,8 +130,9 @@ class SnapshotDataIntegrityTests(manager.ScenarioTest):
class SnapshotDependencyTests(manager.ScenarioTest): class SnapshotDependencyTests(manager.ScenarioTest):
@testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, @testtools.skipUnless(
'dependency tests not enabled') CONF.volume_feature_enabled.enable_volume_image_dep_tests,
'dependency tests not enabled')
@decorators.idempotent_id('e7028f52-f6d4-479c-8809-6f6cf96cfe0f') @decorators.idempotent_id('e7028f52-f6d4-479c-8809-6f6cf96cfe0f')
@utils.services('image', 'volume') @utils.services('image', 'volume')
def test_snapshot_removal(self): def test_snapshot_removal(self):

6
releasenotes/notes/cinder-tempest-plugin-volume_image_dep_tests-ba46faab68dfb799.yaml Normal file
View File

@@ -0,0 +1,6 @@
deprecations:
- |
Dependency test config setting 'volume_image_dep_tests'
in cinder-tempest-plugin is deprecated.Alternatively tempest
`CONF.volume_feature_enabled.enable_volume_image_dep_tests` can be used
to for dependency tests.

2
requirements.txt
View File

@@ -5,4 +5,4 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0
oslo.config>=5.1.0 # Apache-2.0 oslo.config>=5.1.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
tempest>=34.2.0 # Apache-2.0 tempest>=40.0.0 # Apache-2.0