Split domains_client from keystone V3 client
Partially implements blueprint consistent-service-method-names
Change-Id: I52bebd667f21adddaf41b6159d9b0d0dc9753db6
diff --git a/tempest/common/dynamic_creds.py b/tempest/common/dynamic_creds.py
index 1810c57..a758a32 100644
--- a/tempest/common/dynamic_creds.py
+++ b/tempest/common/dynamic_creds.py
@@ -61,6 +61,7 @@
self.tenants_admin_client,
self.users_admin_client,
self.roles_admin_client,
+ self.domains_admin_client,
self.network_admin_client,
self.networks_admin_client,
self.subnets_admin_client,
@@ -78,6 +79,7 @@
self.tenants_admin_client,
self.users_admin_client,
self.roles_admin_client,
+ self.domains_admin_client,
self.creds_domain_name)
def _get_admin_clients(self):
@@ -90,14 +92,14 @@
os = clients.Manager(self.default_admin_creds)
if self.identity_version == 'v2':
return (os.identity_client, os.tenants_client, os.users_client,
- os.roles_client, os.network_client, os.networks_client,
- os.subnets_client, os.ports_client,
+ os.roles_client, None, os.network_client,
+ os.networks_client, os.subnets_client, os.ports_client,
os.security_groups_client)
else:
return (os.identity_v3_client, os.projects_client,
- os.users_v3_client, None, os.network_client,
- os.networks_client, os.subnets_client, os.ports_client,
- os.security_groups_client)
+ os.users_v3_client, None, os.domains_client,
+ os.network_client, os.networks_client, os.subnets_client,
+ os.ports_client, os.security_groups_client)
def _create_creds(self, suffix="", admin=False, roles=None):
"""Create random credentials under the following schema.