From 7be2b2482fde20be8802cfe6a200590933a73d7e Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Mon, 25 Jul 2011 18:28:43 -0400
Subject: atom and xml_detail working, with tests

---
 nova/tests/api/openstack/test_versions.py | 200 +++++++++++++++++++++---------
 1 file changed, 142 insertions(+), 58 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_versions.py b/nova/tests/api/openstack/test_versions.py
index 632d388fa..11b69ec83 100644
--- a/nova/tests/api/openstack/test_versions.py
+++ b/nova/tests/api/openstack/test_versions.py
@@ -79,7 +79,7 @@ class VersionsTest(test.TestCase):
             "version" : {
                 "id" : "v1.0",
                 "status" : "CURRENT",
-                "updated" : "2011-01-21T11:33:21-06:00",
+                "updated" : "2011-01-21T11:33:21Z",
                 "links": [
                     {
                         "rel" : "self",
@@ -125,7 +125,7 @@ class VersionsTest(test.TestCase):
             "version" : {
                 "id" : "v1.1",
                 "status" : "CURRENT",
-                "updated" : "2011-01-21T11:33:21-06:00",
+                "updated" : "2011-01-21T11:33:21Z",
                 "links": [
                     {
                         "rel" : "self",
@@ -168,7 +168,7 @@ class VersionsTest(test.TestCase):
         self.assertEqual(res.content_type, "application/xml")
         expected = """
         <version id="v1.0" status="CURRENT" 
-            updated="2011-01-21T11:33:21-06:00" 
+            updated="2011-01-21T11:33:21Z" 
             xmlns="http://docs.openstack.org/common/api/v1.0" 
             xmlns:atom="http://www.w3.org/2005/Atom">
 
@@ -204,7 +204,7 @@ class VersionsTest(test.TestCase):
         self.assertEqual(res.content_type, "application/xml")
         expected = """
         <version id="v1.1" status="CURRENT" 
-            updated="2011-01-21T11:33:21-06:00" 
+            updated="2011-01-21T11:33:21Z" 
             xmlns="http://docs.openstack.org/common/api/v1.1" 
             xmlns:atom="http://www.w3.org/2005/Atom">
 
@@ -253,6 +253,80 @@ class VersionsTest(test.TestCase):
 
         self.assertEqual(expected, actual)
 
+    def test_get_version_1_0_detail_atom(self):
+        #TODO
+        req = webob.Request.blank('/v1.0/')
+        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 = """
+        <version id="v1.0" status="CURRENT" 
+            updated="2011-01-21T11:33:21Z" 
+            xmlns="http://docs.openstack.org/common/api/v1.0" 
+            xmlns:atom="http://www.w3.org/2005/Atom">
+
+            <media-types>
+                <media-type base="application/xml"
+                     type="application/vnd.openstack.compute-v1.0+xml"/>
+                <media-type base="application/json"
+                     type="application/vnd.openstack.compute-v1.0+json"/>
+            </media-types>
+
+            <atom:link href="http://servers.api.openstack.org/v1.0/"
+                 rel="self"/>
+
+            <atom:link href="http://docs.rackspacecloud.com/servers/
+                api/v1.0/cs-devguide-20110125.pdf"
+                 rel="describedby"
+                 type="application/pdf"/>
+
+            <atom:link href="http://docs.rackspacecloud.com/servers/
+                api/v1.0/application.wadl"
+                 rel="describedby" 
+                type="application/vnd.sun.wadl+xml"/>
+        </version>""".replace("  ", "").replace("\n", "")
+
+        actual = res.body.replace("  ", "").replace("\n", "")
+        self.assertEqual(expected, actual)
+
+    def test_get_version_1_1_detail_atom(self):
+        #TODO
+        req = webob.Request.blank('/v1.1/')
+        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 = """
+        <version id="v1.1" status="CURRENT" 
+            updated="2011-01-21T11:33:21Z" 
+            xmlns="http://docs.openstack.org/common/api/v1.1" 
+            xmlns:atom="http://www.w3.org/2005/Atom">
+
+            <media-types>
+                <media-type base="application/xml"
+                     type="application/vnd.openstack.compute-v1.1+xml"/>
+                <media-type base="application/json"
+                     type="application/vnd.openstack.compute-v1.1+json"/>
+            </media-types>
+
+            <atom:link href="http://servers.api.openstack.org/v1.1/"
+                 rel="self"/>
+
+            <atom:link href="http://docs.rackspacecloud.com/servers/
+                api/v1.1/cs-devguide-20110125.pdf"
+                 rel="describedby"
+                 type="application/pdf"/>
+
+            <atom:link href="http://docs.rackspacecloud.com/servers/
+                api/v1.1/application.wadl"
+                 rel="describedby" 
+                type="application/vnd.sun.wadl+xml"/>
+        </version>""".replace("  ", "").replace("\n", "")
+
+        actual = res.body.replace("  ", "").replace("\n", "")
+        self.assertEqual(expected, actual)
+
     def test_get_version_list_atom(self):
         req = webob.Request.blank('/')
         req.accept = "application/atom+xml"
@@ -361,12 +435,12 @@ class VersionsTest(test.TestCase):
         response = response.replace("  ", "").replace("\n", "")
         self.assertEqual(expected, response)
 
-    def test_versions_detail_xml_serializer(self):
-        versions_data = {
+    def test_version_detail_xml_serializer(self):
+        version_data = {
             "version" : { 
                 "id": "v1.0",
                 "status": "CURRENT",
-                "updated": "2011-01-21T11:33:21-06:00", 
+                "updated": "2011-01-21T11:33:21Z", 
                 "links": [
                     {
                         "rel": "self",
@@ -400,7 +474,7 @@ class VersionsTest(test.TestCase):
 
         expected = """
         <version id="v1.0" status="CURRENT" 
-            updated="2011-01-21T11:33:21-06:00" 
+            updated="2011-01-21T11:33:21Z" 
             xmlns="http://docs.openstack.org/common/api/v1.0" 
             xmlns:atom="http://www.w3.org/2005/Atom">
 
@@ -426,7 +500,7 @@ class VersionsTest(test.TestCase):
         </version>""".replace("  ", "").replace("\n", "")
 
         serializer = versions.VersionsXMLSerializer()
-        response = serializer.detail(versions_data)
+        response = serializer.detail(version_data)
         response = response.replace("  ", "").replace("\n", "")
         self.assertEqual(expected, response)
 
@@ -492,59 +566,69 @@ class VersionsTest(test.TestCase):
     def test_version_detail_atom_serializer(self):
         #TODO
         versions_data = {
-            'versions': [
-                {
-                    "id": "2.9.8",
-                    "updated": "2011-07-20T11:40:00Z",
-                    "status": "CURRENT",
-                    "links": [
-                        {
-                            "rel": "self",
-                            "href": "http://test/2.9.8",
-                        }
-                    ],
-                },
-            ]
+            "version" : { 
+                "id": "v1.1",
+                "status": "CURRENT",
+                "updated": "2011-01-21T11:33:21Z",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://servers.api.openstack.org/v1.1/"
+                    },
+                    {
+                        "rel": "describedby",
+                        "type": "application/pdf",
+                        "href": "http://docs.rackspacecloud.com/"
+                            "servers/api/v1.1/cs-devguide-20110125.pdf"
+                    }, 
+                    {
+                        "rel": "describedby",
+                        "type": "application/vnd.sun.wadl+xml",
+                        "href": "http://docs.rackspacecloud.com/"
+                            "servers/api/v1.1/application.wadl"
+                    },
+                ],
+                "media-types": [
+                    {
+                        "base" : "application/xml",
+                        "type" : "application/vnd.openstack.compute-v1.1+xml"
+                    },
+                    {
+                        "base" : "application/json",
+                        "type" : "application/vnd.openstack.compute-v1.1+json"
+                    }
+                ],
+            },
         }
 
         expected = """
-            <feed xmlns="http://www.w3.org/2005/Atom">
-                <title type="text">
-                    Available API Versions
-                </title>
-                <updated>
-                    2011-07-20T11:40:00Z
-                </updated>
-                <id>
-                    http://test/
-                </id>
-                <author>
-                    <name>
-                        Rackspace
-                    </name>
-                    <uri>
-                        http://www.rackspace.com/
-                    </uri>
-                </author>
-                <link href="http://test/" rel="self"/>
-                <entry>
-                    <id>
-                        http://test/2.9.8
-                    </id>
-                    <title type="text">
-                        Version 2.9.8
-                    </title>
-                    <updated>
-                        2011-07-20T11:40:00Z
-                    </updated>
-                    <link href="http://test/2.9.8" rel="self"/>
-                    <content type="text">
-                        Version 2.9.8 CURRENT (2011-07-20T11:40:00Z)
-                    </content>
-                </entry>
-            </feed>""".replace("  ", "").replace("\n", "")
+        <feed xmlns="http://www.w3.org/2005/Atom">
+            <title type="text">About This Version</title>
+            <updated>2011-01-21T11:33:21Z</updated>
+            <id>http://servers.api.openstack.org/v1.1/</id>
+            <author>
+                <name>Rackspace</name>
+                <uri>http://www.rackspace.com/</uri>
+            </author>
+            <link href="http://servers.api.openstack.org/v1.1/" rel="self"/>
+            <entry>
+                <id>http://servers.api.openstack.org/v1.1/</id>
+                <title type="text">Version v1.1</title>
+                <updated>2011-01-21T11:33:21Z</updated>
+                <link href="http://servers.api.openstack.org/v1.1/" rel="self"/>
+                <link href="http://docs.rackspacecloud.com/servers/
+                    api/v1.1/cs-devguide-20110125.pdf"
+                     rel="describedby" type="application/pdf"/>
+                <link href="http://docs.rackspacecloud.com/servers/
+                    api/v1.1/application.wadl"
+                     rel="describedby" type="application/vnd.sun.wadl+xml"/>
+                <content type="text">
+                    Version v1.1 CURRENT (2011-01-21T11:33:21Z)
+                </content>
+            </entry>
+        </feed>""".replace("  ", "").replace("\n", "")
 
         serializer = versions.VersionsAtomSerializer()
-        response = serializer.index(versions_data)
+        response = serializer.detail(versions_data)
         response = response.replace("  ", "").replace("\n", "")
         self.assertEqual(expected, response)
-- 
cgit