Replace all volume client aliases with _latest suffix

Use aliases with _latest suffix instead of v2 or v3 for clients.

Change-Id: Ie17b9abca60d943bce0b62997b1f58a56963314d
Story: 2003377
Task: 24452
This commit is contained in:
Sergey Vilgelm 2018-11-07 10:46:16 -06:00
parent 742b73767b
commit 596bebd246
No known key found for this signature in database
GPG Key ID: 08D0E2FF778887E6
12 changed files with 20 additions and 17 deletions

View File

@ -32,10 +32,10 @@ class BaseVolumeRbacTest(rbac_utils.RbacUtilsMixin,
def setup_clients(cls):
super(BaseVolumeRbacTest, cls).setup_clients()
cls.setup_rbac_utils()
cls.volume_hosts_client = cls.os_primary.volume_hosts_v2_client
cls.volume_types_client = cls.os_primary.volume_types_v2_client
cls.groups_client = cls.os_primary.groups_v3_client
cls.group_types_client = cls.os_primary.group_types_v3_client
cls.volume_hosts_client = cls.os_primary.volume_hosts_client_latest
cls.volume_types_client = cls.os_primary.volume_types_client_latest
cls.groups_client = cls.os_primary.groups_client_latest
cls.group_types_client = cls.os_primary.group_types_client_latest
@classmethod
def create_volume_type(cls, name=None, **kwargs):

View File

@ -32,8 +32,9 @@ class CapabilitiesV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_clients(cls):
super(CapabilitiesV3RbacTest, cls).setup_clients()
cls.capabilities_client = cls.os_primary.volume_capabilities_v2_client
cls.hosts_client = cls.os_primary.volume_hosts_v2_client
cls.capabilities_client = \
cls.os_primary.volume_capabilities_client_latest
cls.hosts_client = cls.os_primary.volume_hosts_client_latest
@rbac_rule_validation.action(service="cinder",
rules=["volume_extension:capabilities"])

View File

@ -56,7 +56,8 @@ class EncryptionTypesV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_clients(cls):
super(EncryptionTypesV3RbacTest, cls).setup_clients()
cls.encryption_types_client = cls.os_primary.encryption_types_v2_client
cls.encryption_types_client = \
cls.os_primary.encryption_types_client_latest
def _create_volume_type_encryption(self):
vol_type_id = self.create_volume_type()['id']

View File

@ -75,7 +75,7 @@ class GroupSnaphotsV314RbacTest(BaseGroupSnapshotsRbacTest):
def setup_clients(cls):
super(GroupSnaphotsV314RbacTest, cls).setup_clients()
cls.group_snapshot_client = \
cls.os_primary.group_snapshots_v3_client
cls.os_primary.group_snapshots_client_latest
def setUp(self):
super(GroupSnaphotsV314RbacTest, self).setUp()
@ -172,7 +172,7 @@ class GroupSnaphotsV319RbacTest(BaseGroupSnapshotsRbacTest):
def setup_clients(cls):
super(GroupSnaphotsV319RbacTest, cls).setup_clients()
cls.group_snapshot_client = \
cls.os_primary.group_snapshots_v3_client
cls.os_primary.group_snapshots_client_latest
def setUp(self):
super(GroupSnaphotsV319RbacTest, self).setUp()

View File

@ -27,7 +27,7 @@ class VolumeQOSV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_clients(cls):
super(VolumeQOSV3RbacTest, cls).setup_clients()
cls.qos_client = cls.os_primary.volume_qos_v2_client
cls.qos_client = cls.os_primary.volume_qos_client_latest
def _create_test_qos_specs(self, name=None, consumer=None, **kwargs):
name = name or data_utils.rand_name(self.__class__.__name__ + '-QoS')

View File

@ -33,7 +33,7 @@ class SchedulerStatsV3RbacTest(rbac_base.BaseVolumeRbacTest):
def setup_clients(cls):
super(SchedulerStatsV3RbacTest, cls).setup_clients()
cls.scheduler_stats_client =\
cls.os_primary.volume_scheduler_stats_v2_client
cls.os_primary.volume_scheduler_stats_client_latest
@rbac_rule_validation.action(
service="cinder",

View File

@ -40,7 +40,8 @@ class SnapshotManageRbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_clients(cls):
super(SnapshotManageRbacTest, cls).setup_clients()
cls.snapshot_manage_client = cls.os_primary.snapshot_manage_v2_client
cls.snapshot_manage_client = \
cls.os_primary.snapshot_manage_client_latest
@classmethod
def resource_setup(cls):

View File

@ -31,7 +31,7 @@ class MessagesV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_clients(cls):
super(MessagesV3RbacTest, cls).setup_clients()
cls.messages_client = cls.os_primary.volume_v3_messages_client
cls.messages_client = cls.os_primary.volume_messages_client_latest
def _create_user_message(self):
"""Trigger a 'no valid host' situation to generate a message."""

View File

@ -32,7 +32,7 @@ class VolumeQuotasV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_clients(cls):
super(VolumeQuotasV3RbacTest, cls).setup_clients()
cls.quotas_client = cls.os_primary.volume_quotas_v2_client
cls.quotas_client = cls.os_primary.volume_quotas_client_latest
def _restore_default_quota_set(self):
default_quota_set = self.quotas_client.show_default_quota_set(

View File

@ -36,7 +36,7 @@ class VolumeServicesV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_clients(cls):
super(VolumeServicesV3RbacTest, cls).setup_clients()
cls.services_client = cls.os_primary.volume_services_v2_client
cls.services_client = cls.os_primary.volume_services_client_latest
@decorators.idempotent_id('b9134f01-97c0-4abd-9455-fe2f03e3f966')
@rbac_rule_validation.action(

View File

@ -26,7 +26,7 @@ class VolumesTransfersV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_clients(cls):
super(VolumesTransfersV3RbacTest, cls).setup_clients()
cls.transfers_client = cls.os_primary.volume_transfers_v2_client
cls.transfers_client = cls.os_primary.volume_transfers_client_latest
@classmethod
def resource_setup(cls):

View File

@ -41,7 +41,7 @@ class VolumesManageV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_clients(cls):
super(VolumesManageV3RbacTest, cls).setup_clients()
cls.volume_manage_client = cls.os_primary.volume_manage_v2_client
cls.volume_manage_client = cls.os_primary.volume_manage_client_latest
def _manage_volume(self, org_volume):
# Manage volume