From f4dc32ad0729b40ebe5765a57edff9535b992953 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Tue, 12 Jul 2011 12:55:37 -0400
Subject: Updated ImageXMLSerializer to serialize links in the server entity

---
 nova/api/openstack/images.py            |  9 ++++-----
 nova/tests/api/openstack/test_images.py | 30 ++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 873e025c7..d0317583e 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -325,11 +325,10 @@ class ImageXMLSerializer(wsgi.XMLDictSerializer):
     def _create_server_node(self, xml_doc, server):
         server_node = xml_doc.createElement('server')
         server_node.setAttribute('id', str(server['id']))
-        #server_node.setAttribute('name', server['name'])
-        #link_nodes = self._create_link_nodes(xml_doc,
-        #                                     image['links'])
-        #for link_node in link_nodes:
-        #    server_node.appendChild(link_node)
+        link_nodes = self._create_link_nodes(xml_doc,
+                                             server['links'])
+        for link_node in link_nodes:
+            server_node.appendChild(link_node)
         return server_node
 
     def _image_list_to_xml(self, xml_doc, images, detailed):
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index c1ead6e28..f0d7be2b9 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -1225,7 +1225,6 @@ class ImageXMLSerializationTest(test.TestCase):
                 'progress': 80,
                 'server': {
                     'id': 1,
-                    'name': 'Server1',
                     'links': [
                         {
                             'href': self.SERVER_HREF,
@@ -1270,7 +1269,10 @@ class ImageXMLSerializationTest(test.TestCase):
                 created="%(expected_now)s"
                 status="ACTIVE"
                 progress="80">
-            <server id="1" />
+            <server id="1">
+                <atom:link rel="self" href="%(expected_server_href)s"/>
+                <atom:link rel="bookmark" href="%(expected_server_bookmark)s"/>
+            </server>
             <metadata>
                 <meta key="key1">
                     value1
@@ -1296,7 +1298,6 @@ class ImageXMLSerializationTest(test.TestCase):
                 'status': 'ACTIVE',
                 'server': {
                     'id': 1,
-                    'name': 'Server1',
                     'links': [
                         {
                             'href': self.SERVER_HREF,
@@ -1338,7 +1339,10 @@ class ImageXMLSerializationTest(test.TestCase):
                 updated="%(expected_now)s"
                 created="%(expected_now)s"
                 status="ACTIVE">
-            <server id="1" />
+            <server id="1">
+                <atom:link rel="self" href="%(expected_server_href)s"/>
+                <atom:link rel="bookmark" href="%(expected_server_bookmark)s"/>
+            </server>
             <atom:link href="%(expected_href)s" rel="self"/>
             <atom:link href="%(expected_bookmark)s" rel="bookmark"/>
         </image>
@@ -1359,7 +1363,6 @@ class ImageXMLSerializationTest(test.TestCase):
                 'status': 'ACTIVE',
                 'server': {
                     'id': 1,
-                    'name': 'Server1',
                     'links': [
                         {
                             'href': self.SERVER_HREF,
@@ -1400,7 +1403,10 @@ class ImageXMLSerializationTest(test.TestCase):
                 updated="%(expected_now)s"
                 created="%(expected_now)s"
                 status="ACTIVE">
-            <server id="1" />
+            <server id="1">
+                <atom:link rel="self" href="%(expected_server_href)s"/>
+                <atom:link rel="bookmark" href="%(expected_server_bookmark)s"/>
+            </server>
             <atom:link href="%(expected_href)s" rel="self"/>
             <atom:link href="%(expected_bookmark)s" rel="bookmark"/>
         </image>
@@ -1550,7 +1556,6 @@ class ImageXMLSerializationTest(test.TestCase):
                     'status': 'ACTIVE',
                     'server': {
                         'id': 1,
-                        'name': 'Server1',
                         'links': [
                             {
                                 'href': self.SERVER_HREF,
@@ -1616,7 +1621,10 @@ class ImageXMLSerializationTest(test.TestCase):
                 updated="%(expected_now)s"
                 created="%(expected_now)s"
                 status="ACTIVE">
-            <server id="1" />
+            <server id="1">
+                <atom:link rel="self" href="%(expected_server_href)s"/>
+                <atom:link rel="bookmark" href="%(expected_server_bookmark)s"/>
+            </server>
             <atom:link href="%(expected_href)s" rel="self"/>
             <atom:link href="%(expected_bookmark)s" rel="bookmark"/>
         </image>
@@ -1654,7 +1662,6 @@ class ImageXMLSerializationTest(test.TestCase):
                 'progress': 80,
                 'server': {
                     'id': 1,
-                    'name': 'Server1',
                     'links': [
                         {
                             'href': self.SERVER_HREF,
@@ -1699,7 +1706,10 @@ class ImageXMLSerializationTest(test.TestCase):
                 created="%(expected_now)s"
                 status="SAVING"
                 progress="80">
-            <server id="1" />
+            <server id="1">
+                <atom:link rel="self" href="%(expected_server_href)s"/>
+                <atom:link rel="bookmark" href="%(expected_server_bookmark)s"/>
+            </server>
             <metadata>
                 <meta key="key1">
                     value1
-- 
cgit