openstack/python-keystoneclient
Code Issues Proposed changes

Merge "get_endpoint should return the override"

Browse Source
This commit is contained in:
Jenkins
2014-12-18 14:00:15 +00:00
committed by Gerrit Code Review
parent e36852a1c8 6b0fd667ce
commit 6c1a9b49dc
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keystoneclient/adapter.py
View File

@@ -116,6 +116,9 @@ class Adapter(object):
:returns: An endpoint if available or None. :returns: An endpoint if available or None.
:rtype: string :rtype: string
""" """
if self.endpoint_override:
return self.endpoint_override
self._set_endpoint_filter_kwargs(kwargs) self._set_endpoint_filter_kwargs(kwargs)
return self.session.get_endpoint(auth or self.auth, **kwargs) return self.session.get_endpoint(auth or self.auth, **kwargs)

2
keystoneclient/tests/test_session.py
View File

@@ -699,6 +699,8 @@ class AdapterTest(utils.TestCase):
self.assertEqual(response, resp.text) self.assertEqual(response, resp.text)
self.assertEqual(endpoint_url, self.requests.last_request.url) self.assertEqual(endpoint_url, self.requests.last_request.url)
self.assertEqual(endpoint_override, adpt.get_endpoint())
def test_adapter_invalidate(self): def test_adapter_invalidate(self):
auth = CalledAuthPlugin() auth = CalledAuthPlugin()
sess = client_session.Session() sess = client_session.Session()