Removing unused admin_client
After the merger of blueprint 'modifying-switching-role-mechanism',
no admin_client is needed.
As a part part of cleanup, this patch aims to remove unused admin_client.
Partially implements: blueprint cleanup-as-a-result-of-framework-change
Change-Id: I576bc2319d6d621443f816765e9b6ff2ae739f8a
diff --git a/patrole_tempest_plugin/tests/api/compute/rbac_base.py b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
index 8292a1b..fc24c03 100644
--- a/patrole_tempest_plugin/tests/api/compute/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
@@ -40,7 +40,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()
@@ -64,7 +63,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 0155800..8416fe9 100644
--- a/patrole_tempest_plugin/tests/api/identity/v2/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/identity/v2/rbac_base.py
@@ -43,7 +43,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 c7872b3..1fccbe1 100644
--- a/patrole_tempest_plugin/tests/api/identity/v3/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/identity/v3/rbac_base.py
@@ -43,7 +43,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 9072cb3..9725ffc 100644
--- a/patrole_tempest_plugin/tests/api/image/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/image/rbac_base.py
@@ -39,7 +39,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()
@@ -63,5 +62,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 5f93d81..64ae985 100644
--- a/patrole_tempest_plugin/tests/api/network/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/network/rbac_base.py
@@ -41,5 +41,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 7a6ab13..eb21637 100644
--- a/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/orchestration/rbac_base.py
@@ -39,7 +39,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 1cb128e..e826f3a 100644
--- a/patrole_tempest_plugin/tests/api/volume/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/volume/rbac_base.py
@@ -39,7 +39,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()
@@ -63,7 +62,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],