Cleanup: unneeded client definition, API override
- do not redefine a few variables for volume(admin and not) and backup clients
when already defined in the base classes;
- define cls.admin_volume_client (same name as in tempest) rather then
admin_volumes_client in the base class for admin volume tests;
- remove any usage and override of _api_version, which is not really used
in the plugin, and it was also removed in tempest (see
I6e05fbe21b29efa128fb59d16bf521d551b00304 )
Even if unused, _api_version still pointed to the deprecated version 2
for consistency group tests.
Change-Id: I3164662932a302b87ae2f346c0005bf7d0ab2927
Luigi Toscano
4 years ago
| 27 | 27 |
class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
|
| 28 | 28 |
@classmethod
|
| 29 | 29 |
def setup_clients(cls):
|
| 30 | |
cls._api_version = 2
|
| 31 | 30 |
super(ConsistencyGroupsV2Test, cls).setup_clients()
|
| 32 | |
cls.admin_volume_client = cls.os_admin.volumes_v2_client
|
| 33 | 31 |
|
| 34 | 32 |
manager = cinder_clients.Manager(cls.os_admin)
|
| 35 | 33 |
cls.consistencygroups_adm_client = manager.consistencygroups_adm_client
|
| 22 | 22 |
|
| 23 | 23 |
|
| 24 | 24 |
class VolumesBackupsTest(base.BaseVolumeAdminTest):
|
| 25 | |
@classmethod
|
| 26 | |
def setup_clients(cls):
|
| 27 | |
super(VolumesBackupsTest, cls).setup_clients()
|
| 28 | |
cls.admin_volume_client = cls.os_admin.volumes_client_latest
|
| 29 | |
cls.backups_client = cls.os_primary.backups_client_latest
|
| 30 | |
cls.volumes_client = cls.os_primary.volumes_client_latest
|
| 31 | |
|
| 32 | 25 |
@classmethod
|
| 33 | 26 |
def skip_checks(cls):
|
| 34 | 27 |
super(VolumesBackupsTest, cls).skip_checks()
|
| 164 | 164 |
|
| 165 | 165 |
cls.admin_volume_types_client = cls.os_admin.volume_types_client_latest
|
| 166 | 166 |
cls.admin_backups_client = cls.os_admin.backups_client_latest
|
| 167 | |
cls.admin_volumes_client = cls.os_admin.volumes_client_latest
|
|
167 |
cls.admin_volume_client = cls.os_admin.volumes_client_latest
|
| 168 | 168 |
|
| 169 | 169 |
@classmethod
|
| 170 | 170 |
def create_volume_type(cls, name=None, **kwargs):
|
|
| 187 | 187 |
type_id = volume_type['id']
|
| 188 | 188 |
type_name = volume_type['name']
|
| 189 | 189 |
|
| 190 | |
volumes = cls.admin_volumes_client.list_volumes(
|
|
190 |
volumes = cls.admin_volume_client.list_volumes(
|
| 191 | 191 |
detail=True, params={'all_tenants': 1})['volumes']
|
| 192 | 192 |
for volume in [v for v in volumes if v['volume_type'] == type_name]:
|
| 193 | 193 |
test_utils.call_and_ignore_notfound_exc(
|
| 194 | |
cls.admin_volumes_client.delete_volume, volume['id'])
|
| 195 | |
cls.admin_volumes_client.wait_for_resource_deletion(volume['id'])
|
|
194 |
cls.admin_volume_client.delete_volume, volume['id'])
|
|
195 |
cls.admin_volume_client.wait_for_resource_deletion(volume['id'])
|
| 196 | 196 |
|
| 197 | 197 |
test_utils.call_and_ignore_notfound_exc(
|
| 198 | 198 |
cls.admin_volume_types_client.delete_volume_type, type_id)
|
| 34 | 34 |
|
| 35 | 35 |
@classmethod
|
| 36 | 36 |
def setup_clients(cls):
|
| 37 | |
cls._api_version = 3
|
| 38 | 37 |
super(VolumeRevertTests, cls).setup_clients()
|
| 39 | 38 |
|
| 40 | 39 |
manager = cinder_clients.Manager(cls.os_primary)
|