openstack/python-keystoneclient
Code Issues Proposed changes

Pull the endpoint from the Session

Browse Source 
If the user passes a Session in, we can pull the endpoint to use for
discovery from the Session itself, rather than erroring.

Closes-Bug: #1513839
Co-Authored-By: Dolph Mathews <dolph.mathews@gmail.com>
Change-Id: I82a41c67f80d2494f04739d82b112b7ff1dc4682
This commit is contained in:
Monty Taylor
2015-11-06 09:09:08 -05:00
parent 355e47abe1
commit d9031c2528
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keystoneclient/auth/base.py
View File

@@ -12,6 +12,7 @@
import os import os
from keystoneauth1 import plugin
import six import six
import stevedore import stevedore
@@ -21,7 +22,7 @@ from keystoneclient import exceptions
# NOTE(jamielennox): The AUTH_INTERFACE is a special value that can be # NOTE(jamielennox): The AUTH_INTERFACE is a special value that can be
# requested from get_endpoint. If a plugin receives this as the value of # requested from get_endpoint. If a plugin receives this as the value of
# 'interface' it should return the initial URL that was passed to the plugin. # 'interface' it should return the initial URL that was passed to the plugin.
AUTH_INTERFACE = object() AUTH_INTERFACE = plugin.AUTH_INTERFACE
PLUGIN_NAMESPACE = 'keystoneclient.auth.plugin' PLUGIN_NAMESPACE = 'keystoneclient.auth.plugin'
IDENTITY_AUTH_HEADER_NAME = 'X-Auth-Token' IDENTITY_AUTH_HEADER_NAME = 'X-Auth-Token'

8
keystoneclient/discover.py
View File

@@ -17,6 +17,7 @@ from debtcollector import removals
import six import six
from keystoneclient import _discover from keystoneclient import _discover
from keystoneclient.auth import base
from keystoneclient import exceptions from keystoneclient import exceptions
from keystoneclient.i18n import _ from keystoneclient.i18n import _
from keystoneclient import session as client_session from keystoneclient import session as client_session
@@ -170,11 +171,14 @@ class Discover(_discover.Discover):
elif auth_url: elif auth_url:
self._use_endpoint = False self._use_endpoint = False
url = auth_url url = auth_url
elif session.auth:
self._use_endpoint = False
url = session.get_endpoint(interface=base.AUTH_INTERFACE)
if not url: if not url:
raise exceptions.DiscoveryFailure( raise exceptions.DiscoveryFailure(
_('Not enough information to determine URL. Provide either ' _('Not enough information to determine URL. Provide'
'auth_url or endpoint')) ' either a Session, or auth_url or endpoint'))
self._client_kwargs = kwargs self._client_kwargs = kwargs
super(Discover, self).__init__(session, url, super(Discover, self).__init__(session, url,

2
keystoneclient/tests/unit/auth/test_identity_v3.py
View File

@@ -216,7 +216,7 @@ class V3IdentityPlugin(utils.TestCase):
username=self.TEST_USER, username=self.TEST_USER,
password=self.TEST_PASS) password=self.TEST_PASS)
s = session.Session(auth=a) s = session.Session(auth=a)
cs = client.Client(session=s, auth_url=self.TEST_URL) cs = client.Client(session=s)
# As a sanity check on the auth_ref, make sure client has the # As a sanity check on the auth_ref, make sure client has the
# proper user id, that it fetches the right project response # proper user id, that it fetches the right project response

1
requirements.txt
View File

@@ -8,6 +8,7 @@ argparse
Babel>=1.3 Babel>=1.3
iso8601>=0.1.9 iso8601>=0.1.9
debtcollector>=0.3.0 # Apache-2.0 debtcollector>=0.3.0 # Apache-2.0
keystoneauth1>=1.0.0
netaddr!=0.7.16,>=0.7.12 netaddr!=0.7.16,>=0.7.12
oslo.config>=2.3.0 # Apache-2.0 oslo.config>=2.3.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0