From d1ef69edb8da18c5c7e56b6006e22022d55d6664 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 29 Mar 2011 11:41:33 -0400
Subject: adding code to explicitly set the content-type in versions
 controller; updating test

---
 nova/api/openstack/versions.py            | 10 ++++++++--
 nova/tests/api/openstack/test_versions.py |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 33f1dd628..3f9d91934 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import webob
 import webob.dec
-import webob.exc
 
 from nova import wsgi
 import nova.api.openstack.views.versions
@@ -51,4 +51,10 @@ class Versions(wsgi.Application):
         }
 
         content_type = req.best_match_content_type()
-        return wsgi.Serializer(metadata).serialize(response, content_type)
+        body = wsgi.Serializer(metadata).serialize(response, content_type)
+
+        response = webob.Response()
+        response.content_type = content_type
+        response.body = body
+
+        return response
diff --git a/nova/tests/api/openstack/test_versions.py b/nova/tests/api/openstack/test_versions.py
index ebb59a9a6..ee922a8d3 100644
--- a/nova/tests/api/openstack/test_versions.py
+++ b/nova/tests/api/openstack/test_versions.py
@@ -34,8 +34,10 @@ class VersionsTest(test.TestCase):
 
     def test_get_version_list(self):
         req = webob.Request.blank('/')
+        req.accept = "application/json"
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
+        self.assertEqual(res.content_type, "application/json")
         versions = json.loads(res.body)["versions"]
         expected = [
             {
-- 
cgit 


From 343b969f7d790282b7b76bcb23b9d0d578d716b9 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 29 Mar 2011 12:04:43 -0400
Subject: adding xml test case

---
 nova/tests/api/openstack/test_versions.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/nova/tests/api/openstack/test_versions.py b/nova/tests/api/openstack/test_versions.py
index ee922a8d3..2640a4ddb 100644
--- a/nova/tests/api/openstack/test_versions.py
+++ b/nova/tests/api/openstack/test_versions.py
@@ -63,6 +63,30 @@ class VersionsTest(test.TestCase):
         ]
         self.assertEqual(versions, expected)
 
+    def test_get_version_list_xml(self):
+        req = webob.Request.blank('/')
+        req.accept = "application/xml"
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 200)
+        self.assertEqual(res.content_type, "application/xml")
+
+        expected = """<versions>
+            <version id="v1.1" status="CURRENT">
+                <links>
+                    <link href="http://localhost/v1.1" rel="self"/>
+                </links>
+            </version>
+            <version id="v1.0" status="DEPRECATED">
+                <links>
+                    <link href="http://localhost/v1.0" rel="self"/>
+                </links>
+            </version>
+        </versions>""".replace("  ", "").replace("\n", "")
+
+        actual = res.body.replace("  ", "").replace("\n", "")
+
+        self.assertEqual(expected, actual)
+
     def test_view_builder(self):
         base_url = "http://example.org/"
 
-- 
cgit