x/tobiko
Code Issues Proposed changes

Initialize Keystone session using the new keystone package.

Browse Source 
Change-Id: I5e9ca6201431680a65888830cffabf332fddeb1f
This commit is contained in:
Federico Ressi 2019-03-19 12:02:34 +01:00
parent a29d930a84
commit d8b1d1b618
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tobiko/common/clients.py
View File

@ -31,14 +31,8 @@ class ClientManager(object):
def session(self):
"""Returns keystone session."""
if self._session is None:
from keystoneauth1 import loading
from keystoneauth1 import session
loader = loading.get_plugin_loader('password')
credentials = (self.credentials or
keystone.default_keystone_credentials()).to_dict()
del credentials['api_version'] # this parameter is not accepted
auth = loader.load_from_options(**credentials)
self._session = session.Session(auth=auth, verify=False)
self._session = keystone.get_keystone_session(
credentials=self.credentials)
return self._session
@property

1
tobiko/openstack/keystone/__init__.py
View File

@ -23,3 +23,4 @@ InvalidKeystoneCredentials = credentials.InvalidKeystoneCredentials
KeystoneSessionFixture = session.KeystoneSessionFixture
KeystoneSessionManager = session.KeystoneSessionManager
get_keystone_session = session.get_keystone_session

8
tobiko/openstack/keystone/session.py
View File

@ -87,3 +87,11 @@ class KeystoneSessionManager(object):
SESSIONS = KeystoneSessionManager()
def get_keystone_session(credentials=None, shared=True, init_session=None,
manager=None):
manager = manager or SESSIONS
session = manager.get_session(credentials=credentials, shared=shared,
init_session=init_session)
return tobiko.setup_fixture(session).session