From 99e3b48a21b1544ec72c57b8fc1ba621e4009003 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Wed, 29 Apr 2015 17:36:43 -0500 Subject: [PATCH] Adapter version is a tuple The docstring for Adapter says that the version is a tuple like (3,0), but the HttpClient was passing a string like "v3". Closes-Bug: 1450272 Change-Id: I74b009d68f5601bda3ae92b3c8de1ecef00d8316 --- keystoneclient/httpclient.py | 6 +++++- keystoneclient/tests/unit/v2_0/test_client.py | 2 +- keystoneclient/tests/unit/v3/test_client.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py index 327029522..317a9e88e 100644 --- a/keystoneclient/httpclient.py +++ b/keystoneclient/httpclient.py @@ -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) diff --git a/keystoneclient/tests/unit/v2_0/test_client.py b/keystoneclient/tests/unit/v2_0/test_client.py index 2700b3182..379bea4e7 100644 --- a/keystoneclient/tests/unit/v2_0/test_client.py +++ b/keystoneclient/tests/unit/v2_0/test_client.py @@ -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) diff --git a/keystoneclient/tests/unit/v3/test_client.py b/keystoneclient/tests/unit/v3/test_client.py index 6be09c117..c01cac20d 100644 --- a/keystoneclient/tests/unit/v3/test_client.py +++ b/keystoneclient/tests/unit/v3/test_client.py @@ -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)