Use lib.commom.api_microversion_fixture to set volume, compute API microversion in volume API testing
This patchset use the lib.common.api_microversion_fixture to set the volume and compute microversions in volume API testing. Change-Id: I99fd8589a587fea7ccf3066d6f22a4ae3afd74f5
This commit is contained in:
parent
a47c8afc0e
commit
d458bf3297
|
@ -64,8 +64,8 @@ class BaseGroupSnapshotsTest(base.BaseVolumeAdminTest):
|
|||
class GroupSnapshotsTest(BaseGroupSnapshotsTest):
|
||||
"""Test group snapshot"""
|
||||
|
||||
min_microversion = '3.14'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.14'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
@decorators.idempotent_id('1298e537-f1f0-47a3-a1dd-8adec8168897')
|
||||
def test_group_snapshot_create_show_list_delete(self):
|
||||
|
@ -252,8 +252,8 @@ class GroupSnapshotsTest(BaseGroupSnapshotsTest):
|
|||
class GroupSnapshotsV319Test(BaseGroupSnapshotsTest):
|
||||
"""Test group snapshot with volume microversion greater than 3.18"""
|
||||
|
||||
min_microversion = '3.19'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.19'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
@decorators.idempotent_id('3b42c9b9-c984-4444-816e-ca2e1ed30b40')
|
||||
@decorators.skip_because(bug='1770179')
|
||||
|
|
|
@ -21,8 +21,8 @@ from tempest.lib import exceptions as lib_exc
|
|||
class GroupTypeSpecsTest(base.BaseVolumeAdminTest):
|
||||
"""Test group type specs"""
|
||||
|
||||
min_microversion = '3.11'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.11'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
@decorators.idempotent_id('bb4e30d0-de6e-4f4d-866c-dcc48d023b4e')
|
||||
def test_group_type_specs_create_show_update_list_delete(self):
|
||||
|
|
|
@ -21,8 +21,8 @@ from tempest.lib import decorators
|
|||
class GroupTypesTest(base.BaseVolumeAdminTest):
|
||||
"""Test group types"""
|
||||
|
||||
min_microversion = '3.11'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.11'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
@decorators.idempotent_id('dd71e5f9-393e-4d4f-90e9-fa1b8d278864')
|
||||
def test_group_type_create_list_update_show(self):
|
||||
|
|
|
@ -25,8 +25,8 @@ CONF = config.CONF
|
|||
class GroupsTest(base.BaseVolumeAdminTest):
|
||||
"""Tests of volume groups with microversion greater than 3.12"""
|
||||
|
||||
min_microversion = '3.13'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.13'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
@decorators.idempotent_id('4b111d28-b73d-4908-9bd2-03dc2992e4d4')
|
||||
def test_group_create_show_list_delete(self):
|
||||
|
@ -155,8 +155,8 @@ class GroupsTest(base.BaseVolumeAdminTest):
|
|||
class GroupsV314Test(base.BaseVolumeAdminTest):
|
||||
"""Tests of volume groups with microversion greater than 3.13"""
|
||||
|
||||
min_microversion = '3.14'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.14'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
@decorators.idempotent_id('2424af8c-7851-4888-986a-794b10c3210e')
|
||||
def test_create_group_from_group(self):
|
||||
|
@ -192,8 +192,8 @@ class GroupsV314Test(base.BaseVolumeAdminTest):
|
|||
class GroupsV320Test(base.BaseVolumeAdminTest):
|
||||
"""Tests of volume groups with microversion greater than 3.19"""
|
||||
|
||||
min_microversion = '3.20'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.20'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
@decorators.idempotent_id('b20c696b-0cbc-49a5-8b3a-b1fb9338f45c')
|
||||
def test_reset_group_status(self):
|
||||
|
|
|
@ -24,8 +24,8 @@ CONF = config.CONF
|
|||
class UserMessagesTest(base.BaseVolumeAdminTest):
|
||||
"""Test volume messages with microversion greater than 3.2"""
|
||||
|
||||
min_microversion = '3.3'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.3'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
def _create_user_message(self):
|
||||
"""Trigger a 'no valid host' situation to generate a message."""
|
||||
|
|
|
@ -13,10 +13,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.api.volume import api_microversion_fixture
|
||||
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
|
||||
|
@ -43,7 +43,7 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest,
|
|||
raise cls.skipException(skip_msg)
|
||||
|
||||
api_version_utils.check_skip_with_microversion(
|
||||
cls.min_microversion, cls.max_microversion,
|
||||
cls.volume_min_microversion, cls.volume_max_microversion,
|
||||
CONF.volume.min_microversion, CONF.volume.max_microversion)
|
||||
|
||||
@classmethod
|
||||
|
@ -78,15 +78,20 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest,
|
|||
def setUp(self):
|
||||
super(BaseVolumeTest, self).setUp()
|
||||
self.useFixture(api_microversion_fixture.APIMicroversionFixture(
|
||||
self.request_microversion))
|
||||
compute_microversion=self.compute_request_microversion,
|
||||
volume_microversion=self.volume_request_microversion))
|
||||
|
||||
@classmethod
|
||||
def resource_setup(cls):
|
||||
super(BaseVolumeTest, cls).resource_setup()
|
||||
cls.request_microversion = (
|
||||
cls.volume_request_microversion = (
|
||||
api_version_utils.select_request_microversion(
|
||||
cls.volume_min_microversion,
|
||||
CONF.volume.min_microversion))
|
||||
cls.compute_request_microversion = (
|
||||
api_version_utils.select_request_microversion(
|
||||
cls.min_microversion,
|
||||
CONF.volume.min_microversion))
|
||||
CONF.compute.min_microversion))
|
||||
|
||||
cls.image_ref = CONF.compute.image_ref
|
||||
cls.flavor_ref = CONF.compute.flavor_ref
|
||||
|
|
|
@ -109,8 +109,8 @@ class VolumesTransfersTest(base.BaseVolumeTest):
|
|||
class VolumesTransfersV355Test(VolumesTransfersTest):
|
||||
"""Test volume transfer for the "new" Transfers API mv 3.55"""
|
||||
|
||||
min_microversion = '3.55'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.55'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
credentials = ['primary', 'alt', 'admin']
|
||||
|
||||
|
|
|
@ -164,8 +164,8 @@ class VolumesBackupsTest(base.BaseVolumeTest):
|
|||
class VolumesBackupsV39Test(base.BaseVolumeTest):
|
||||
"""Test volumes backup with volume microversion greater than 3.8"""
|
||||
|
||||
min_microversion = '3.9'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.9'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
@classmethod
|
||||
def skip_checks(cls):
|
||||
|
|
|
@ -80,7 +80,7 @@ class BaseVolumesExtendAttachedTest(base.BaseVolumeTest):
|
|||
# NOTE(mriedem): The minimum required volume API version is 3.42 and the
|
||||
# minimum required compute API microversion is 2.51, but the compute call
|
||||
# is implicit - Cinder calls Nova at that microversion, Tempest does not.
|
||||
min_microversion = '3.42'
|
||||
volume_min_microversion = '3.42'
|
||||
|
||||
def _find_extend_volume_instance_action(self, server_id):
|
||||
actions = self.servers_client.list_instance_actions(
|
||||
|
|
|
@ -143,8 +143,8 @@ class VolumesGetTest(base.BaseVolumeTest):
|
|||
class VolumesSummaryTest(base.BaseVolumeTest):
|
||||
"""Test volume summary"""
|
||||
|
||||
min_microversion = '3.12'
|
||||
max_microversion = 'latest'
|
||||
volume_min_microversion = '3.12'
|
||||
volume_max_microversion = 'latest'
|
||||
|
||||
@decorators.idempotent_id('c4f2431e-4920-4736-9e00-4040386b6feb')
|
||||
def test_show_volume_summary(self):
|
||||
|
|
Loading…
Reference in New Issue