openstack/cinder-tempest-plugin
Code Issues Proposed changes

Merge "Cleanup: unneeded client definition, API override"

Browse Source
This commit is contained in:
Zuul 2024-03-13 17:08:14 +00:00 committed by Gerrit Code Review
commit cb3937363f
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder_tempest_plugin/api/volume/admin/test_consistencygroups.py
View File

@ -28,9 +28,7 @@ CONF = config.CONF
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

7
cinder_tempest_plugin/api/volume/admin/test_volume_backup.py
View File

@ -23,13 +23,6 @@ CONF = config.CONF
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()

8
cinder_tempest_plugin/api/volume/base.py
View File

@ -170,7 +170,7 @@ class BaseVolumeAdminTest(BaseVolumeTest):
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 @@ class BaseVolumeAdminTest(BaseVolumeTest):
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)

1
cinder_tempest_plugin/api/volume/test_volume_revert.py
View File

@ -35,7 +35,6 @@ class VolumeRevertTests(base.BaseVolumeTest):
@classmethod
def setup_clients(cls):
cls._api_version = 3
super(VolumeRevertTests, cls).setup_clients()
manager = cinder_clients.Manager(cls.os_primary)