arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #108 from fnordahl/add-keystonev2-session-client

Browse Source 
Add keystonev2 session client
This commit is contained in:
Liam Young
2018-08-10 11:29:59 +01:00
committed by GitHub
parent c68e5c6d18 811c91aec5
commit 8b98b2369e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zaza/utilities/openstack.py
+8 -2
View File
@@ -25,6 +25,7 @@ from .os_versions import (
from glanceclient import Client as GlanceClient
from keystoneclient.v2_0 import client as keystoneclient_v2
from keystoneclient.v3 import client as keystoneclient_v3
from keystoneauth1 import session
from keystoneauth1.identity import (
@@ -262,15 +263,20 @@ def get_undercloud_keystone_session(verify=None):
verify=verify)
def get_keystone_session_client(session):
def get_keystone_session_client(session, client_api_version=3):
"""Return keystoneclient authenticated by keystone session.
:param session: Keystone session object
:type session: keystoneauth1.session.Session object
:param client_api_version: Whether you want a v2 or v3 Keystone Client
:type client_api_version: int
:returns: Authenticated keystoneclient
:rtype: keystoneclient.v3.Client object
"""
return keystoneclient_v3.Client(session=session)
if client_api_version == 2:
return keystoneclient_v2.Client(session=session)
else:
return keystoneclient_v3.Client(session=session)
def get_keystone_client(opentackrc_creds, verify=None):