Stop using aliases for creds manager
Now that Tempest has stopped using aliases like cls.os
and cls.os_adm [0], Patrole should do the same.
This patch normalizes the usage around os_admin, os_primary and
os_alt.
[0] https://review.openstack.org/#/c/457555/
Change-Id: Ibc826c8c6be2590db9ad9da0831fffeae6d3a01b
Related-Change-Id: I5f7164f7a7ec5d4380ca22885000caa0183a0bf7
diff --git a/patrole_tempest_plugin/tests/api/compute/rbac_base.py b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
index b2f830e..bc02dbf 100644
--- a/patrole_tempest_plugin/tests/api/compute/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
@@ -35,7 +35,7 @@
@classmethod
def setup_clients(cls):
super(BaseV2ComputeRbacTest, cls).setup_clients()
- cls.auth_provider = cls.os.auth_provider
+ cls.auth_provider = cls.os_primary.auth_provider
cls.rbac_utils = rbac_utils()
cls.rbac_utils.switch_role(cls, toggle_rbac_role=False)
diff --git a/patrole_tempest_plugin/tests/api/compute/test_aggregates_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_aggregates_rbac.py
index a180bc4..d6287f2 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_aggregates_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_aggregates_rbac.py
@@ -36,7 +36,7 @@
@classmethod
def setup_clients(cls):
super(AggregatesRbacTest, cls).setup_clients()
- cls.hosts_client = cls.os.hosts_client
+ cls.hosts_client = cls.os_primary.hosts_client
def _create_aggregate(self):
agg_name = data_utils.rand_name('aggregate')
diff --git a/patrole_tempest_plugin/tests/api/compute/test_availability_zone_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_availability_zone_rbac.py
index c466ad2..35d5a8a 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_availability_zone_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_availability_zone_rbac.py
@@ -11,34 +11,29 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest import config
from tempest.lib import decorators
from patrole_tempest_plugin import rbac_rule_validation
from patrole_tempest_plugin.tests.api.compute import rbac_base
-CONF = config.CONF
-
class NovaAvailabilityZoneRbacTest(rbac_base.BaseV2ComputeRbacTest):
@classmethod
- def skip_checks(cls):
- super(NovaAvailabilityZoneRbacTest, cls).skip_checks()
- if not CONF.compute_feature_enabled.api_extensions:
- raise cls.skipException(
- '%s skipped as no compute extensions enabled' % cls.__name__)
+ def setup_clients(cls):
+ super(NovaAvailabilityZoneRbacTest, cls).setup_clients()
+ cls.client = cls.availability_zone_client
@rbac_rule_validation.action(service="nova", rule="os_compute_api:"
"os-availability-zone:list")
@decorators.idempotent_id('cd34e7ea-d26e-4fa3-a8d0-f8883726ce3d')
def test_get_availability_zone_list_rbac(self):
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
- self.os.availability_zone_client.list_availability_zones()
+ self.client.list_availability_zones()
@rbac_rule_validation.action(service="nova", rule="os_compute_api:"
"os-availability-zone:detail")
@decorators.idempotent_id('2f61c191-6ece-4f21-b487-39d749e3d38e')
def test_get_availability_zone_list_detail_rbac(self):
self.rbac_utils.switch_role(self, toggle_rbac_role=True)
- self.os.availability_zone_client.list_availability_zones(detail=True)
+ self.client.list_availability_zones(detail=True)
diff --git a/patrole_tempest_plugin/tests/api/compute/test_floating_ip_pools_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_floating_ip_pools_rbac.py
index 6d78878..755bacd 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_floating_ip_pools_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_floating_ip_pools_rbac.py
@@ -33,7 +33,7 @@
@classmethod
def setup_clients(cls):
super(FloatingIpPoolsRbacTest, cls).setup_clients()
- cls.client = cls.os.floating_ip_pools_client
+ cls.client = cls.os_primary.floating_ip_pools_client
@classmethod
def skip_checks(cls):
diff --git a/patrole_tempest_plugin/tests/api/compute/test_floating_ips_bulk_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_floating_ips_bulk_rbac.py
index ab9d551..7fe4847 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_floating_ips_bulk_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_floating_ips_bulk_rbac.py
@@ -33,7 +33,7 @@
@classmethod
def setup_clients(cls):
super(FloatingIpsBulkRbacTest, cls).setup_clients()
- cls.client = cls.os.floating_ips_bulk_client
+ cls.client = cls.os_primary.floating_ips_bulk_client
@classmethod
def skip_checks(cls):
diff --git a/patrole_tempest_plugin/tests/api/compute/test_hosts_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_hosts_rbac.py
index 53e3a70..d459f9c 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_hosts_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_hosts_rbac.py
@@ -27,7 +27,7 @@
@classmethod
def setup_clients(cls):
super(HostsRbacTest, cls).setup_clients()
- cls.client = cls.os.hosts_client
+ cls.client = cls.os_primary.hosts_client
@classmethod
def skip_checks(cls):
diff --git a/patrole_tempest_plugin/tests/api/compute/test_images_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_images_rbac.py
index 3a4f2d6..b848509 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_images_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_images_rbac.py
@@ -48,7 +48,7 @@
def setup_clients(cls):
super(ImagesV235RbacTest, cls).setup_clients()
cls.client = cls.compute_images_client
- cls.glance_image_client = cls.os.image_client_v2
+ cls.glance_image_client = cls.os_primary.image_client_v2
@classmethod
def resource_setup(cls):
diff --git a/patrole_tempest_plugin/tests/api/compute/test_quota_sets_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_quota_sets_rbac.py
index 826ae8d..f6706a7 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_quota_sets_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_quota_sets_rbac.py
@@ -28,7 +28,7 @@
def setup_clients(cls):
super(QuotaSetsRbacTest, cls).setup_clients()
cls.client = cls.quotas_client
- cls.projects_client = cls.os.projects_client
+ cls.projects_client = cls.os_primary.projects_client
@classmethod
def skip_checks(cls):
diff --git a/patrole_tempest_plugin/tests/api/compute/test_server_migrations_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_server_migrations_rbac.py
index e5b1ea0..38ef552 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_server_migrations_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_server_migrations_rbac.py
@@ -43,8 +43,8 @@
def setup_clients(cls):
super(MigrateServerV225RbacTest, cls).setup_clients()
cls.client = cls.servers_client
- cls.admin_servers_client = cls.os_adm.servers_client
- cls.hosts_client = cls.os.hosts_client
+ cls.admin_servers_client = cls.os_admin.servers_client
+ cls.hosts_client = cls.os_primary.hosts_client
def _get_server_details(self, server_id):
body = self.client.show_server(server_id)['server']
diff --git a/patrole_tempest_plugin/tests/api/compute/test_server_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_server_rbac.py
index 4157c05..b71887c 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_server_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_server_rbac.py
@@ -37,8 +37,8 @@
def setup_clients(cls):
super(ComputeServersRbacTest, cls).setup_clients()
cls.client = cls.servers_client
- cls.networks_client = cls.os.networks_client
- cls.subnets_client = cls.os.subnets_client
+ cls.networks_client = cls.os_primary.networks_client
+ cls.subnets_client = cls.os_primary.subnets_client
@classmethod
def resource_setup(cls):
diff --git a/patrole_tempest_plugin/tests/api/compute/test_server_volume_attachments_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_server_volume_attachments_rbac.py
index ba33a0f..160affd 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_server_volume_attachments_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_server_volume_attachments_rbac.py
@@ -31,7 +31,7 @@
def setup_clients(cls):
super(ServerVolumeAttachmentRbacTest, cls).setup_clients()
cls.client = cls.servers_client
- cls.volumes_client = cls.os.volumes_client
+ cls.volumes_client = cls.os_primary.volumes_client
@classmethod
def skip_checks(cls):
diff --git a/patrole_tempest_plugin/tests/api/compute/test_simple_tenant_usage_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_simple_tenant_usage_rbac.py
index 93c179e..5b1ede0 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_simple_tenant_usage_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_simple_tenant_usage_rbac.py
@@ -27,7 +27,7 @@
@classmethod
def setup_clients(cls):
super(SimpleTenantUsageRbacTest, cls).setup_clients()
- cls.client = cls.os.tenant_usages_client
+ cls.client = cls.os_primary.tenant_usages_client
@classmethod
def skip_checks(cls):
diff --git a/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py
index 15a385a..fb834bd 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py
@@ -34,7 +34,7 @@
@classmethod
def setup_clients(cls):
super(TenantNetworksRbacTest, cls).setup_clients()
- cls.client = cls.os.tenant_networks_client
+ cls.client = cls.os_primary.tenant_networks_client
@classmethod
def skip_checks(cls):
diff --git a/patrole_tempest_plugin/tests/api/identity/v2/rbac_base.py b/patrole_tempest_plugin/tests/api/identity/v2/rbac_base.py
index 5e5d918..a85d508 100644
--- a/patrole_tempest_plugin/tests/api/identity/v2/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/identity/v2/rbac_base.py
@@ -37,18 +37,18 @@
@classmethod
def setup_clients(cls):
super(BaseIdentityV2RbacTest, cls).setup_clients()
- cls.auth_provider = cls.os.auth_provider
+ cls.auth_provider = cls.os_primary.auth_provider
cls.rbac_utils = rbac_utils()
cls.rbac_utils.switch_role(cls, toggle_rbac_role=False)
- cls.client = cls.os.identity_client
- cls.endpoints_client = cls.os.endpoints_client
- cls.roles_client = cls.os.roles_client
- cls.services_client = cls.os.identity_services_client
- cls.tenants_client = cls.os.tenants_client
- cls.token_client = cls.os.token_client
- cls.users_client = cls.os.users_client
+ cls.client = cls.os_primary.identity_client
+ cls.endpoints_client = cls.os_primary.endpoints_client
+ cls.roles_client = cls.os_primary.roles_client
+ cls.services_client = cls.os_primary.identity_services_client
+ cls.tenants_client = cls.os_primary.tenants_client
+ cls.token_client = cls.os_primary.token_client
+ cls.users_client = cls.os_primary.users_client
def _create_service(self):
name = data_utils.rand_name('service')
diff --git a/patrole_tempest_plugin/tests/api/identity/v2/test_endpoints_rbac.py b/patrole_tempest_plugin/tests/api/identity/v2/test_endpoints_rbac.py
index b8677cf..dea7f0b 100644
--- a/patrole_tempest_plugin/tests/api/identity/v2/test_endpoints_rbac.py
+++ b/patrole_tempest_plugin/tests/api/identity/v2/test_endpoints_rbac.py
@@ -29,7 +29,7 @@
@classmethod
def setup_clients(cls):
super(IdentityEndpointsV2RbacTest, cls).setup_clients()
- cls.endpoints_client = cls.os.endpoints_client
+ cls.endpoints_client = cls.os_primary.endpoints_client
@classmethod
def resource_setup(cls):
diff --git a/patrole_tempest_plugin/tests/api/identity/v2/test_roles_rbac.py b/patrole_tempest_plugin/tests/api/identity/v2/test_roles_rbac.py
index 9dd90e1..7b21194 100644
--- a/patrole_tempest_plugin/tests/api/identity/v2/test_roles_rbac.py
+++ b/patrole_tempest_plugin/tests/api/identity/v2/test_roles_rbac.py
@@ -29,7 +29,7 @@
@classmethod
def setup_clients(cls):
super(IdentityRoleV2RbacTest, cls).setup_clients()
- cls.roles_client = cls.os.roles_client
+ cls.roles_client = cls.os_primary.roles_client
def _create_role(self):
role = self.roles_client.create_role(
diff --git a/patrole_tempest_plugin/tests/api/identity/v2/test_services_rbac.py b/patrole_tempest_plugin/tests/api/identity/v2/test_services_rbac.py
index a371bbc..c9803ec 100644
--- a/patrole_tempest_plugin/tests/api/identity/v2/test_services_rbac.py
+++ b/patrole_tempest_plugin/tests/api/identity/v2/test_services_rbac.py
@@ -27,7 +27,7 @@
@classmethod
def setup_clients(cls):
super(IdentityServicesV2RbacTest, cls).setup_clients()
- cls.services_client = cls.os.identity_services_client
+ cls.services_client = cls.os_primary.identity_services_client
@rbac_rule_validation.action(service="keystone",
rule="identity:create_service",
diff --git a/patrole_tempest_plugin/tests/api/identity/v3/rbac_base.py b/patrole_tempest_plugin/tests/api/identity/v3/rbac_base.py
index 31533a3..927ec39 100644
--- a/patrole_tempest_plugin/tests/api/identity/v3/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/identity/v3/rbac_base.py
@@ -37,24 +37,24 @@
@classmethod
def setup_clients(cls):
super(BaseIdentityV3RbacTest, cls).setup_clients()
- cls.auth_provider = cls.os.auth_provider
+ cls.auth_provider = cls.os_primary.auth_provider
cls.rbac_utils = rbac_utils()
cls.rbac_utils.switch_role(cls, toggle_rbac_role=False)
- cls.creds_client = cls.os.credentials_client
- cls.consumers_client = cls.os.oauth_consumers_client
- cls.domains_client = cls.os.domains_client
- cls.endpoints_client = cls.os.endpoints_v3_client
- cls.groups_client = cls.os.groups_client
- cls.projects_client = cls.os.projects_client
- cls.policies_client = cls.os.policies_client
- cls.regions_client = cls.os.regions_client
- cls.role_assignments_client = cls.os.role_assignments_client
- cls.roles_client = cls.os.roles_v3_client
- cls.services_client = cls.os.identity_services_v3_client
- cls.trusts_client = cls.os.trusts_client
- cls.users_client = cls.os.users_v3_client
+ cls.creds_client = cls.os_primary.credentials_client
+ cls.consumers_client = cls.os_primary.oauth_consumers_client
+ cls.domains_client = cls.os_primary.domains_client
+ cls.endpoints_client = cls.os_primary.endpoints_v3_client
+ cls.groups_client = cls.os_primary.groups_client
+ cls.projects_client = cls.os_primary.projects_client
+ cls.policies_client = cls.os_primary.policies_client
+ cls.regions_client = cls.os_primary.regions_client
+ cls.role_assignments_client = cls.os_primary.role_assignments_client
+ cls.roles_client = cls.os_primary.roles_v3_client
+ cls.services_client = cls.os_primary.identity_services_v3_client
+ cls.trusts_client = cls.os_primary.trusts_client
+ cls.users_client = cls.os_primary.users_v3_client
@classmethod
def resource_setup(cls):
diff --git a/patrole_tempest_plugin/tests/api/identity/v3/test_endpoint_filter_rbac.py b/patrole_tempest_plugin/tests/api/identity/v3/test_endpoint_filter_rbac.py
index 2892b17..77ad647 100644
--- a/patrole_tempest_plugin/tests/api/identity/v3/test_endpoint_filter_rbac.py
+++ b/patrole_tempest_plugin/tests/api/identity/v3/test_endpoint_filter_rbac.py
@@ -26,7 +26,7 @@
@classmethod
def setup_clients(cls):
super(IdentityEndpointsFilterV3RbacTest, cls).setup_clients()
- cls.ep_api_client = cls.os.endpoint_filter_client
+ cls.ep_api_client = cls.os_primary.endpoint_filter_client
@classmethod
def resource_setup(cls):
diff --git a/patrole_tempest_plugin/tests/api/image/rbac_base.py b/patrole_tempest_plugin/tests/api/image/rbac_base.py
index 7266079..2a45ccb 100644
--- a/patrole_tempest_plugin/tests/api/image/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/image/rbac_base.py
@@ -33,7 +33,7 @@
@classmethod
def setup_clients(cls):
super(BaseV1ImageRbacTest, cls).setup_clients()
- cls.auth_provider = cls.os.auth_provider
+ cls.auth_provider = cls.os_primary.auth_provider
cls.rbac_utils = rbac_utils()
cls.rbac_utils.switch_role(cls, toggle_rbac_role=False)
@@ -52,6 +52,6 @@
@classmethod
def setup_clients(cls):
super(BaseV2ImageRbacTest, cls).setup_clients()
- cls.auth_provider = cls.os.auth_provider
+ cls.auth_provider = cls.os_primary.auth_provider
cls.rbac_utils = rbac_utils()
cls.rbac_utils.switch_role(cls, toggle_rbac_role=False)
diff --git a/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py b/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py
index 643ca73..8015277 100644
--- a/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py
+++ b/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py
@@ -29,7 +29,7 @@
@classmethod
def setup_clients(cls):
super(ImagesMemberRbacTest, cls).setup_clients()
- cls.image_member_client = cls.os.image_member_client
+ cls.image_member_client = cls.os_primary.image_member_client
@classmethod
def resource_setup(cls):
diff --git a/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py b/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py
index 07d4015..a7c59f5 100644
--- a/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py
+++ b/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py
@@ -32,8 +32,8 @@
@classmethod
def setup_clients(cls):
super(ImagesMemberRbacTest, cls).setup_clients()
- cls.image_client = cls.os.image_client_v2
- cls.image_member_client = cls.os.image_member_client_v2
+ cls.image_client = cls.os_primary.image_client_v2
+ cls.image_member_client = cls.os_primary.image_member_client_v2
@rbac_rule_validation.action(service="glance",
rule="add_member")
diff --git a/patrole_tempest_plugin/tests/api/image/v2/test_images_rbac.py b/patrole_tempest_plugin/tests/api/image/v2/test_images_rbac.py
index e7fe87f..880f892 100644
--- a/patrole_tempest_plugin/tests/api/image/v2/test_images_rbac.py
+++ b/patrole_tempest_plugin/tests/api/image/v2/test_images_rbac.py
@@ -27,7 +27,7 @@
@classmethod
def setup_clients(cls):
super(BasicOperationsImagesRbacTest, cls).setup_clients()
- cls.client = cls.os.image_client_v2
+ cls.client = cls.os_primary.image_client_v2
def _create_image(self, **kwargs):
image_name = data_utils.rand_name('image')
diff --git a/patrole_tempest_plugin/tests/api/network/rbac_base.py b/patrole_tempest_plugin/tests/api/network/rbac_base.py
index 6e7898f..629f0ca 100644
--- a/patrole_tempest_plugin/tests/api/network/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/network/rbac_base.py
@@ -35,6 +35,6 @@
@classmethod
def setup_clients(cls):
super(BaseNetworkRbacTest, cls).setup_clients()
- cls.auth_provider = cls.os.auth_provider
+ cls.auth_provider = cls.os_primary.auth_provider
cls.rbac_utils = rbac_utils()
cls.rbac_utils.switch_role(cls, toggle_rbac_role=False)
diff --git a/patrole_tempest_plugin/tests/api/network/test_metering_label_rules_rbac.py b/patrole_tempest_plugin/tests/api/network/test_metering_label_rules_rbac.py
index 2f55e30..2efb3fe 100644
--- a/patrole_tempest_plugin/tests/api/network/test_metering_label_rules_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_metering_label_rules_rbac.py
@@ -39,8 +39,9 @@
@classmethod
def setup_clients(cls):
super(MeteringLabelRulesRbacTest, cls).setup_clients()
- cls.metering_labels_client = cls.os.metering_labels_client
- cls.metering_label_rules_client = cls.os.metering_label_rules_client
+ cls.metering_labels_client = cls.os_primary.metering_labels_client
+ cls.metering_label_rules_client = \
+ cls.os_primary.metering_label_rules_client
@classmethod
def resource_setup(cls):
diff --git a/patrole_tempest_plugin/tests/api/network/test_metering_labels_rbac.py b/patrole_tempest_plugin/tests/api/network/test_metering_labels_rbac.py
index 091e31d..9aabfa0 100644
--- a/patrole_tempest_plugin/tests/api/network/test_metering_labels_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_metering_labels_rbac.py
@@ -37,7 +37,7 @@
@classmethod
def setup_clients(cls):
super(MeteringLabelsRbacTest, cls).setup_clients()
- cls.metering_labels_client = cls.os.metering_labels_client
+ cls.metering_labels_client = cls.os_primary.metering_labels_client
def _create_metering_label(self):
body = self.metering_labels_client.create_metering_label(
diff --git a/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py b/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py
index 9752db6..133ea74 100644
--- a/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py
@@ -30,12 +30,6 @@
class RbacNetworksTest(base.BaseNetworkRbacTest):
@classmethod
- def setup_clients(cls):
- super(RbacNetworksTest, cls).setup_clients()
- cls.networks_client = cls.os.networks_client
- cls.subnet_client = cls.os.subnets_client
-
- @classmethod
def resource_setup(cls):
super(RbacNetworksTest, cls).resource_setup()
diff --git a/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py b/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py
index b426ecd..7be7d40 100644
--- a/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py
@@ -33,6 +33,6 @@
@classmethod
def setup_clients(cls):
super(BaseOrchestrationRbacTest, cls).setup_clients()
- cls.auth_provider = cls.os.auth_provider
+ cls.auth_provider = cls.os_primary.auth_provider
cls.rbac_utils = rbac_utils()
cls.rbac_utils.switch_role(cls, toggle_rbac_role=False)
diff --git a/patrole_tempest_plugin/tests/api/volume/rbac_base.py b/patrole_tempest_plugin/tests/api/volume/rbac_base.py
index 79b9f0d..ccadad1 100644
--- a/patrole_tempest_plugin/tests/api/volume/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/volume/rbac_base.py
@@ -35,15 +35,18 @@
@classmethod
def setup_clients(cls):
super(BaseVolumeRbacTest, cls).setup_clients()
- cls.auth_provider = cls.os.auth_provider
+ cls.auth_provider = cls.os_primary.auth_provider
cls.rbac_utils = rbac_utils()
cls.rbac_utils.switch_role(cls, toggle_rbac_role=False)
version_checker = {
- 1: [cls.os.volume_hosts_client, cls.os.volume_types_client],
- 2: [cls.os.volume_hosts_v2_client, cls.os.volume_types_v2_client],
- 3: [cls.os.volume_hosts_v2_client, cls.os.volume_types_v2_client]
+ 1: [cls.os_primary.volume_hosts_client,
+ cls.os_primary.volume_types_client],
+ 2: [cls.os_primary.volume_hosts_v2_client,
+ cls.os_primary.volume_types_v2_client],
+ 3: [cls.os_primary.volume_hosts_v2_client,
+ cls.os_primary.volume_types_v2_client]
}
cls.volume_hosts_client, cls.volume_types_client = \
version_checker[cls._api_version]
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 28506c0..9d76ef3 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,8 @@
@classmethod
def setup_clients(cls):
super(CapabilitiesRbacTest, cls).setup_clients()
- cls.client = cls.os.volume_capabilities_v2_client
- cls.hosts_client = cls.os.volume_hosts_v2_client
+ cls.client = cls.os_primary.volume_capabilities_v2_client
+ cls.hosts_client = cls.os_primary.volume_hosts_v2_client
@rbac_rule_validation.action(service="cinder",
rule="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 86a3d0f..d829591 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
@@ -31,7 +31,7 @@
@classmethod
def setup_clients(cls):
super(EncryptionTypesRbacTest, cls).setup_clients()
- cls.client = cls.os.encryption_types_v2_client
+ cls.client = cls.os_primary.encryption_types_v2_client
def _create_volume_type_encryption(self):
vol_type_id = self.create_volume_type()['id']
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 c3cca0d..4638e78 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_qos_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_qos_rbac.py
@@ -26,8 +26,8 @@
@classmethod
def setup_clients(cls):
super(VolumeQOSRbacTest, cls).setup_clients()
- cls.auth_provider = cls.os.auth_provider
- cls.client = cls.os.volume_qos_v2_client
+ cls.auth_provider = cls.os_primary.auth_provider
+ cls.client = cls.os_primary.volume_qos_v2_client
def _create_test_qos_specs(self, name=None, consumer=None, **kwargs):
"""Create a test Qos-Specs."""
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 bf6290a..5a36709 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
@@ -32,7 +32,7 @@
@classmethod
def setup_clients(cls):
super(SchedulerStatsRbacTest, cls).setup_clients()
- cls.client = cls.os.volume_scheduler_stats_v2_client
+ cls.client = cls.os_primary.volume_scheduler_stats_v2_client
@rbac_rule_validation.action(
service="cinder",
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 b070a10..30c1092 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
@@ -36,7 +36,7 @@
@classmethod
def setup_clients(cls):
super(SnapshotsActionsRbacTest, cls).setup_clients()
- cls.client = cls.os.snapshots_client
+ cls.client = cls.snapshots_client
@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 b1e5cba..60484f1 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
@@ -32,7 +32,7 @@
@classmethod
def setup_clients(cls):
super(MessagesV3RbacTest, cls).setup_clients()
- cls.client = cls.os.volume_v3_messages_client
+ cls.client = cls.os_primary.volume_v3_messages_client
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_actions_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_actions_rbac.py
index d6c2d13..f94ed43 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
@@ -37,9 +37,9 @@
super(VolumesActionsRbacTest, cls).setup_clients()
cls.client = cls.volumes_client
if CONF.image_feature_enabled.api_v1:
- cls.image_client = cls.os.image_client
+ cls.image_client = cls.os_primary.image_client
elif CONF.image_feature_enabled.api_v2:
- cls.image_client = cls.os.image_client_v2
+ cls.image_client = cls.os_primary.image_client_v2
cls.image_id = CONF.compute.image_ref
@classmethod
@@ -48,7 +48,8 @@
cls.volume = cls.create_volume()
def _create_server(self):
- server, _ = compute.create_test_server(self.os, wait_until='ACTIVE')
+ server, _ = compute.create_test_server(
+ self.os_primary, wait_until='ACTIVE')
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.servers_client.delete_server, server['id'])
return server
@@ -105,7 +106,7 @@
self.image_client.delete_image,
image_id)
waiters.wait_for_image_status(self.image_client, image_id, 'active')
- waiters.wait_for_volume_resource_status(self.os_adm.volumes_client,
+ waiters.wait_for_volume_resource_status(self.os_admin.volumes_client,
self.volume['id'], 'available')
@rbac_rule_validation.action(service="cinder",
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 1c73e68..91f55c7 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
@@ -29,7 +29,7 @@
@classmethod
def setup_clients(cls):
super(VolumeMetadataRbacTest, cls).setup_clients()
- cls.client = cls.os.volumes_client
+ cls.client = cls.volumes_client
def _add_metadata(self, volume):
# Create metadata for the volume
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 a104782..0321e13 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,12 +32,12 @@
@classmethod
def setup_credentials(cls):
super(VolumeQuotasRbacTest, cls).setup_credentials()
- cls.demo_tenant_id = cls.os.credentials.tenant_id
+ cls.demo_tenant_id = cls.os_primary.credentials.tenant_id
@classmethod
def setup_clients(cls):
super(VolumeQuotasRbacTest, cls).setup_clients()
- cls.client = cls.os.volume_quotas_client
+ cls.client = cls.os_primary.volume_quotas_client
@rbac_rule_validation.action(service="cinder",
rule="volume_extension:quotas:show")
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 cb40c50..057379b 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
@@ -28,8 +28,8 @@
@classmethod
def setup_clients(cls):
super(VolumesTransfersRbacTest, cls).setup_clients()
- cls.client = cls.os.volume_transfers_v2_client
- cls.adm_volumes_client = cls.os_adm.volumes_v2_client
+ cls.client = cls.os_primary.volume_transfers_v2_client
+ cls.adm_volumes_client = cls.os_admin.volumes_v2_client
@classmethod
def resource_setup(cls):