Merge "Removing unused admin_client"
diff --git a/patrole_tempest_plugin/tests/api/compute/rbac_base.py b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
index 4243bdd..de544bb 100644
--- a/patrole_tempest_plugin/tests/api/compute/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
@@ -36,7 +36,6 @@
@classmethod
def setup_clients(cls):
super(BaseV2ComputeRbacTest, cls).setup_clients()
- cls.admin_client = cls.os_admin.agents_client
cls.auth_provider = cls.os.auth_provider
cls.rbac_utils = rbac_utils()
@@ -55,7 +54,6 @@
@classmethod
def setup_clients(cls):
super(BaseV2ComputeAdminRbacTest, cls).setup_clients()
- cls.admin_client = cls.os_admin.agents_client
cls.auth_provider = cls.os.auth_provider
cls.rbac_utils = rbac_utils()
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 77afed5..e7cca4a 100644
--- a/patrole_tempest_plugin/tests/api/identity/v2/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/identity/v2/rbac_base.py
@@ -38,7 +38,6 @@
def setup_clients(cls):
super(BaseIdentityV2AdminRbacTest, cls).setup_clients()
cls.auth_provider = cls.os.auth_provider
- cls.admin_client = cls.os_adm.identity_client
cls.tenants_client = cls.os.tenants_client
cls.users_client = cls.os.users_client
cls.rbac_utils = rbac_utils()
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 bad53b3..3f045f2 100644
--- a/patrole_tempest_plugin/tests/api/identity/v3/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/identity/v3/rbac_base.py
@@ -38,7 +38,6 @@
def setup_clients(cls):
super(BaseIdentityV3RbacAdminTest, cls).setup_clients()
cls.auth_provider = cls.os.auth_provider
- cls.admin_client = cls.os_adm.identity_v3_client
cls.creds_client = cls.os.credentials_client
cls.services_client = cls.os.identity_services_v3_client
cls.endpoints_client = cls.os.endpoints_v3_client
diff --git a/patrole_tempest_plugin/tests/api/image/rbac_base.py b/patrole_tempest_plugin/tests/api/image/rbac_base.py
index 3570b81..daea89c 100644
--- a/patrole_tempest_plugin/tests/api/image/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/image/rbac_base.py
@@ -34,7 +34,6 @@
def setup_clients(cls):
super(BaseV1ImageRbacTest, cls).setup_clients()
cls.auth_provider = cls.os.auth_provider
- cls.admin_client = cls.os_adm.image_client
cls.rbac_utils = rbac_utils()
@@ -53,5 +52,4 @@
def setup_clients(cls):
super(BaseV2ImageRbacTest, cls).setup_clients()
cls.auth_provider = cls.os.auth_provider
- cls.admin_client = cls.os_adm.image_client_v2
cls.rbac_utils = rbac_utils()
diff --git a/patrole_tempest_plugin/tests/api/network/rbac_base.py b/patrole_tempest_plugin/tests/api/network/rbac_base.py
index 5beedc2..af5d110 100644
--- a/patrole_tempest_plugin/tests/api/network/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/network/rbac_base.py
@@ -36,5 +36,4 @@
def setup_clients(cls):
super(BaseNetworkRbacTest, cls).setup_clients()
cls.auth_provider = cls.os.auth_provider
- cls.admin_client = cls.os_adm.agents_client
cls.rbac_utils = rbac_utils()
diff --git a/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py b/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py
index e892a02..562c66e 100644
--- a/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py
@@ -34,7 +34,6 @@
def setup_clients(cls):
super(BaseOrchestrationRbacTest, cls).setup_clients()
cls.auth_provider = cls.os.auth_provider
- cls.admin_client = cls.os_adm.orchestration_client
cls.rbac_utils = rbac_utils()
def tearDown(self):
diff --git a/patrole_tempest_plugin/tests/api/volume/admin/test_qos_rbac.py b/patrole_tempest_plugin/tests/api/volume/admin/test_qos_rbac.py
index 0d59f77..6e879f8 100644
--- a/patrole_tempest_plugin/tests/api/volume/admin/test_qos_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/admin/test_qos_rbac.py
@@ -28,7 +28,6 @@
@classmethod
def setup_clients(cls):
super(VolumeQOSRbacTest, cls).setup_clients()
- cls.admin_client = cls.os_adm.volume_qos_client
cls.auth_provider = cls.os.auth_provider
cls.client = cls.admin_volume_qos_client
diff --git a/patrole_tempest_plugin/tests/api/volume/rbac_base.py b/patrole_tempest_plugin/tests/api/volume/rbac_base.py
index 6d1ad16..005986d 100644
--- a/patrole_tempest_plugin/tests/api/volume/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/volume/rbac_base.py
@@ -34,7 +34,6 @@
def setup_clients(cls):
super(BaseVolumeRbacTest, cls).setup_clients()
cls.auth_provider = cls.os.auth_provider
- cls.admin_client = cls.os_adm.volumes_client
cls.rbac_utils = rbac_utils()
@@ -53,7 +52,6 @@
def setup_clients(cls):
super(BaseVolumeAdminRbacTest, cls).setup_clients()
cls.auth_provider = cls.os.auth_provider
- cls.admin_client = cls.os_adm.volumes_client
cls.rbac_utils = rbac_utils()
version_checker = {
1: [cls.os.volume_hosts_client, cls.os.volume_types_client],