openstack/tempest
Code Issues Proposed changes

Merge "Remove Keystone client variables that are not used anywhere"

Browse Source
This commit is contained in:
Jenkins 2016-02-09 13:34:34 +00:00 committed by Gerrit Code Review
commit ab1f21d7be
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tempest/api/identity/base.py
View File

@ -75,7 +75,6 @@ class BaseIdentityV2Test(BaseIdentityTest):
cls.non_admin_client = cls.os.identity_public_client cls.non_admin_client = cls.os.identity_public_client
cls.non_admin_token_client = cls.os.token_client cls.non_admin_token_client = cls.os.token_client
cls.non_admin_tenants_client = cls.os.tenants_public_client cls.non_admin_tenants_client = cls.os.tenants_public_client
cls.non_admin_roles_client = cls.os.roles_public_client
cls.non_admin_users_client = cls.os.users_public_client cls.non_admin_users_client = cls.os.users_public_client
@classmethod @classmethod

12
tempest/clients.py
View File

@ -501,9 +501,10 @@ class Manager(manager.Manager):
'region': CONF.identity.region 'region': CONF.identity.region
} }
params.update(self.default_params_with_timeout_values) params.update(self.default_params_with_timeout_values)
# Clients below use the admin endpoint type of Keystone API v2
params_v2_admin = params.copy() params_v2_admin = params.copy()
params_v2_admin['endpoint_type'] = CONF.identity.v2_admin_endpoint_type params_v2_admin['endpoint_type'] = CONF.identity.v2_admin_endpoint_type
# Client uses admin endpoint type of Keystone API v2
self.endpoints_v2_client = EndpointsV2Client(self.auth_provider, self.endpoints_v2_client = EndpointsV2Client(self.auth_provider,
**params_v2_admin) **params_v2_admin)
self.identity_client = IdentityClient(self.auth_provider, self.identity_client = IdentityClient(self.auth_provider,
@ -516,21 +517,21 @@ class Manager(manager.Manager):
**params_v2_admin) **params_v2_admin)
self.services_v2_client = ServicesV2Client(self.auth_provider, self.services_v2_client = ServicesV2Client(self.auth_provider,
**params_v2_admin) **params_v2_admin)
# Clients below use the public endpoint type of Keystone API v2
params_v2_public = params.copy() params_v2_public = params.copy()
params_v2_public['endpoint_type'] = ( params_v2_public['endpoint_type'] = (
CONF.identity.v2_public_endpoint_type) CONF.identity.v2_public_endpoint_type)
# Client uses public endpoint type of Keystone API v2
self.identity_public_client = IdentityClient(self.auth_provider, self.identity_public_client = IdentityClient(self.auth_provider,
**params_v2_public) **params_v2_public)
self.tenants_public_client = TenantsClient(self.auth_provider, self.tenants_public_client = TenantsClient(self.auth_provider,
**params_v2_public) **params_v2_public)
self.roles_public_client = RolesClient(self.auth_provider,
**params_v2_public)
self.users_public_client = UsersClient(self.auth_provider, self.users_public_client = UsersClient(self.auth_provider,
**params_v2_public) **params_v2_public)
# Clients below use the endpoint type of Keystone API v3
params_v3 = params.copy() params_v3 = params.copy()
params_v3['endpoint_type'] = CONF.identity.v3_endpoint_type params_v3['endpoint_type'] = CONF.identity.v3_endpoint_type
# Clients below use the endpoint type of Keystone API v3
self.identity_v3_client = IdentityV3Client(self.auth_provider, self.identity_v3_client = IdentityV3Client(self.auth_provider,
**params_v3) **params_v3)
self.endpoints_client = EndPointV3Client(self.auth_provider, self.endpoints_client = EndPointV3Client(self.auth_provider,
@ -543,6 +544,7 @@ class Manager(manager.Manager):
self.credentials_client = CredentialsV3Client(self.auth_provider, self.credentials_client = CredentialsV3Client(self.auth_provider,
**params_v3) **params_v3)
self.groups_client = GroupsV3Client(self.auth_provider, **params_v3) self.groups_client = GroupsV3Client(self.auth_provider, **params_v3)
# Token clients do not use the catalog. They only need default_params. # Token clients do not use the catalog. They only need default_params.
# They read auth_url, so they should only be set if the corresponding # They read auth_url, so they should only be set if the corresponding
# API version is marked as enabled # API version is marked as enabled