openstack
/
python-keystoneclient
Code Issues Proposed changes

Merge "Adapter version is a tuple"

This commit is contained in:
Jenkins 2015-05-07 11:54:45 +00:00 committed by Gerrit Code Review
parent 39b7f963f5 99e3b48a21
commit 91de8422de
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystoneclient/httpclient.py
View File

@ -51,6 +51,7 @@ if not hasattr(urlparse, 'parse_qsl'):
urlparse.parse_qsl = cgi.parse_qsl
from keystoneclient import _discover
from keystoneclient import access
from keystoneclient import adapter
from keystoneclient.auth import base
@ -323,13 +324,16 @@ class HTTPClient(baseclient.Client, base.BaseAuthPlugin):
# NOTE(jamielennox): unfortunately we can't just use **kwargs here as
# it would incompatibly limit the kwargs that can be passed to __init__
# try and keep this list in sync with adapter.Adapter.__init__
version = (
_discover.normalize_version_number(self.version) if self.version
else None)
self._adapter = _KeystoneAdapter(session,
service_type='identity',
service_name=service_name,
interface=interface,
region_name=region_name,
endpoint_override=endpoint_override,
version=self.version,
version=version,
auth=auth,
user_agent=user_agent,
connect_retries=connect_retries)

2
keystoneclient/tests/unit/v2_0/test_client.py
View File

@ -181,4 +181,4 @@ class KeystoneClientTest(utils.TestCase):
self.assertEqual(v, getattr(cl._adapter, k))
self.assertEqual('identity', cl._adapter.service_type)
self.assertEqual('v2.0', cl._adapter.version)
self.assertEqual((2, 0), cl._adapter.version)

2
keystoneclient/tests/unit/v3/test_client.py
View File

@ -227,4 +227,4 @@ class KeystoneClientTest(utils.TestCase):
self.assertEqual(v, getattr(cl._adapter, k))
self.assertEqual('identity', cl._adapter.service_type)
self.assertEqual('v3', cl._adapter.version)
self.assertEqual((3, 0), cl._adapter.version)