Update for using endpoint_type to create client

Code Issues Proposed changes

To create client using endpoint_type conf value.
Related-bug: #2092514
Change-Id: I57598f07dc9fd55b00f043f564414f222b8765d9

This commit is contained in:

hongp

2024年12月26日 17:18:38 +09:00

parent 9c743992f8

commit 5f585fb639

1 changed files with 11 additions and 5 deletions

@@ -1283,12 +1283,18 @@ class BaseSharesMixedTest(BaseSharesAdminTest):

cls.admin_project = cls.os_admin.auth_provider.auth_data[1]['project']

identity_clients = getattr(

cls.os_admin, 'identity_%s' % CONF.identity.auth_version)

cls.os_admin.identity_client = identity_clients.IdentityClient()

cls.os_admin.projects_client = identity_clients.ProjectsClient()

cls.os_admin.users_client = identity_clients.UsersClient()

cls.os_admin.roles_client = identity_clients.RolesClient()

endpoint_type = CONF.share.endpoint_type

cls.os_admin.identity_client = identity_clients.IdentityClient(

endpoint_type=endpoint_type)

cls.os_admin.projects_client = identity_clients.ProjectsClient(

endpoint_type=endpoint_type)

cls.os_admin.users_client = identity_clients.UsersClient(

endpoint_type=endpoint_type)

cls.os_admin.roles_client = identity_clients.RolesClient(

endpoint_type=endpoint_type)

cls.os_admin.domains_client = (

cls.os_admin.identity_v3.DomainsClient() if

cls.os_admin.identity_v3.DomainsClient(

endpoint_type=endpoint_type) if

CONF.identity.auth_version == 'v3' else None)

cls.admin_project_member_client = cls.create_user_and_get_client(

project=cls.admin_project, add_member_role=True)