Remove Cinder v2 RBAC tests
This PS removes Cinder v2 RBAC tests, as the policy tests can
be performed via the v3 API. Policy enforcement doesn't change
between v2 and v3 APIs, so we should only test the latest API.
Change-Id: Id0421a958a2c4b087bd7a886ae088eac5fe3c79a
diff --git a/patrole_tempest_plugin/tests/api/volume/rbac_base.py b/patrole_tempest_plugin/tests/api/volume/rbac_base.py
index f4531df..7e2ebad 100644
--- a/patrole_tempest_plugin/tests/api/volume/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/volume/rbac_base.py
@@ -22,6 +22,12 @@
class BaseVolumeRbacTest(vol_base.BaseVolumeTest):
+ # NOTE(felipemonteiro): Patrole currently only tests the v3 Cinder API
+ # because it is the current API and because policy enforcement does not
+ # change between API major versions. So, it is not necessary to specify
+ # the `_api_version` in any test class. However, specify microversions in
+ # subclasses if necessary.
+ _api_version = 3
@classmethod
def skip_checks(cls):
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 74ffe60..cfca14e 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_capabilities_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_capabilities_rbac.py
@@ -20,18 +20,18 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class CapabilitiesRbacTest(rbac_base.BaseVolumeRbacTest):
+class CapabilitiesV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def skip_checks(cls):
- super(CapabilitiesRbacTest, cls).skip_checks()
+ super(CapabilitiesV3RbacTest, cls).skip_checks()
if not utils.is_extension_enabled('capabilities', 'volume'):
msg = "%s skipped as capabilities not enabled." % cls.__name__
raise cls.skipException(msg)
@classmethod
def setup_clients(cls):
- super(CapabilitiesRbacTest, cls).setup_clients()
+ 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
@@ -42,7 +42,3 @@
host = self.hosts_client.list_hosts()['hosts'][0]['host_name']
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.capabilities_client.show_backend_capabilities(host)
-
-
-class CapabilitiesV3RbacTest(CapabilitiesRbacTest):
- _api_version = 3
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 2cae0bd..a78585f 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
@@ -20,18 +20,18 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class EncryptionTypesRbacTest(rbac_base.BaseVolumeRbacTest):
+class EncryptionTypesV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def skip_checks(cls):
- super(EncryptionTypesRbacTest, cls).skip_checks()
+ super(EncryptionTypesV3RbacTest, cls).skip_checks()
if not utils.is_extension_enabled('encryption', 'volume'):
msg = "%s skipped as encryption not enabled." % cls.__name__
raise cls.skipException(msg)
@classmethod
def setup_clients(cls):
- super(EncryptionTypesRbacTest, cls).setup_clients()
+ super(EncryptionTypesV3RbacTest, cls).setup_clients()
cls.encryption_types_client = cls.os_primary.encryption_types_v2_client
def _create_volume_type_encryption(self):
@@ -82,7 +82,3 @@
vol_type_id = self._create_volume_type_encryption()
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.encryption_types_client.show_encryption_type(vol_type_id)
-
-
-class EncryptionTypesV3RbacTest(EncryptionTypesRbacTest):
- _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_groups_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_groups_rbac.py
index 20f20a5..7cc089a 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_groups_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_groups_rbac.py
@@ -24,7 +24,6 @@
class GroupsV3RbacTest(rbac_base.BaseVolumeRbacTest):
- _api_version = 3
min_microversion = '3.14'
max_microversion = 'latest'
@@ -116,7 +115,6 @@
class GroupTypesV3RbacTest(rbac_base.BaseVolumeRbacTest):
- _api_version = 3
min_microversion = '3.11'
max_microversion = 'latest'
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 2327de8..3ac59be 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_qos_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_qos_rbac.py
@@ -22,13 +22,12 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class VolumeQOSRbacTest(rbac_base.BaseVolumeRbacTest):
-
+class VolumeQOSV3RbacTest(rbac_base.BaseVolumeRbacTest):
credentials = ['primary', 'admin']
@classmethod
def setup_clients(cls):
- super(VolumeQOSRbacTest, cls).setup_clients()
+ super(VolumeQOSV3RbacTest, cls).setup_clients()
cls.qos_client = cls.os_primary.volume_qos_v2_client
cls.admin_qos_client = cls.os_admin.volume_qos_v2_client
@@ -146,7 +145,3 @@
self.qos_client.disassociate_all_qos(qos['id'])
waiters.wait_for_qos_operations(self.admin_qos_client, qos['id'],
'disassociate-all')
-
-
-class VolumeQOSV3RbacTest(VolumeQOSRbacTest):
- _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_quota_classes_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_quota_classes_rbac.py
index d016498..a81f1b9 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_quota_classes_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_quota_classes_rbac.py
@@ -21,11 +21,11 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class QuotaClassesRbacTest(rbac_base.BaseVolumeRbacTest):
+class QuotaClassesV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def skip_checks(cls):
- super(QuotaClassesRbacTest, cls).skip_checks()
+ super(QuotaClassesV3RbacTest, cls).skip_checks()
if not utils.is_extension_enabled('os-quota-class-sets', 'volume'):
msg = ("%s skipped as os-quota-class-sets not enabled."
% cls.__name__)
@@ -33,7 +33,7 @@
@classmethod
def setup_clients(cls):
- super(QuotaClassesRbacTest, cls).setup_clients()
+ super(QuotaClassesV3RbacTest, cls).setup_clients()
cls.quota_classes_client = cls.os_primary.quota_classes_client
cls.quota_name = data_utils.rand_name(cls.__name__ + '-QuotaClass')
@@ -56,7 +56,3 @@
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.quota_classes_client.update_quota_class_set(self.quota_name,
**quota_class_set)
-
-
-class QuotaClassesV3RbacTest(QuotaClassesRbacTest):
- _api_version = 3
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 25562e8..8fded0a 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
@@ -20,18 +20,18 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class SchedulerStatsRbacTest(rbac_base.BaseVolumeRbacTest):
+class SchedulerStatsV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def skip_checks(cls):
- super(SchedulerStatsRbacTest, cls).skip_checks()
+ super(SchedulerStatsV3RbacTest, cls).skip_checks()
if not utils.is_extension_enabled('scheduler-stats', 'volume'):
msg = "%s skipped as scheduler-stats not enabled." % cls.__name__
raise cls.skipException(msg)
@classmethod
def setup_clients(cls):
- super(SchedulerStatsRbacTest, cls).setup_clients()
+ super(SchedulerStatsV3RbacTest, cls).setup_clients()
cls.scheduler_stats_client =\
cls.os_primary.volume_scheduler_stats_v2_client
@@ -42,7 +42,3 @@
def test_list_back_end_storage_pools(self):
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.scheduler_stats_client.list_pools()
-
-
-class SchedulerStatsV3RbacTest(SchedulerStatsRbacTest):
- _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_snapshots_actions_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_snapshots_actions_rbac.py
index fc39f4a..96243d8 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_snapshots_actions_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_snapshots_actions_rbac.py
@@ -22,17 +22,17 @@
CONF = config.CONF
-class SnapshotsActionsRbacTest(rbac_base.BaseVolumeRbacTest):
+class SnapshotsActionsV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def skip_checks(cls):
- super(SnapshotsActionsRbacTest, cls).skip_checks()
+ super(SnapshotsActionsV3RbacTest, cls).skip_checks()
if not CONF.volume_feature_enabled.snapshot:
raise cls.skipException("Cinder snapshot feature disabled")
@classmethod
def resource_setup(cls):
- super(SnapshotsActionsRbacTest, cls).resource_setup()
+ super(SnapshotsActionsV3RbacTest, cls).resource_setup()
cls.volume = cls.create_volume()
cls.snapshot = cls.create_snapshot(volume_id=cls.volume['id'])
cls.snapshot_id = cls.snapshot['id']
@@ -57,7 +57,3 @@
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.snapshots_client.force_delete_snapshot(temp_snapshot['id'])
self.snapshots_client.wait_for_resource_deletion(temp_snapshot['id'])
-
-
-class SnapshotsActionsV3RbacTest(SnapshotsActionsRbacTest):
- _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_snapshots_metadata_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_snapshots_metadata_rbac.py
index 3737212..1f82671 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_snapshots_metadata_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_snapshots_metadata_rbac.py
@@ -22,17 +22,17 @@
CONF = config.CONF
-class SnapshotMetadataRbacTest(rbac_base.BaseVolumeRbacTest):
+class SnapshotMetadataV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def skip_checks(cls):
- super(SnapshotMetadataRbacTest, cls).skip_checks()
+ super(SnapshotMetadataV3RbacTest, cls).skip_checks()
if not CONF.volume_feature_enabled.snapshot:
raise cls.skipException("Cinder snapshot feature disabled")
@classmethod
def resource_setup(cls):
- super(SnapshotMetadataRbacTest, cls).resource_setup()
+ super(SnapshotMetadataV3RbacTest, cls).resource_setup()
cls.volume = cls.create_volume()
# Create a snapshot
cls.snapshot = cls.create_snapshot(volume_id=cls.volume['id'])
@@ -118,7 +118,3 @@
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.snapshots_client.delete_snapshot_metadata_item(
self.snapshot['id'], "key1")
-
-
-class SnapshotMetadataV3RbacTest(SnapshotMetadataRbacTest):
- _api_version = 3
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 fddaee4..bac9189 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
@@ -25,7 +25,6 @@
class MessagesV3RbacTest(rbac_base.BaseVolumeRbacTest):
- _api_version = 3
min_microversion = '3.3'
max_microversion = 'latest'
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_actions_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_actions_rbac.py
index 88c5d82..e9ebb99 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_actions_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_actions_rbac.py
@@ -27,19 +27,18 @@
CONF = config.CONF
-class VolumesActionsRbacTest(rbac_base.BaseVolumeRbacTest):
-
+class VolumesActionsV3RbacTest(rbac_base.BaseVolumeRbacTest):
credentials = ['primary', 'admin']
@classmethod
def setup_clients(cls):
- super(VolumesActionsRbacTest, cls).setup_clients()
+ super(VolumesActionsV3RbacTest, cls).setup_clients()
cls.admin_image_client = cls.os_admin.image_client_v2
cls.admin_volumes_client = cls.os_admin.volumes_client_latest
@classmethod
def resource_setup(cls):
- super(VolumesActionsRbacTest, cls).resource_setup()
+ super(VolumesActionsV3RbacTest, cls).resource_setup()
cls.volume = cls.create_volume()
def _create_server(self):
@@ -217,10 +216,6 @@
volume['id'], 'available')
-class VolumesActionsV3RbacTest(VolumesActionsRbacTest):
- _api_version = 3
-
-
class VolumesActionsV310RbacTest(rbac_base.BaseVolumeRbacTest):
_api_version = 3
min_microversion = '3.10'
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_basic_crud_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_basic_crud_rbac.py
index 3f5227e..244f333 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_basic_crud_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_basic_crud_rbac.py
@@ -20,11 +20,11 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class VolumesBasicCrudRbacTest(rbac_base.BaseVolumeRbacTest):
+class VolumesBasicCrudV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def resource_setup(cls):
- super(VolumesBasicCrudRbacTest, cls).resource_setup()
+ super(VolumesBasicCrudV3RbacTest, cls).resource_setup()
cls.volume = cls.create_volume()
@rbac_rule_validation.action(service="cinder",
@@ -70,7 +70,3 @@
def test_volume_list_image_metadata(self):
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.volumes_client.list_volumes(detail=True)
-
-
-class VolumesBasicCrudV3RbacTest(VolumesBasicCrudRbacTest):
- _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_hosts_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_hosts_rbac.py
index ee0a0be..9519cea 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_hosts_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_hosts_rbac.py
@@ -19,7 +19,7 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class VolumeHostsRbacTest(rbac_base.BaseVolumeRbacTest):
+class VolumeHostsV3RbacTest(rbac_base.BaseVolumeRbacTest):
@rbac_rule_validation.action(service="cinder",
rule="volume_extension:hosts")
@@ -39,7 +39,3 @@
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.volume_hosts_client.show_host(host_names[0])
-
-
-class VolumeHostsV3RbacTest(VolumeHostsRbacTest):
- _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py
index f9114a8..671ac19 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py
@@ -22,21 +22,21 @@
CONF = config.CONF
-class VolumeMetadataRbacTest(rbac_base.BaseVolumeRbacTest):
+class VolumeMetadataV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def resource_setup(cls):
- super(VolumeMetadataRbacTest, cls).resource_setup()
+ super(VolumeMetadataV3RbacTest, cls).resource_setup()
cls.volume = cls.create_volume()
cls.image_id = CONF.compute.image_ref
def setUp(self):
- super(VolumeMetadataRbacTest, self).setUp()
+ super(VolumeMetadataV3RbacTest, self).setUp()
self._add_metadata(self.volume)
def tearDown(self):
self.volumes_client.update_volume_metadata(self.volume['id'], {})
- super(VolumeMetadataRbacTest, self).tearDown()
+ super(VolumeMetadataV3RbacTest, self).tearDown()
def _add_metadata(self, volume):
# Create metadata for the volume
@@ -103,7 +103,3 @@
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.volumes_client.update_volume_image_metadata(
self.volume['id'], image_id=self.image_id)
-
-
-class VolumeMetadataV3RbacTest(VolumeMetadataRbacTest):
- _api_version = 3
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 851d468..01f8203 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
@@ -19,16 +19,16 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class VolumeQuotasRbacTest(rbac_base.BaseVolumeRbacTest):
+class VolumeQuotasV3RbacTest(rbac_base.BaseVolumeRbacTest):
@classmethod
def setup_credentials(cls):
- super(VolumeQuotasRbacTest, cls).setup_credentials()
+ super(VolumeQuotasV3RbacTest, cls).setup_credentials()
cls.demo_tenant_id = cls.os_primary.credentials.tenant_id
@classmethod
def setup_clients(cls):
- super(VolumeQuotasRbacTest, cls).setup_clients()
+ super(VolumeQuotasV3RbacTest, cls).setup_clients()
cls.quotas_client = cls.os_primary.volume_quotas_v2_client
@rbac_rule_validation.action(service="cinder",
@@ -51,7 +51,3 @@
self.quotas_client.update_quota_set(
self.demo_tenant_id,
**new_quota_set)['quota_set']
-
-
-class VolumeQuotasV3RbacTest(VolumeQuotasRbacTest):
- _api_version = 3
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 63978aa..d36fb5a 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
@@ -20,7 +20,7 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class VolumeServicesRbacTest(rbac_base.BaseVolumeRbacTest):
+class VolumeServicesV3RbacTest(rbac_base.BaseVolumeRbacTest):
# TODO(felipemonteiro): Implement a test to cover the policy action,
# "volume_extension:services:update", once the Tempest client endpoint
@@ -28,14 +28,14 @@
@classmethod
def skip_checks(cls):
- super(VolumeServicesRbacTest, cls).skip_checks()
+ super(VolumeServicesV3RbacTest, cls).skip_checks()
if not utils.is_extension_enabled('os-services', 'volume'):
msg = "%s skipped as os-services not enabled." % cls.__name__
raise cls.skipException(msg)
@classmethod
def setup_clients(cls):
- super(VolumeServicesRbacTest, cls).setup_clients()
+ super(VolumeServicesV3RbacTest, cls).setup_clients()
cls.services_client = cls.os_primary.volume_services_v2_client
@decorators.idempotent_id('b9134f01-97c0-4abd-9455-fe2f03e3f966')
@@ -45,7 +45,3 @@
def test_list_services(self):
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.services_client.list_services()['services']
-
-
-class VolumeServicesV3RbacTest(VolumeServicesRbacTest):
- _api_version = 3
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 656a2e6..9640dc6 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
@@ -21,19 +21,18 @@
from patrole_tempest_plugin.tests.api.volume import rbac_base
-class VolumesTransfersRbacTest(rbac_base.BaseVolumeRbacTest):
-
+class VolumesTransfersV3RbacTest(rbac_base.BaseVolumeRbacTest):
credentials = ['primary', 'admin']
@classmethod
def setup_clients(cls):
- super(VolumesTransfersRbacTest, cls).setup_clients()
+ super(VolumesTransfersV3RbacTest, cls).setup_clients()
cls.transfers_client = cls.os_primary.volume_transfers_v2_client
cls.admin_volumes_client = cls.os_admin.volumes_client_latest
@classmethod
def resource_setup(cls):
- super(VolumesTransfersRbacTest, cls).resource_setup()
+ super(VolumesTransfersV3RbacTest, cls).resource_setup()
cls.volume = cls.create_volume()
def _delete_transfer(self, transfer):
@@ -89,7 +88,3 @@
transfer = self._create_transfer()
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
self.transfers_client.delete_volume_transfer(transfer['id'])
-
-
-class VolumesTransfersV3RbacTest(VolumesTransfersRbacTest):
- _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_types_access_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_types_access_rbac.py
index 773df2b..f4aeee8 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_types_access_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_types_access_rbac.py
@@ -22,7 +22,6 @@
class VolumeTypesAccessRbacTest(rbac_base.BaseVolumeRbacTest):
- _api_version = 3
@classmethod
def skip_checks(cls):
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_types_extra_specs_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_types_extra_specs_rbac.py
index aa02316..2abfd32 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_types_extra_specs_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_types_extra_specs_rbac.py
@@ -23,7 +23,6 @@
class VolumeTypesExtraSpecsRbacTest(rbac_base.BaseVolumeRbacTest):
- _api_version = 3
@classmethod
def skip_checks(cls):
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volumes_backup_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volumes_backup_rbac.py
index d10c876..51ee925 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volumes_backup_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volumes_backup_rbac.py
@@ -29,24 +29,23 @@
CONF = config.CONF
-class VolumesBackupsRbacTest(rbac_base.BaseVolumeRbacTest):
-
+class VolumesBackupsV3RbacTest(rbac_base.BaseVolumeRbacTest):
credentials = ['primary', 'admin']
@classmethod
def skip_checks(cls):
- super(VolumesBackupsRbacTest, cls).skip_checks()
+ super(VolumesBackupsV3RbacTest, cls).skip_checks()
if not CONF.volume_feature_enabled.backup:
raise cls.skipException("Cinder backup feature disabled")
@classmethod
def setup_clients(cls):
- super(VolumesBackupsRbacTest, cls).setup_clients()
+ super(VolumesBackupsV3RbacTest, cls).setup_clients()
cls.admin_backups_client = cls.os_admin.backups_v2_client
@classmethod
def resource_setup(cls):
- super(VolumesBackupsRbacTest, cls).resource_setup()
+ super(VolumesBackupsV3RbacTest, cls).resource_setup()
cls.volume = cls.create_volume()
def _decode_url(self, backup_url):
@@ -168,10 +167,6 @@
self.addCleanup(self.backups_client.delete_backup, import_backup['id'])
-class VolumesBackupsV3RbacTest(VolumesBackupsRbacTest):
- _api_version = 3
-
-
class VolumesBackupsV318RbacTest(rbac_base.BaseVolumeRbacTest):
_api_version = 3
# The minimum microversion for showing 'os-backup-project-attr:project_id'
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volumes_extend_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volumes_extend_rbac.py
index 205be9e..8a34923 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volumes_extend_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volumes_extend_rbac.py
@@ -23,18 +23,17 @@
CONF = config.CONF
-class VolumesExtendRbacTest(rbac_base.BaseVolumeRbacTest):
-
+class VolumesExtendV3RbacTest(rbac_base.BaseVolumeRbacTest):
credentials = ['primary', 'admin']
@classmethod
def setup_clients(cls):
- super(VolumesExtendRbacTest, cls).setup_clients()
+ super(VolumesExtendV3RbacTest, cls).setup_clients()
cls.admin_volumes_client = cls.os_admin.volumes_client_latest
@classmethod
def resource_setup(cls):
- super(VolumesExtendRbacTest, cls).resource_setup()
+ super(VolumesExtendV3RbacTest, cls).resource_setup()
# Create a test shared volume for tests
cls.volume = cls.create_volume()
@@ -48,7 +47,3 @@
new_size=extend_size)
waiters.wait_for_volume_resource_status(
self.admin_volumes_client, self.volume['id'], 'available')
-
-
-class VolumesExtendV3RbacTest(VolumesExtendRbacTest):
- _api_version = 3
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 dab796d..1365b79 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
@@ -25,13 +25,12 @@
CONF = config.CONF
-class VolumesManageRbacTest(rbac_base.BaseVolumeRbacTest):
-
+class VolumesManageV3RbacTest(rbac_base.BaseVolumeRbacTest):
credentials = ['primary', 'admin']
@classmethod
def skip_checks(cls):
- super(VolumesManageRbacTest, cls).skip_checks()
+ super(VolumesManageV3RbacTest, cls).skip_checks()
if not CONF.volume_feature_enabled.manage_volume:
raise cls.skipException("Manage volume tests are disabled")
@@ -42,7 +41,7 @@
@classmethod
def setup_clients(cls):
- super(VolumesManageRbacTest, cls).setup_clients()
+ super(VolumesManageV3RbacTest, cls).setup_clients()
cls.volume_manage_client = cls.os_primary.volume_manage_v2_client
cls.admin_volumes_client = cls.os_admin.volumes_client_latest
@@ -110,7 +109,3 @@
# volume after the test. The _manage_volume method will set up the
# proper resource cleanup
self.addCleanup(self._manage_volume, volume)
-
-
-class VolumesManageV3RbacTest(VolumesManageRbacTest):
- _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volumes_snapshots_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volumes_snapshots_rbac.py
index 249b88b..7491820 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volumes_snapshots_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volumes_snapshots_rbac.py
@@ -23,24 +23,23 @@
CONF = config.CONF
-class VolumesSnapshotRbacTest(rbac_base.BaseVolumeRbacTest):
-
+class VolumesSnapshotV3RbacTest(rbac_base.BaseVolumeRbacTest):
credentials = ['primary', 'admin']
@classmethod
def skip_checks(cls):
- super(VolumesSnapshotRbacTest, cls).skip_checks()
+ super(VolumesSnapshotV3RbacTest, cls).skip_checks()
if not CONF.volume_feature_enabled.snapshot:
raise cls.skipException("Cinder volume snapshots are disabled")
@classmethod
def setup_clients(cls):
- super(VolumesSnapshotRbacTest, cls).setup_clients()
+ super(VolumesSnapshotV3RbacTest, cls).setup_clients()
cls.admin_snapshots_client = cls.os_admin.snapshots_v2_client
@classmethod
def resource_setup(cls):
- super(VolumesSnapshotRbacTest, cls).resource_setup()
+ super(VolumesSnapshotV3RbacTest, cls).resource_setup()
# Create a test shared volume for tests
cls.volume = cls.create_volume()
# Create a test shared snapshot for tests
@@ -107,7 +106,3 @@
self.snapshots_client.delete_snapshot(temp_snapshot['id'])
self.admin_snapshots_client.wait_for_resource_deletion(
temp_snapshot['id'])
-
-
-class VolumesSnapshotV3RbacTest(VolumesSnapshotRbacTest):
- _api_version = 3