diff --git a/patrole_tempest_plugin/tests/api/volume/rbac_base.py b/patrole_tempest_plugin/tests/api/volume/rbac_base.py index 14b3151d..1d0a44dd 100644 --- a/patrole_tempest_plugin/tests/api/volume/rbac_base.py +++ b/patrole_tempest_plugin/tests/api/volume/rbac_base.py @@ -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): diff --git a/patrole_tempest_plugin/tests/api/volume/test_capabilities_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_capabilities_rbac.py index fa1157aa..3770f842 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_capabilities_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_capabilities_rbac.py @@ -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"]) diff --git a/patrole_tempest_plugin/tests/api/volume/test_encryption_types_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_encryption_types_rbac.py index 0eb02441..84439433 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_encryption_types_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_encryption_types_rbac.py @@ -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'] diff --git a/patrole_tempest_plugin/tests/api/volume/test_group_snapshots_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_group_snapshots_rbac.py index 1d59f9bf..56a02330 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_group_snapshots_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_group_snapshots_rbac.py @@ -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() diff --git a/patrole_tempest_plugin/tests/api/volume/test_qos_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_qos_rbac.py index 5664bf97..2f144b08 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_qos_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_qos_rbac.py @@ -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') diff --git a/patrole_tempest_plugin/tests/api/volume/test_scheduler_stats_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_scheduler_stats_rbac.py index efcfdaf4..ff12cba5 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_scheduler_stats_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_scheduler_stats_rbac.py @@ -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", diff --git a/patrole_tempest_plugin/tests/api/volume/test_snapshot_manage_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_snapshot_manage_rbac.py index e2887e05..1fc4c247 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_snapshot_manage_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_snapshot_manage_rbac.py @@ -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): diff --git a/patrole_tempest_plugin/tests/api/volume/test_user_messages_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_user_messages_rbac.py index 962a9b13..11c42b1e 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_user_messages_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_user_messages_rbac.py @@ -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.""" diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_quotas_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_quotas_rbac.py index cd1fb6e0..f49c2fdd 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_volume_quotas_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_volume_quotas_rbac.py @@ -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( diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_services_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_services_rbac.py index 9f97a826..0f4e458d 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_volume_services_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_volume_services_rbac.py @@ -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( diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_transfers_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_transfers_rbac.py index b7e45f98..5e0fd219 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_volume_transfers_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_volume_transfers_rbac.py @@ -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): diff --git a/patrole_tempest_plugin/tests/api/volume/test_volumes_manage_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volumes_manage_rbac.py index 2782e220..9f21c4a4 100644 --- a/patrole_tempest_plugin/tests/api/volume/test_volumes_manage_rbac.py +++ b/patrole_tempest_plugin/tests/api/volume/test_volumes_manage_rbac.py @@ -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