x
/
python-kingbirdclient
Code Issues Proposed changes

Add session parameter in api/client.py 

Currently we donot have session parameter in kingbirdclient/api/v1/client.py
but we have it in kingbirdclient/api/client.py which is the root for kb-client.
This commit also enables usage of only session object to communicate
with Kingbird client.

Change-Id: Iff184840b0865d2b80aa0ba5f9deb4ad97cc24ba
This commit is contained in:
GouthamPratapa 2017-09-18 14:00:53 +05:30
parent 3c6a972c86
commit 078b0eed0d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kingbirdclient/api/client.py
View File

@ -22,7 +22,7 @@ def client(kingbird_url=None, username=None, api_key=None,
endpoint_type='publicURL', service_type='synchronization',
auth_token=None, user_id=None, cacert=None, insecure=False,
profile=None, auth_type='keystone', client_id=None,
client_secret=None, **kwargs):
client_secret=None, session=None, **kwargs):
if kingbird_url and not isinstance(kingbird_url, six.string_types):
raise RuntimeError('Kingbird url should be a string.')
@ -43,6 +43,7 @@ def client(kingbird_url=None, username=None, api_key=None,
auth_type=auth_type,
client_id=client_id,
client_secret=client_secret,
session=session,
**kwargs
)

8
kingbirdclient/api/v1/client.py
View File

@ -105,10 +105,10 @@ def authenticate(kingbird_url=None, username=None,
raise RuntimeError(
'Only user name or user id should be set'
)
user_domain_name = kwargs['user_domain_name']
user_domain_id = kwargs['user_domain_id']
project_domain_name = kwargs['project_domain_name']
project_domain_id = kwargs['project_domain_id']
user_domain_name = kwargs.get('user_domain_name')
user_domain_id = kwargs.get('user_domain_id')
project_domain_name = kwargs.get('project_domain_name')
project_domain_id = kwargs.get('project_domain_id')
if session is None:
if auth_token: