openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Fix passing get_token kwargs to get_access"

Browse Source
This commit is contained in:
Jenkins
2014-03-25 18:42:49 +00:00
committed by Gerrit Code Review
parent c77d31c31f 8040085bd5
commit 87d889b614
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
keystoneclient/auth/identity/base.py
View File

@@ -66,20 +66,19 @@ class BaseIdentityPlugin(base.BaseAuthPlugin):
def get_token(self, session, **kwargs):
"""Return a valid auth token.
If a valid token is not present then a new one will be fetched using
the session and kwargs.
If a valid token is not present then a new one will be fetched.
:raises HTTPError: An error from an invalid HTTP response.
:return string: A valid token.
"""
return self.get_access(session, **kwargs).auth_token
return self.get_access(session).auth_token
def get_access(self, session, **kwargs):
"""Fetch or return a current AccessInfo object.
If a valid AccessInfo is present then it is returned otherwise kwargs
and session are used to fetch a new one.
If a valid AccessInfo is present then it is returned otherwise a new
one will be fetched.
:raises HTTPError: An error from an invalid HTTP response.
@@ -87,6 +86,6 @@ class BaseIdentityPlugin(base.BaseAuthPlugin):
"""
if (not self.auth_ref or
self.auth_ref.will_expire_soon(self.MIN_TOKEN_LIFE_SECONDS)):
self.auth_ref = self.get_auth_ref(session, **kwargs)
self.auth_ref = self.get_auth_ref(session)
return self.auth_ref