diff --git a/cinder_tempest_plugin/api/volume/base.py b/cinder_tempest_plugin/api/volume/base.py index ea6bd2e..76d0383 100644 --- a/cinder_tempest_plugin/api/volume/base.py +++ b/cinder_tempest_plugin/api/volume/base.py @@ -16,7 +16,6 @@ from tempest.common import compute from tempest.common import waiters from tempest import config -from tempest.lib.common import api_microversion_fixture from tempest.lib.common import api_version_utils from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils @@ -57,8 +56,6 @@ def setUp(self): super(BaseVolumeTest, self).setUp() - self.useFixture(api_microversion_fixture.APIMicroversionFixture( - volume_microversion=self.request_microversion)) @classmethod def resource_setup(cls): @@ -67,6 +64,8 @@ api_version_utils.select_request_microversion( cls.min_microversion, CONF.volume.min_microversion)) + cls.setup_api_microversion_fixture( + volume_microversion=cls.request_microversion) @classmethod def create_volume(cls, wait_until='available', **kwargs): diff --git a/cinder_tempest_plugin/rbac/v3/base.py b/cinder_tempest_plugin/rbac/v3/base.py index af724a3..6fc6be5 100644 --- a/cinder_tempest_plugin/rbac/v3/base.py +++ b/cinder_tempest_plugin/rbac/v3/base.py @@ -13,7 +13,6 @@ from tempest.common import waiters from tempest import config -from tempest.lib.common import api_microversion_fixture from tempest.lib.common import api_version_utils from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils @@ -51,8 +50,6 @@ def setUp(self): super(VolumeV3RbacBaseTests, self).setUp() - self.useFixture(api_microversion_fixture.APIMicroversionFixture( - volume_microversion=self.request_microversion)) @classmethod def resource_setup(cls): @@ -61,6 +58,8 @@ api_version_utils.select_request_microversion( cls.min_microversion, CONF.volume.min_microversion)) + cls.setup_api_microversion_fixture( + volume_microversion=cls.request_microversion) def do_request(self, method, expected_status=200, client=None, **payload): """Perform API call