File 0001-Fixed-get_auth_info-for-pre-authenticated-... of Package python-neutronclient

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fixed-get_auth_info-for-pre-authenticated-clients.patch of Package python-neutronclient (Revision 3d58003f78e44b47161a6009473bfcf9)

Currently displaying revision 3d58003f78e44b47161a6009473bfcf9 , Show latest

From 02baef46968b816ac544b037297273ff6a4e8e1b Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Thu, 6 Feb 2014 15:54:14 +0100
Subject: [PATCH] Fixed get_auth_info() for pre-authenticated clients

When a client is instantiated with pre-defined authorization token,
no authentication is done, so no auth_[tenant|user]_id keys are set
for HTTPClient. As a result, Client.get_auth_info() fails with KeyError.

Fixed the issue by setting those keys on HTTPClient initialization.

Change-Id: Ifc9d6b128286b635346a7bc026fcc55dbd002050
Closes-Bug: 1277120
---
 neutronclient/client.py               |  2 ++
 neutronclient/tests/unit/test_auth.py | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

Index: python-neutronclient-2.3.3/neutronclient/client.py
===================================================================
--- python-neutronclient-2.3.3.orig/neutronclient/client.py
+++ python-neutronclient-2.3.3/neutronclient/client.py
@@ -112,6 +112,8 @@ class HTTPClient(httplib2.Http):
         self.endpoint_type = endpoint_type
         self.region_name = region_name
         self.auth_token = token
+        self.auth_tenant_id = None
+        self.auth_user_id = None
         self.content_type = 'application/json'
         self.endpoint_url = endpoint_url
         self.auth_strategy = auth_strategy
Index: python-neutronclient-2.3.3/neutronclient/tests/unit/test_auth.py
===================================================================
--- python-neutronclient-2.3.3.orig/neutronclient/tests/unit/test_auth.py
+++ python-neutronclient-2.3.3/neutronclient/tests/unit/test_auth.py
@@ -85,6 +85,23 @@ class CLITestAuthKeystone(testtools.Test
         self.addCleanup(self.mox.VerifyAll)
         self.addCleanup(self.mox.UnsetStubs)
 
+    def test_reused_token_get_auth_info(self):
+        """Test that Client.get_auth_info() works even if client was
+           instantiated with predefined token.
+        """
+        client_ = client.HTTPClient(username=USERNAME,
+                                    tenant_id=TENANT_ID,
+                                    tenant_name=TENANT_NAME,
+                                    token=TOKEN,
+                                    password=PASSWORD,
+                                    auth_url=AUTH_URL,
+                                    region_name=REGION)
+        expected = {'auth_token': TOKEN,
+                    'auth_tenant_id': None,
+                    'auth_user_id': None,
+                    'endpoint_url': self.client.endpoint_url}
+        self.assertEqual(client_.get_auth_info(), expected)
+
     def test_get_token(self):
         self.mox.StubOutWithMock(self.client, "request")

Places

File 0001-Fixed-get_auth_info-for-pre-authenticated-clients.patch of Package python-neutronclient (Revision 3d58003f78e44b47161a6009473bfcf9)

Places