[CVP] Improve OS authentication in spt
Change-Id: I129c043e38f278ac836b621999357178c3a43598
Related-PROD: PROD-30815
(cherry picked from commit 47aad3d8025181f224bd9cf385e3d2a874a65193)
diff --git a/test_set/cvp-spt/fixtures/base.py b/test_set/cvp-spt/fixtures/base.py
index 41fabb4..34a598e 100644
--- a/test_set/cvp-spt/fixtures/base.py
+++ b/test_set/cvp-spt/fixtures/base.py
@@ -29,21 +29,22 @@
def openstack_clients(local_salt_client):
nodes_info = local_salt_client.cmd(
'keystone:server', 'pillar.get',
- ['keystone:server'],
+ ['keystone:client:os_client_config:cfgs:root:content:clouds:admin_identity'],
expr_form='pillar')
+
if nodes_info.__len__() < 1:
pytest.skip("No keystone server found")
return False
keystone = nodes_info[nodes_info.keys()[0]]
- url = 'http://{ip}:{port}/'.format(ip=keystone['bind']['public_address'],
- port=keystone['bind']['public_port'])
+ # TODO: region? OS_CACERT?
return os_client.OfficialClientManager(
- username=keystone['admin_name'],
- password=keystone['admin_password'],
- tenant_name=keystone['admin_tenant'],
- auth_url=url,
+ username=keystone['auth']['username'],
+ password=keystone['auth']['password'],
+ tenant_name=keystone['auth']['project_name'],
+ auth_url=keystone['auth']['auth_url'],
cert=False,
- domain='Default',
+ # domain will be used as project_domain_name and user_domain_name
+ domain=keystone['auth']['project_domain_name'],
)