From ffaa0a69e71019cdfdba5354bfc7d5c10ba21b79 Mon Sep 17 00:00:00 2001
From: Nachiappan VR N <nachiappan.veerappan-nachiappan@hp.com>
Date: Tue, 5 Mar 2013 20:31:52 -0800
Subject: [PATCH] Make keystone client handle the response code 300.

Keystone discover command currently fails to list
the keystone server. Fix is
made such that client handle the response code
300 from the keystone server.

Fixes Bug #1136476

Change-Id: Iada31f1e274aade90aa4b4be2a136793a0ba64d7
---
 keystoneclient/generic/client.py |  6 ++-
 tests/v3/test_discover.py        | 79 ++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 tests/v3/test_discover.py

diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py
index 4818ddf9a..d2ac0db93 100644
--- a/keystoneclient/generic/client.py
+++ b/keystoneclient/generic/client.py
@@ -84,7 +84,11 @@ class Client(client.HTTPClient):
             resp, body = httpclient.request(url, "GET",
                                             headers={'Accept':
                                                      'application/json'})
-            if resp.status_code in (200, 204):  # some cases we get No Content
+            # Multiple Choices status code is returned by the root
+            # identity endpoint, with references to one or more
+            # Identity API versions -- v3 spec
+            # some cases we get No Content
+            if resp.status_code in (200, 204, 300):
                 try:
                     results = {}
                     if 'version' in body:
diff --git a/tests/v3/test_discover.py b/tests/v3/test_discover.py
new file mode 100644
index 000000000..8f60c528f
--- /dev/null
+++ b/tests/v3/test_discover.py
@@ -0,0 +1,79 @@
+import copy
+import json
+import requests
+
+from keystoneclient.generic import client
+from tests import utils
+
+
+class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
+    def setUp(self):
+        super(DiscoverKeystoneTests, self).setUp()
+        self.TEST_RESPONSE_DICT = {
+            "versions": {
+                "values": [{"id": "v3.0",
+                            "status": "beta",
+                            "updated": "2013-03-06T00:00:00Z",
+                            "links": [
+                                {"rel": "self",
+                                 "href": "http://127.0.0.1:5000/v3.0/", },
+                                {"rel": "describedby",
+                                 "type": "text/html",
+                                 "href": "http://docs.openstack.org/api/"
+                                         "openstack-identity-service/3/"
+                                         "content/", },
+                                {"rel": "describedby",
+                                 "type": "application/pdf",
+                                 "href": "http://docs.openstack.org/api/"
+                                         "openstack-identity-service/3/"
+                                         "identity-dev-guide-3.pdf", },
+                            ]},
+                           {"id": "v2.0",
+                            "status": "beta",
+                            "updated": "2013-03-06T00:00:00Z",
+                            "links": [
+                                {"rel": "self",
+                                 "href": "http://127.0.0.1:5000/v2.0/", },
+                                {"rel": "describedby",
+                                 "type": "text/html",
+                                 "href": "http://docs.openstack.org/api/"
+                                         "openstack-identity-service/2.0/"
+                                         "content/", },
+                                {"rel": "describedby",
+                                 "type": "application/pdf",
+                                 "href": "http://docs.openstack.org/api/"
+                                         "openstack-identity-service/2.0/"
+                                         "identity-dev-guide-2.0.pdf", }
+                            ]}],
+            },
+        }
+        self.TEST_REQUEST_HEADERS = {
+            'User-Agent': 'python-keystoneclient',
+            'Accept': 'application/json',
+        }
+
+    def test_get_version_local(self):
+        resp = utils.TestResponse({
+            "status_code": 300,
+            "text": json.dumps(self.TEST_RESPONSE_DICT),
+        })
+        kwargs = copy.copy(self.TEST_REQUEST_BASE)
+        kwargs['headers'] = self.TEST_REQUEST_HEADERS
+        requests.request('GET',
+                         "http://localhost:35357",
+                         **kwargs).AndReturn((resp))
+        self.mox.ReplayAll()
+
+        cs = client.Client()
+        versions = cs.discover()
+        self.assertIsInstance(versions, dict)
+        self.assertIn('message', versions)
+        self.assertIn('v3.0', versions)
+        self.assertEquals(
+            versions['v3.0']['url'],
+            self.TEST_RESPONSE_DICT['versions']['values'][0]['links'][0]
+            ['href'])
+        self.assertEquals(
+            versions['v2.0']['url'],
+            self.TEST_RESPONSE_DICT['versions']['values'][1]['links'][0]
+            ['href'])