From 2f96899534776866d362f51e3e8cb9c439906f10 Mon Sep 17 00:00:00 2001
From: Qiu Yu <qiuyu@ebaysf.com>
Date: Tue, 7 Jan 2014 18:37:08 +0800
Subject: [PATCH] Fix discover command failed to read extension list issue

Fix the key error which caused discover command failed to read the
response body of extension list result. This change also added test
cases to cover the use case of generic client extension discovery.

Change-Id: Id687f8d73cead28f594de00d3b5ff9086558947b
Closes-Bug: #1266710
---
 keystoneclient/generic/client.py            |  2 +-
 keystoneclient/tests/generic/test_client.py | 67 +++++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 keystoneclient/tests/generic/test_client.py

diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py
index c0f2b5fea..79cbbc5c3 100644
--- a/keystoneclient/generic/client.py
+++ b/keystoneclient/generic/client.py
@@ -158,7 +158,7 @@ class Client(httpclient.HTTPClient):
                             for extension in body['extensions']['values']:
                                 alias, name = \
                                     self._get_extension_info(
-                                        extension['extension']
+                                        extension
                                     )
                                 results[alias] = name
                             return results
diff --git a/keystoneclient/tests/generic/test_client.py b/keystoneclient/tests/generic/test_client.py
new file mode 100644
index 000000000..1ea67cbbb
--- /dev/null
+++ b/keystoneclient/tests/generic/test_client.py
@@ -0,0 +1,67 @@
+# Copyright 2014 OpenStack Foundation
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import httpretty
+
+from keystoneclient.generic import client
+from keystoneclient.openstack.common import jsonutils
+from keystoneclient.tests import utils
+
+BASE_HOST = 'http://keystone.example.com'
+BASE_URL = "%s:5000/" % BASE_HOST
+V2_URL = "%sv2.0" % BASE_URL
+
+EXTENSION_NAMESPACE = "http://docs.openstack.org/identity/api/ext/OS-FAKE/v1.0"
+EXTENSION_DESCRIBED = {"href": "https://github.com/openstack/identity-api",
+                       "rel": "describedby",
+                       "type": "text/html"}
+
+EXTENSION_ALIAS_FOO = "OS-FAKE-FOO"
+EXTENSION_NAME_FOO = "OpenStack Keystone Fake Extension Foo"
+EXTENSION_FOO = {"alias": EXTENSION_ALIAS_FOO,
+                 "description": "Fake Foo extension to V2.0 API.",
+                 "links": [EXTENSION_DESCRIBED],
+                 "name": EXTENSION_NAME_FOO,
+                 "namespace": EXTENSION_NAMESPACE,
+                 "updated": '2014-01-08T00:00:00Z'}
+
+EXTENSION_ALIAS_BAR = "OS-FAKE-BAR"
+EXTENSION_NAME_BAR = "OpenStack Keystone Fake Extension Bar"
+EXTENSION_BAR = {"alias": EXTENSION_ALIAS_BAR,
+                 "description": "Fake Bar extension to V2.0 API.",
+                 "links": [EXTENSION_DESCRIBED],
+                 "name": EXTENSION_NAME_BAR,
+                 "namespace": EXTENSION_NAMESPACE,
+                 "updated": '2014-01-08T00:00:00Z'}
+
+
+def _create_extension_list(extensions):
+    return jsonutils.dumps({'extensions': {'values': extensions}})
+
+
+EXTENSION_LIST = _create_extension_list([EXTENSION_FOO, EXTENSION_BAR])
+
+
+@httpretty.activate
+class ClientDiscoveryTests(utils.TestCase):
+
+    def test_discover_extensions_v2(self):
+        httpretty.register_uri(httpretty.GET, "%s/extensions" % V2_URL,
+                               body=EXTENSION_LIST)
+        extensions = client.Client().discover_extensions(url=V2_URL)
+        self.assertIn(EXTENSION_ALIAS_FOO, extensions)
+        self.assertEqual(extensions[EXTENSION_ALIAS_FOO], EXTENSION_NAME_FOO)
+        self.assertIn(EXTENSION_ALIAS_BAR, extensions)
+        self.assertEqual(extensions[EXTENSION_ALIAS_BAR], EXTENSION_NAME_BAR)