Merge "Deprecate `volume_image_dep_tests`"
Zuul authored 1 year, 2 months ago
Gerrit Code Review committed 1 year, 2 months ago
| 146 | 146 | images_client.delete_image(image_id) |
| 147 | 147 | images_client.wait_for_resource_deletion(image_id) |
| 148 | 148 | |
| 149 | @testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, | |
| 150 | reason='Volume/image dependency tests not enabled.') | |
| 149 | @testtools.skipUnless( | |
| 150 | CONF.volume_feature_enabled.enable_volume_image_dep_tests, | |
| 151 | reason='Volume/image dependency tests not enabled.') | |
| 151 | 152 | @utils.services('image', 'volume') |
| 152 | 153 | @decorators.idempotent_id('7a9fba78-2e4b-42b1-9898-bb4a60685320') |
| 153 | 154 | def test_image_volume_dependencies_1(self): |
| 173 | 174 | |
| 174 | 175 | self.del_image(image['id']) |
| 175 | 176 | |
| 176 | @testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, | |
| 177 | reason='Volume/image dependency tests not enabled.') | |
| 177 | @testtools.skipUnless( | |
| 178 | CONF.volume_feature_enabled.enable_volume_image_dep_tests, | |
| 179 | reason='Volume/image dependency tests not enabled.') | |
| 178 | 180 | @utils.services('image', 'volume') |
| 179 | 181 | @decorators.idempotent_id('0e20bd6e-440f-41d8-9b5d-fc047ac00423') |
| 180 | 182 | def test_image_volume_dependencies_2(self): |
| 209 | 211 | |
| 210 | 212 | self.del_image(image['id']) |
| 211 | 213 | |
| 212 | @testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, | |
| 213 | reason='Volume/image dependency tests not enabled.') | |
| 214 | @testtools.skipUnless( | |
| 215 | CONF.volume_feature_enabled.enable_volume_image_dep_tests, | |
| 216 | reason='Volume/image dependency tests not enabled.') | |
| 214 | 217 | @decorators.idempotent_id('e6050452-06bd-4c7f-9912-45178c83e379') |
| 215 | 218 | @utils.services('image', 'volume') |
| 216 | 219 | def test_image_volume_dependencies_3(self): |
| 23 | 23 | help='Enable to run Cinder volume revert tests'), |
| 24 | 24 | cfg.BoolOpt('volume_image_dep_tests', |
| 25 | 25 | default=True, |
| 26 | help='Run tests for dependencies between images and volumes') | |
| 26 | help='Run tests for dependencies between images and volumes', | |
| 27 | deprecated_for_removal=True, | |
| 28 | deprecated_reason='Dependency test config setting ' | |
| 29 | '`volume_image_dep_tests` ' | |
| 30 | 'in cinder-tempest-plugin is deprecated.Alternatively ' | |
| 31 | '`CONF.volume_feature_enabled.enable_volume_image_dep_tests` ' | |
| 32 | 'can be used for dependency tests.') | |
| 27 | 33 | ] |
| 28 | 34 | |
| 29 | 35 | # The barbican service is discovered by config_tempest [1], and will appear |
| 129 | 129 | |
| 130 | 130 | |
| 131 | 131 | class SnapshotDependencyTests(manager.ScenarioTest): |
| 132 | @testtools.skipUnless(CONF.volume_feature_enabled.volume_image_dep_tests, | |
| 133 | 'dependency tests not enabled') | |
| 132 | @testtools.skipUnless( | |
| 133 | CONF.volume_feature_enabled.enable_volume_image_dep_tests, | |
| 134 | 'dependency tests not enabled') | |
| 134 | 135 | @decorators.idempotent_id('e7028f52-f6d4-479c-8809-6f6cf96cfe0f') |
| 135 | 136 | @utils.services('image', 'volume') |
| 136 | 137 | def test_snapshot_removal(self): |
+6
-0
| 0 | deprecations: | |
| 1 | - | | |
| 2 | Dependency test config setting 'volume_image_dep_tests' | |
| 3 | in cinder-tempest-plugin is deprecated.Alternatively tempest | |
| 4 | `CONF.volume_feature_enabled.enable_volume_image_dep_tests` can be used | |
| 5 | to for dependency tests. |