openstack/python-keystoneclient
Code Issues Proposed changes

Fix passing get_token kwargs to get_access

Browse Source 
get_token takes kwargs so that a different plugin implementation might
make use of them. It is not expected that token arguments would be
passed to the code that is doing the token fetching.

Change-Id: I28aa2b8070feec76f225601069c92c535334f4d4
This commit is contained in:
Jamie Lennox
2014-02-27 12:32:50 +10:00
parent efdeb82e91
commit 8040085bd5
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): def get_token(self, session, **kwargs):
"""Return a valid auth token. """Return a valid auth token.
If a valid token is not present then a new one will be fetched using If a valid token is not present then a new one will be fetched.
the session and kwargs.
:raises HTTPError: An error from an invalid HTTP response. :raises HTTPError: An error from an invalid HTTP response.
:return string: A valid token. :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): def get_access(self, session, **kwargs):
"""Fetch or return a current AccessInfo object. """Fetch or return a current AccessInfo object.
If a valid AccessInfo is present then it is returned otherwise kwargs If a valid AccessInfo is present then it is returned otherwise a new
and session are used to fetch a new one. one will be fetched.
:raises HTTPError: An error from an invalid HTTP response. :raises HTTPError: An error from an invalid HTTP response.
@@ -87,6 +86,6 @@ class BaseIdentityPlugin(base.BaseAuthPlugin):
""" """
if (not self.auth_ref or if (not self.auth_ref or
self.auth_ref.will_expire_soon(self.MIN_TOKEN_LIFE_SECONDS)): 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 return self.auth_ref