From 4ae1dc847829c74cdd0c2235bde38b8b33215323 Mon Sep 17 00:00:00 2001 From: Maxim Sava Date: Tue, 25 Jun 2024 11:24:06 +0300 Subject: [PATCH] Deprecate `volume_image_dep_tests` We alignment with tempest configuration settings 'enable_volume_image_dep_tests' To keep requirements.txt lower bound up to dated, this bumping the Tempest version to 40.0.0 which include the image dependency configuration - https://review.opendev.org/c/openstack/tempest/+/914198 Change-Id: I6f219122bfe1ba1d3851a5954cb9ffc6e04ad69c --- .../api/volume/test_volume_dependency.py | 15 +++++++++------ cinder_tempest_plugin/config.py | 8 +++++++- cinder_tempest_plugin/scenario/test_snapshots.py | 5 +++-- ...n-volume_image_dep_tests-ba46faab68dfb799.yaml | 6 ++++++ requirements.txt | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/cinder-tempest-plugin-volume_image_dep_tests-ba46faab68dfb799.yaml diff --git a/cinder_tempest_plugin/api/volume/test_volume_dependency.py b/cinder_tempest_plugin/api/volume/test_volume_dependency.py index 5ea067fe..0b0cc8e7 100644 --- a/cinder_tempest_plugin/api/volume/test_volume_dependency.py +++ b/cinder_tempest_plugin/api/volume/test_volume_dependency.py @@ -147,8 +147,9 @@ class VolumeImageDependencyTests(base.BaseVolumeTest): images_client.delete_image(image_id) images_client.wait_for_resource_deletion(image_id) - @testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, - reason='Volume/image dependency tests not enabled.') + @testtools.skipUnless( + CONF.volume_feature_enabled.enable_volume_image_dep_tests, + reason='Volume/image dependency tests not enabled.') @utils.services('image', 'volume') @decorators.idempotent_id('7a9fba78-2e4b-42b1-9898-bb4a60685320') def test_image_volume_dependencies_1(self): @@ -174,8 +175,9 @@ class VolumeImageDependencyTests(base.BaseVolumeTest): self.del_image(image['id']) - @testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, - reason='Volume/image dependency tests not enabled.') + @testtools.skipUnless( + CONF.volume_feature_enabled.enable_volume_image_dep_tests, + reason='Volume/image dependency tests not enabled.') @utils.services('image', 'volume') @decorators.idempotent_id('0e20bd6e-440f-41d8-9b5d-fc047ac00423') def test_image_volume_dependencies_2(self): @@ -210,8 +212,9 @@ class VolumeImageDependencyTests(base.BaseVolumeTest): self.del_image(image['id']) - @testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, - reason='Volume/image dependency tests not enabled.') + @testtools.skipUnless( + CONF.volume_feature_enabled.enable_volume_image_dep_tests, + reason='Volume/image dependency tests not enabled.') @decorators.idempotent_id('e6050452-06bd-4c7f-9912-45178c83e379') @utils.services('image', 'volume') def test_image_volume_dependencies_3(self): diff --git a/cinder_tempest_plugin/config.py b/cinder_tempest_plugin/config.py index 53222b80..3d5eb0ee 100644 --- a/cinder_tempest_plugin/config.py +++ b/cinder_tempest_plugin/config.py @@ -24,7 +24,13 @@ cinder_option = [ help='Enable to run Cinder volume revert tests'), cfg.BoolOpt('volume_image_dep_tests', 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 diff --git a/cinder_tempest_plugin/scenario/test_snapshots.py b/cinder_tempest_plugin/scenario/test_snapshots.py index 02cd6bd6..7b8191b8 100644 --- a/cinder_tempest_plugin/scenario/test_snapshots.py +++ b/cinder_tempest_plugin/scenario/test_snapshots.py @@ -130,8 +130,9 @@ class SnapshotDataIntegrityTests(manager.ScenarioTest): class SnapshotDependencyTests(manager.ScenarioTest): - @testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, - 'dependency tests not enabled') + @testtools.skipUnless( + CONF.volume_feature_enabled.enable_volume_image_dep_tests, + 'dependency tests not enabled') @decorators.idempotent_id('e7028f52-f6d4-479c-8809-6f6cf96cfe0f') @utils.services('image', 'volume') def test_snapshot_removal(self): diff --git a/releasenotes/notes/cinder-tempest-plugin-volume_image_dep_tests-ba46faab68dfb799.yaml b/releasenotes/notes/cinder-tempest-plugin-volume_image_dep_tests-ba46faab68dfb799.yaml new file mode 100644 index 00000000..9390dd98 --- /dev/null +++ b/releasenotes/notes/cinder-tempest-plugin-volume_image_dep_tests-ba46faab68dfb799.yaml @@ -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. diff --git a/requirements.txt b/requirements.txt index c25d1c57..aa631dec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 oslo.config>=5.1.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