openstack
/
cinder-tempest-plugin
Code Issues Proposed changes

Merge "Moving API microversion fixture in resource_setup"

This commit is contained in:
Zuul 2024-02-28 22:41:54 +00:00 committed by Gerrit Code Review
parent bda383efae 8992770bad
commit da2f21c732
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder_tempest_plugin/api/volume/base.py
View File

@ -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 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest,
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 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest,
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):

5
cinder_tempest_plugin/rbac/v3/base.py
View File

@ -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 @@ class VolumeV3RbacBaseTests(
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 @@ class VolumeV3RbacBaseTests(
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