Further test update and begin correcting serialization

2 files changed, 29 insertions, 6 deletions

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index bde9507c8..2e3d4f157 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -267,8 +267,9 @@ class ImageXMLSerializer(wsgi.XMLDictSerializer):
     metadata = {
         "attributes": {
             "image": ["id", "name", "updated", "created", "status",
-                      "serverId", "progress", "serverRef"],
-            "link": ["rel", "type", "href"],
+                      "serverId", "progress"],
+            "link": ["rel", "href"],
+            "server": ["name", "id"],
         },
     }
 
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index 9291997bc..4f00ac1f8 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -1168,14 +1168,29 @@ class ImageXMLSerializationTest(test.TestCase):
     def test_show(self):
         serializer = images.ImageXMLSerializer()
 
+        #so we can see the full diff in the output
+        self.maxDiff = None
         fixture = {
             'image': {
                 'id': 1,
                 'name': 'Image1',
                 'created': self.TIMESTAMP,
                 'updated': self.TIMESTAMP,
-                'serverRef': self.SERVER_HREF,
                 'status': 'ACTIVE',
+                'server': {
+                    'id': 1,
+                    'name': 'Server1',
+                    'links': [
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                    ],
+                },
                 'metadata': {
                     'key1': 'value1',
                 },
@@ -1184,6 +1199,10 @@ class ImageXMLSerializationTest(test.TestCase):
                         'href': self.IMAGE_HREF % (1,),
                         'rel': 'bookmark',
                     },
+                    {
+                        'href': self.IMAGE_BOOKMARK % (1,),
+                        'rel': 'self',
+                    },
                 ],
             },
         }
@@ -1192,7 +1211,7 @@ class ImageXMLSerializationTest(test.TestCase):
         actual = minidom.parseString(output.replace("  ", ""))
 
         expected_server_href = self.SERVER_HREF
-        expected_server_bookmark = self.SERVER_BOOKMARK_
+        expected_server_bookmark = self.SERVER_BOOKMARK
         expected_href = self.IMAGE_HREF % (1, )
         expected_bookmark = self.IMAGE_BOOKMARK % (1, )
         expected_now = self.TIMESTAMP
@@ -1205,18 +1224,21 @@ class ImageXMLSerializationTest(test.TestCase):
                 created="%(expected_now)s"
                 status="ACTIVE"
                 progress="80">
-            <server name="" id="">
+            <server name="Server1" id="1">
                 <atom:link rel="bookmark" href="%(expected_server_href)s"/>
                 <atom:link rel="self" href="%(expected_server_bookmark)s"/>
             </server>
             <atom:link href="%(expected_href)s" rel="self"/>
             <atom:link href="%(expected_bookmark)s" rel="bookmark"/>
             <metadata>
-                <meta key="key1">value1</meta>
+                <meta key="key1">
+                    value1
+                </meta>
             </metadata>
         </image>
         """.replace("  ", "") % (locals()))
 
+        print actual.toxml()
         self.assertEqual(expected.toxml(), actual.toxml())
 
     def test_show_zero_metadata(self):