Merge "Cleanup: unneeded client definition, API override"
diff --git a/cinder_tempest_plugin/api/volume/admin/test_consistencygroups.py b/cinder_tempest_plugin/api/volume/admin/test_consistencygroups.py
index 7dff494..42c78f1 100644
--- a/cinder_tempest_plugin/api/volume/admin/test_consistencygroups.py
+++ b/cinder_tempest_plugin/api/volume/admin/test_consistencygroups.py
@@ -28,9 +28,7 @@
class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
@classmethod
def setup_clients(cls):
- cls._api_version = 2
super(ConsistencyGroupsV2Test, cls).setup_clients()
- cls.admin_volume_client = cls.os_admin.volumes_v2_client
manager = cinder_clients.Manager(cls.os_admin)
cls.consistencygroups_adm_client = manager.consistencygroups_adm_client
diff --git a/cinder_tempest_plugin/api/volume/admin/test_volume_backup.py b/cinder_tempest_plugin/api/volume/admin/test_volume_backup.py
index e5ded52..41cfc91 100644
--- a/cinder_tempest_plugin/api/volume/admin/test_volume_backup.py
+++ b/cinder_tempest_plugin/api/volume/admin/test_volume_backup.py
@@ -24,13 +24,6 @@
class VolumesBackupsTest(base.BaseVolumeAdminTest):
@classmethod
- def setup_clients(cls):
- super(VolumesBackupsTest, cls).setup_clients()
- cls.admin_volume_client = cls.os_admin.volumes_client_latest
- cls.backups_client = cls.os_primary.backups_client_latest
- cls.volumes_client = cls.os_primary.volumes_client_latest
-
- @classmethod
def skip_checks(cls):
super(VolumesBackupsTest, cls).skip_checks()
if not CONF.volume_feature_enabled.backup:
diff --git a/cinder_tempest_plugin/api/volume/base.py b/cinder_tempest_plugin/api/volume/base.py
index 76d0383..1fd82bf 100644
--- a/cinder_tempest_plugin/api/volume/base.py
+++ b/cinder_tempest_plugin/api/volume/base.py
@@ -170,7 +170,7 @@
cls.admin_volume_types_client = cls.os_admin.volume_types_client_latest
cls.admin_backups_client = cls.os_admin.backups_client_latest
- cls.admin_volumes_client = cls.os_admin.volumes_client_latest
+ cls.admin_volume_client = cls.os_admin.volumes_client_latest
@classmethod
def create_volume_type(cls, name=None, **kwargs):
@@ -193,12 +193,12 @@
type_id = volume_type['id']
type_name = volume_type['name']
- volumes = cls.admin_volumes_client.list_volumes(
+ volumes = cls.admin_volume_client.list_volumes(
detail=True, params={'all_tenants': 1})['volumes']
for volume in [v for v in volumes if v['volume_type'] == type_name]:
test_utils.call_and_ignore_notfound_exc(
- cls.admin_volumes_client.delete_volume, volume['id'])
- cls.admin_volumes_client.wait_for_resource_deletion(volume['id'])
+ cls.admin_volume_client.delete_volume, volume['id'])
+ cls.admin_volume_client.wait_for_resource_deletion(volume['id'])
test_utils.call_and_ignore_notfound_exc(
cls.admin_volume_types_client.delete_volume_type, type_id)
diff --git a/cinder_tempest_plugin/api/volume/test_volume_revert.py b/cinder_tempest_plugin/api/volume/test_volume_revert.py
index bf3d806..2c4d6bd 100644
--- a/cinder_tempest_plugin/api/volume/test_volume_revert.py
+++ b/cinder_tempest_plugin/api/volume/test_volume_revert.py
@@ -35,7 +35,6 @@
@classmethod
def setup_clients(cls):
- cls._api_version = 3
super(VolumeRevertTests, cls).setup_clients()
manager = cinder_clients.Manager(cls.os_primary)