summaryrefslogtreecommitdiff
path: root/keystoneclient/contrib
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-07-23 15:06:32 +0000
committerGerrit Code Review <review@openstack.org>2014-07-23 15:06:32 +0000
commit2ff18d3c897e55867876013842f1592ff32ba8c1 (patch)
treefb9ec165ce2b8b557c0bff8570c765c80a9acbaf /keystoneclient/contrib
parentd68404df3059efb68993e1bd274ffe06f330725f (diff)
parent14716ed1f2b03aa9e49ab51a87b1a7ecf99abdb3 (diff)
downloadpython-keystoneclient-2ff18d3c897e55867876013842f1592ff32ba8c1.tar.gz
Merge "Rename saml2_token_url to token_url"
Diffstat (limited to 'keystoneclient/contrib')
-rw-r--r--keystoneclient/contrib/auth/v3/saml2.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/keystoneclient/contrib/auth/v3/saml2.py b/keystoneclient/contrib/auth/v3/saml2.py
index be2b482..03323a5 100644
--- a/keystoneclient/contrib/auth/v3/saml2.py
+++ b/keystoneclient/contrib/auth/v3/saml2.py
@@ -177,7 +177,7 @@ class Saml2UnscopedToken(v3.AuthConstructor):
"%(sp_consumer_url)s and Identity Provider "
"%(identity_provider)s %(idp_consumer_url)s are not equal")
msg = msg % {
- 'service_provider': self.saml2_token_url,
+ 'service_provider': self.token_url,
'sp_consumer_url': sp_response_consumer_url,
'identity_provider': self.identity_provider,
'idp_consumer_url': idp_sp_response_consumer_url
@@ -208,7 +208,7 @@ class Saml2UnscopedToken(v3.AuthConstructor):
:type session: keystoneclient.session.Session
"""
- sp_response = session.get(self.saml2_token_url,
+ sp_response = session.get(self.token_url,
headers=self.ECP_SP_EMPTY_REQUEST_HEADERS,
authenticated=False)
@@ -301,7 +301,7 @@ class Saml2UnscopedToken(v3.AuthConstructor):
self.authenticated_response = response
@property
- def saml2_token_url(self):
+ def token_url(self):
"""Return full URL where authorization data is sent."""
values = {
'host': self.auth_url.rstrip('/'),