Remove remaining usage of cinder v1 API call from Tempest
Cinder v1 API tests have been removed from Tempest - I04de2d90fe11f8ec4acbfa983bc0ad3aa979f45b There are few other tests like compute, scenario which makes call to Cinder v1 API based on api_v1 is configured. We should cleanup those to go with v2 directly and later those will be directed to make v2/v3 APIs. Change-Id: I0685a74a80ff845bd0d787bc43fac1c608ee4710
This commit is contained in:
parent
4df2338ded
commit
3bd0d2bbd1
|
@ -94,10 +94,7 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
|
|||
cls.os.security_group_default_rules_client)
|
||||
cls.versions_client = cls.os.compute_versions_client
|
||||
|
||||
if CONF.volume_feature_enabled.api_v1:
|
||||
cls.volumes_client = cls.os.volumes_client
|
||||
else:
|
||||
cls.volumes_client = cls.os.volumes_v2_client
|
||||
cls.volumes_client = cls.os.volumes_v2_client
|
||||
|
||||
@classmethod
|
||||
def resource_setup(cls):
|
||||
|
|
|
@ -47,13 +47,8 @@ class BaseOrchestrationTest(tempest.test.BaseTestCase):
|
|||
cls.servers_client = cls.os.servers_client
|
||||
cls.keypairs_client = cls.os.keypairs_client
|
||||
cls.networks_client = cls.os.networks_client
|
||||
cls.volumes_client = cls.os.volumes_client
|
||||
cls.images_v2_client = cls.os.image_client_v2
|
||||
|
||||
if CONF.volume_feature_enabled.api_v2:
|
||||
cls.volumes_client = cls.os.volumes_v2_client
|
||||
else:
|
||||
cls.volumes_client = cls.os.volumes_client
|
||||
cls.volumes_client = cls.os.volumes_v2_client
|
||||
|
||||
@classmethod
|
||||
def resource_setup(cls):
|
||||
|
|
|
@ -35,18 +35,10 @@ class CinderResourcesTest(base.BaseOrchestrationTest):
|
|||
self.assertEqual('available', volume.get('status'))
|
||||
self.assertEqual(CONF.volume.volume_size, volume.get('size'))
|
||||
|
||||
# Some volume properties have been renamed with Cinder v2
|
||||
if CONF.volume_feature_enabled.api_v2:
|
||||
description_field = 'description'
|
||||
name_field = 'name'
|
||||
else:
|
||||
description_field = 'display_description'
|
||||
name_field = 'display_name'
|
||||
|
||||
self.assertEqual(template['resources']['volume']['properties'][
|
||||
'description'], volume.get(description_field))
|
||||
'description'], volume.get('description'))
|
||||
self.assertEqual(template['resources']['volume']['properties'][
|
||||
'name'], volume.get(name_field))
|
||||
'name'], volume.get('name'))
|
||||
|
||||
def _outputs_verify(self, stack_identifier, template):
|
||||
self.assertEqual('available',
|
||||
|
|
|
@ -132,11 +132,7 @@ def create_test_server(clients, validatable=False, validation_resources=None,
|
|||
if volume_backed:
|
||||
volume_name = data_utils.rand_name(__name__ + '-volume')
|
||||
volumes_client = clients.volumes_v2_client
|
||||
name_field = 'name'
|
||||
if not CONF.volume_feature_enabled.api_v2:
|
||||
volumes_client = clients.volumes_client
|
||||
name_field = 'display_name'
|
||||
params = {name_field: volume_name,
|
||||
params = {'name': volume_name,
|
||||
'imageRef': image_id,
|
||||
'size': CONF.volume.volume_size}
|
||||
volume = volumes_client.create_volume(**params)
|
||||
|
|
|
@ -1241,14 +1241,9 @@ class EncryptionScenarioTest(ScenarioTest):
|
|||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(EncryptionScenarioTest, cls).setup_clients()
|
||||
if CONF.volume_feature_enabled.api_v2:
|
||||
cls.admin_volume_types_client = cls.os_adm.volume_types_v2_client
|
||||
cls.admin_encryption_types_client =\
|
||||
cls.os_adm.encryption_types_v2_client
|
||||
else:
|
||||
cls.admin_volume_types_client = cls.os_adm.volume_types_client
|
||||
cls.admin_encryption_types_client =\
|
||||
cls.os_adm.encryption_types_client
|
||||
cls.admin_volume_types_client = cls.os_adm.volume_types_v2_client
|
||||
cls.admin_encryption_types_client =\
|
||||
cls.os_adm.encryption_types_v2_client
|
||||
|
||||
def create_encryption_type(self, client=None, type_id=None, provider=None,
|
||||
key_size=None, cipher=None,
|
||||
|
|
|
@ -40,10 +40,7 @@ class TestVolumeMigrateRetypeAttached(manager.ScenarioTest):
|
|||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestVolumeMigrateRetypeAttached, cls).setup_clients()
|
||||
if CONF.volume_feature_enabled.api_v1:
|
||||
cls.admin_volume_types_client = cls.os_adm.volume_types_client
|
||||
else:
|
||||
cls.admin_volume_types_client = cls.os_adm.volume_types_v2_client
|
||||
cls.admin_volume_types_client = cls.os_adm.volume_types_v2_client
|
||||
|
||||
@classmethod
|
||||
def skip_checks(cls):
|
||||
|
|
Loading…
Reference in New Issue