openstack
/
tempest
Code Issues Proposed changes

compute: Add volume and placement microversion support to BaseV2ComputeTest 

Allowing BaseV2ComputeTest based test classes to specify
volume|placement_min_microversion and volume|placement_max_microversion.

Change-Id: If69f0456dc40b923b550bc648caaf0cb1a16e086
This commit is contained in:
Lee Yarwood 2020-01-15 10:49:54 +00:00
parent 9ddda2bd01
commit 4b95d4b14f
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tempest/api/compute/base.py
View File

@ -52,12 +52,15 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
super(BaseV2ComputeTest, cls).skip_checks() super(BaseV2ComputeTest, cls).skip_checks()
if not CONF.service_available.nova: if not CONF.service_available.nova:
raise cls.skipException("Nova is not available") raise cls.skipException("Nova is not available")
cfg_min_version = CONF.compute.min_microversion api_version_utils.check_skip_with_microversion(
cfg_max_version = CONF.compute.max_microversion cls.min_microversion, cls.max_microversion,
api_version_utils.check_skip_with_microversion(cls.min_microversion, CONF.compute.min_microversion, CONF.compute.max_microversion)
cls.max_microversion, api_version_utils.check_skip_with_microversion(
cfg_min_version, cls.volume_min_microversion, cls.volume_max_microversion,
cfg_max_version) CONF.volume.min_microversion, CONF.volume.max_microversion)
api_version_utils.check_skip_with_microversion(
cls.placement_min_microversion, cls.placement_max_microversion,
CONF.placement.min_microversion, CONF.placement.max_microversion)
@classmethod @classmethod
def setup_credentials(cls): def setup_credentials(cls):
@ -151,6 +154,14 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
api_version_utils.select_request_microversion( api_version_utils.select_request_microversion(
cls.min_microversion, cls.min_microversion,
CONF.compute.min_microversion)) CONF.compute.min_microversion))
cls.volume_request_microversion = (
api_version_utils.select_request_microversion(
cls.volume_min_microversion,
CONF.volume.min_microversion))
cls.placement_request_microversion = (
api_version_utils.select_request_microversion(
cls.placement_min_microversion,
CONF.placement.min_microversion))
cls.build_interval = CONF.compute.build_interval cls.build_interval = CONF.compute.build_interval
cls.build_timeout = CONF.compute.build_timeout cls.build_timeout = CONF.compute.build_timeout
cls.image_ref = CONF.compute.image_ref cls.image_ref = CONF.compute.image_ref
@ -476,7 +487,9 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
def setUp(self): def setUp(self):
super(BaseV2ComputeTest, self).setUp() super(BaseV2ComputeTest, self).setUp()
self.useFixture(api_microversion_fixture.APIMicroversionFixture( self.useFixture(api_microversion_fixture.APIMicroversionFixture(
compute_microversion=self.request_microversion)) compute_microversion=self.request_microversion,
volume_microversion=self.volume_request_microversion,
placement_microversion=self.placement_request_microversion))
@classmethod @classmethod
def create_volume(cls, image_ref=None, **kwargs): def create_volume(cls, image_ref=None, **kwargs):

4
tempest/lib/common/api_version_utils.py
View File

@ -32,6 +32,10 @@ class BaseMicroversionTest(object):
# (min_microversion, max_microversion) on each test class if necessary. # (min_microversion, max_microversion) on each test class if necessary.
min_microversion = None min_microversion = None
max_microversion = LATEST_MICROVERSION max_microversion = LATEST_MICROVERSION
volume_min_microversion = None
volume_max_microversion = LATEST_MICROVERSION
placement_min_microversion = None
placement_max_microversion = LATEST_MICROVERSION
def check_skip_with_microversion(test_min_version, test_max_version, def check_skip_with_microversion(test_min_version, test_max_version,