Merged with trunk and fixed pep errors

3 files changed, 414 insertions, 153 deletions

diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py
index 29cb8b944..7440bccfb 100644
--- a/nova/tests/api/openstack/test_common.py
+++ b/nova/tests/api/openstack/test_common.py
@@ -190,3 +190,36 @@ class PaginationParamsTest(test.TestCase):
         req = Request.blank('/?limit=20&marker=40')
         self.assertEqual(common.get_pagination_params(req),
                          {'marker': 40, 'limit': 20})
+
+
+class MiscFunctionsTest(test.TestCase):
+
+    def test_remove_version_from_href(self):
+        fixture = 'http://www.testsite.com/v1.1/images'
+        expected = 'http://www.testsite.com/images'
+        actual = common.remove_version_from_href(fixture)
+        self.assertEqual(actual, expected)
+
+    def test_remove_version_from_href_2(self):
+        fixture = 'http://www.testsite.com/v1.1/'
+        expected = 'http://www.testsite.com/'
+        actual = common.remove_version_from_href(fixture)
+        self.assertEqual(actual, expected)
+
+    def test_remove_version_from_href_bad_request(self):
+        fixture = 'http://www.testsite.com/1.1/images'
+        self.assertRaises(ValueError,
+                          common.remove_version_from_href,
+                          fixture)
+
+    def test_get_id_from_href(self):
+        fixture = 'http://www.testsite.com/dir/45'
+        actual = common.get_id_from_href(fixture)
+        expected = 45
+        self.assertEqual(actual, expected)
+
+    def test_get_id_from_href_bad_request(self):
+        fixture = 'http://45'
+        self.assertRaises(ValueError,
+                          common.get_id_from_href,
+                          fixture)
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index f451ee145..c1bdd6906 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -401,15 +401,27 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
 
         href = "http://localhost/v1.1/images/124"
         bookmark = "http://localhost/images/124"
+        server_href = "http://localhost/v1.1/servers/42"
+        server_bookmark = "http://localhost/servers/42"
 
         expected_image = {
             "image": {
                 "id": 124,
                 "name": "queued snapshot",
-                "serverRef": "http://localhost/v1.1/servers/42",
                 "updated": self.NOW_API_FORMAT,
                 "created": self.NOW_API_FORMAT,
                 "status": "QUEUED",
+                'server': {
+                    'id': 42,
+                    "links": [{
+                        "rel": "self",
+                        "href": server_href,
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": server_bookmark,
+                    }],
+                },
                 "metadata": {
                     "instance_ref": "http://localhost/v1.1/servers/42",
                     "user_id": "1",
@@ -559,10 +571,6 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 "links": [{
                     "rel": "self",
                     "href": href,
-                },
-                {
-                    "rel": "bookmark",
-                    "href": bookmark,
                 }],
             }
             self.assertTrue(test_image in response_list)
@@ -628,6 +636,8 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
 
         response_dict = json.loads(response.body)
         response_list = response_dict["images"]
+        server_href = "http://localhost/v1.1/servers/42"
+        server_bookmark = "http://localhost/servers/42"
 
         expected = [{
             'id': 123,
@@ -652,10 +662,20 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 u'instance_ref': u'http://localhost/v1.1/servers/42',
                 u'user_id': u'1',
             },
-            'serverRef': "http://localhost/v1.1/servers/42",
             'updated': self.NOW_API_FORMAT,
             'created': self.NOW_API_FORMAT,
             'status': 'QUEUED',
+            'server': {
+                'id': 42,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
             "links": [{
                 "rel": "self",
                 "href": "http://localhost/v1.1/images/124",
@@ -672,11 +692,21 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 u'instance_ref': u'http://localhost/v1.1/servers/42',
                 u'user_id': u'1',
             },
-            'serverRef': "http://localhost/v1.1/servers/42",
             'updated': self.NOW_API_FORMAT,
             'created': self.NOW_API_FORMAT,
             'status': 'SAVING',
             'progress': 0,
+            'server': {
+                'id': 42,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
             "links": [{
                 "rel": "self",
                 "href": "http://localhost/v1.1/images/125",
@@ -693,10 +723,20 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 u'instance_ref': u'http://localhost/v1.1/servers/42',
                 u'user_id': u'1',
             },
-            'serverRef': "http://localhost/v1.1/servers/42",
             'updated': self.NOW_API_FORMAT,
             'created': self.NOW_API_FORMAT,
             'status': 'ACTIVE',
+            'server': {
+                'id': 42,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
             "links": [{
                 "rel": "self",
                 "href": "http://localhost/v1.1/images/126",
@@ -713,10 +753,20 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                 u'instance_ref': u'http://localhost/v1.1/servers/42',
                 u'user_id': u'1',
             },
-            'serverRef': "http://localhost/v1.1/servers/42",
             'updated': self.NOW_API_FORMAT,
             'created': self.NOW_API_FORMAT,
             'status': 'FAILED',
+            'server': {
+                'id': 42,
+                "links": [{
+                    "rel": "self",
+                    "href": server_href,
+                },
+                {
+                    "rel": "bookmark",
+                    "href": server_bookmark,
+                }],
+            },
             "links": [{
                 "rel": "self",
                 "href": "http://localhost/v1.1/images/127",
@@ -1036,6 +1086,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
     def test_create_image_v1_1_actual_server_ref(self):
 
         serverRef = 'http://localhost/v1.1/servers/1'
+        serverBookmark = 'http://localhost/servers/1'
         body = dict(image=dict(serverRef=serverRef, name='Backup 1'))
         req = webob.Request.blank('/v1.1/images')
         req.method = 'POST'
@@ -1044,11 +1095,25 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         response = req.get_response(fakes.wsgi_app())
         self.assertEqual(200, response.status_int)
         result = json.loads(response.body)
-        self.assertEqual(result['image']['serverRef'], serverRef)
+        expected = {
+            'id': 1,
+            'links': [
+                {
+                    'rel': 'self',
+                    'href': serverRef,
+                },
+                {
+                    'rel': 'bookmark',
+                    'href': serverBookmark,
+                },
+            ]
+        }
+        self.assertEqual(result['image']['server'], expected)
 
     def test_create_image_v1_1_actual_server_ref_port(self):
 
         serverRef = 'http://localhost:8774/v1.1/servers/1'
+        serverBookmark = 'http://localhost:8774/servers/1'
         body = dict(image=dict(serverRef=serverRef, name='Backup 1'))
         req = webob.Request.blank('/v1.1/images')
         req.method = 'POST'
@@ -1057,7 +1122,20 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         response = req.get_response(fakes.wsgi_app())
         self.assertEqual(200, response.status_int)
         result = json.loads(response.body)
-        self.assertEqual(result['image']['serverRef'], serverRef)
+        expected = {
+            'id': 1,
+            'links': [
+                {
+                    'rel': 'self',
+                    'href': serverRef,
+                },
+                {
+                    'rel': 'bookmark',
+                    'href': serverBookmark,
+                },
+            ]
+        }
+        self.assertEqual(result['image']['server'], expected)
 
     def test_create_image_v1_1_server_ref_bad_hostname(self):
 
@@ -1080,6 +1158,28 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         response = req.get_response(fakes.wsgi_app())
         self.assertEqual(400, response.status_int)
 
+    def test_create_image_v1_1_server_ref_missing_version(self):
+
+        serverRef = 'http://localhost/servers/1'
+        body = dict(image=dict(serverRef=serverRef, name='Backup 1'))
+        req = webob.Request.blank('/v1.1/images')
+        req.method = 'POST'
+        req.body = json.dumps(body)
+        req.headers["content-type"] = "application/json"
+        response = req.get_response(fakes.wsgi_app())
+        self.assertEqual(400, response.status_int)
+
+    def test_create_image_v1_1_server_ref_missing_id(self):
+
+        serverRef = 'http://localhost/v1.1/servers'
+        body = dict(image=dict(serverRef=serverRef, name='Backup 1'))
+        req = webob.Request.blank('/v1.1/images')
+        req.method = 'POST'
+        req.body = json.dumps(body)
+        req.headers["content-type"] = "application/json"
+        response = req.get_response(fakes.wsgi_app())
+        self.assertEqual(400, response.status_int)
+
     @classmethod
     def _make_image_fixtures(cls):
         image_id = 123
@@ -1128,7 +1228,9 @@ class ImageXMLSerializationTest(test.TestCase):
 
     TIMESTAMP = "2010-10-11T10:30:22Z"
     SERVER_HREF = 'http://localhost/v1.1/servers/123'
+    SERVER_BOOKMARK = 'http://localhost/servers/123'
     IMAGE_HREF = 'http://localhost/v1.1/images/%s'
+    IMAGE_BOOKMARK = 'http://localhost/images/%s'
 
     def test_show(self):
         serializer = images.ImageXMLSerializer()
@@ -1139,16 +1241,32 @@ class ImageXMLSerializationTest(test.TestCase):
                 'name': 'Image1',
                 'created': self.TIMESTAMP,
                 'updated': self.TIMESTAMP,
-                'serverRef': self.SERVER_HREF,
                 'status': 'ACTIVE',
+                'progress': 80,
+                'server': {
+                    'id': 1,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
                 'metadata': {
                     'key1': 'value1',
                 },
                 'links': [
                     {
-                        'href': self.IMAGE_HREF % (1,),
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
                         'rel': 'bookmark',
-                        'type': 'application/json',
                     },
                 ],
             },
@@ -1158,25 +1276,30 @@ class ImageXMLSerializationTest(test.TestCase):
         actual = minidom.parseString(output.replace("  ", ""))
 
         expected_server_href = self.SERVER_HREF
-        expected_href = self.IMAGE_HREF % (1, )
+        expected_server_bookmark = self.SERVER_BOOKMARK
+        expected_href = self.IMAGE_HREF % 1
+        expected_bookmark = self.IMAGE_BOOKMARK % 1
         expected_now = self.TIMESTAMP
         expected = minidom.parseString("""
         <image id="1"
+                xmlns="http://docs.openstack.org/compute/api/v1.1"
+                xmlns:atom="http://www.w3.org/2005/Atom"
                 name="Image1"
-                serverRef="%(expected_server_href)s"
                 updated="%(expected_now)s"
                 created="%(expected_now)s"
                 status="ACTIVE"
-                xmlns="http://docs.openstack.org/compute/api/v1.1">
-            <links>
-                <link href="%(expected_href)s" rel="bookmark"
-                    type="application/json" />
-            </links>
+                progress="80">
+            <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
                 </meta>
             </metadata>
+            <atom:link href="%(expected_href)s" rel="self"/>
+            <atom:link href="%(expected_bookmark)s" rel="bookmark"/>
         </image>
         """.replace("  ", "") % (locals()))
 
@@ -1191,14 +1314,29 @@ class ImageXMLSerializationTest(test.TestCase):
                 'name': 'Image1',
                 'created': self.TIMESTAMP,
                 'updated': self.TIMESTAMP,
-                'serverRef': self.SERVER_HREF,
                 'status': 'ACTIVE',
+                'server': {
+                    'id': 1,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
                 'metadata': {},
                 'links': [
                     {
-                        'href': self.IMAGE_HREF % (1,),
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
                         'rel': 'bookmark',
-                        'type': 'application/json',
                     },
                 ],
             },
@@ -1208,21 +1346,24 @@ class ImageXMLSerializationTest(test.TestCase):
         actual = minidom.parseString(output.replace("  ", ""))
 
         expected_server_href = self.SERVER_HREF
-        expected_href = self.IMAGE_HREF % (1, )
+        expected_server_bookmark = self.SERVER_BOOKMARK
+        expected_href = self.IMAGE_HREF % 1
+        expected_bookmark = self.IMAGE_BOOKMARK % 1
         expected_now = self.TIMESTAMP
         expected = minidom.parseString("""
         <image id="1"
+                xmlns="http://docs.openstack.org/compute/api/v1.1"
+                xmlns:atom="http://www.w3.org/2005/Atom"
                 name="Image1"
-                serverRef="%(expected_server_href)s"
                 updated="%(expected_now)s"
                 created="%(expected_now)s"
-                status="ACTIVE"
-                xmlns="http://docs.openstack.org/compute/api/v1.1">
-            <links>
-                <link href="%(expected_href)s" rel="bookmark"
-                    type="application/json" />
-            </links>
-            <metadata />
+                status="ACTIVE">
+            <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>
         """.replace("  ", "") % (locals()))
 
@@ -1237,16 +1378,30 @@ class ImageXMLSerializationTest(test.TestCase):
                 'name': 'Image1',
                 'created': self.TIMESTAMP,
                 'updated': self.TIMESTAMP,
-                'serverRef': self.SERVER_HREF,
                 'status': 'ACTIVE',
+                'server': {
+                    'id': 1,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
                 'links': [
                     {
-                        'href': self.IMAGE_HREF % (1,),
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
                         'rel': 'bookmark',
-                        'type': 'application/json',
                     },
                 ],
-
             },
         }
 
@@ -1254,21 +1409,76 @@ class ImageXMLSerializationTest(test.TestCase):
         actual = minidom.parseString(output.replace("  ", ""))
 
         expected_server_href = self.SERVER_HREF
-        expected_href = self.IMAGE_HREF % (1, )
+        expected_server_bookmark = self.SERVER_BOOKMARK
+        expected_href = self.IMAGE_HREF % 1
+        expected_bookmark = self.IMAGE_BOOKMARK % 1
         expected_now = self.TIMESTAMP
         expected = minidom.parseString("""
         <image id="1"
+                xmlns="http://docs.openstack.org/compute/api/v1.1"
+                xmlns:atom="http://www.w3.org/2005/Atom"
                 name="Image1"
-                serverRef="%(expected_server_href)s"
                 updated="%(expected_now)s"
                 created="%(expected_now)s"
-                status="ACTIVE"
-                xmlns="http://docs.openstack.org/compute/api/v1.1">
-            <links>
-                <link href="%(expected_href)s" rel="bookmark"
-                    type="application/json" />
-            </links>
-            <metadata />
+                status="ACTIVE">
+            <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>
+        """.replace("  ", "") % (locals()))
+
+        self.assertEqual(expected.toxml(), actual.toxml())
+
+    def test_show_no_server(self):
+        serializer = images.ImageXMLSerializer()
+
+        fixture = {
+            'image': {
+                'id': 1,
+                'name': 'Image1',
+                'created': self.TIMESTAMP,
+                'updated': self.TIMESTAMP,
+                'status': 'ACTIVE',
+                'metadata': {
+                    'key1': 'value1',
+                },
+                'links': [
+                    {
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
+                        'rel': 'bookmark',
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture, 'show')
+        actual = minidom.parseString(output.replace("  ", ""))
+
+        expected_href = self.IMAGE_HREF % 1
+        expected_bookmark = self.IMAGE_BOOKMARK % 1
+        expected_now = self.TIMESTAMP
+        expected = minidom.parseString("""
+        <image id="1"
+                xmlns="http://docs.openstack.org/compute/api/v1.1"
+                xmlns:atom="http://www.w3.org/2005/Atom"
+                name="Image1"
+                updated="%(expected_now)s"
+                created="%(expected_now)s"
+                status="ACTIVE">
+            <metadata>
+                <meta key="key1">
+                    value1
+                </meta>
+            </metadata>
+            <atom:link href="%(expected_href)s" rel="self"/>
+            <atom:link href="%(expected_bookmark)s" rel="bookmark"/>
         </image>
         """.replace("  ", "") % (locals()))
 
@@ -1277,70 +1487,51 @@ class ImageXMLSerializationTest(test.TestCase):
     def test_index(self):
         serializer = images.ImageXMLSerializer()
 
-        fixtures = {
+        fixture = {
             'images': [
                 {
                     'id': 1,
                     'name': 'Image1',
-                    'created': self.TIMESTAMP,
-                    'updated': self.TIMESTAMP,
-                    'serverRef': self.SERVER_HREF,
-                    'status': 'ACTIVE',
                     'links': [
                         {
-                            'href': 'http://localhost/v1.1/images/1',
-                            'rel': 'bookmark',
-                            'type': 'application/json',
+                            'href': self.IMAGE_HREF % 1,
+                            'rel': 'self',
                         },
                     ],
                 },
                 {
                     'id': 2,
-                    'name': 'queued image',
-                    'created': self.TIMESTAMP,
-                    'updated': self.TIMESTAMP,
-                    'serverRef': self.SERVER_HREF,
-                    'status': 'QUEUED',
+                    'name': 'Image2',
                     'links': [
                         {
-                            'href': 'http://localhost/v1.1/images/2',
-                            'rel': 'bookmark',
-                            'type': 'application/json',
+                            'href': self.IMAGE_HREF % 2,
+                            'rel': 'self',
                         },
                     ],
                 },
-            ],
+            ]
         }
 
-        output = serializer.serialize(fixtures, 'index')
+        output = serializer.serialize(fixture, 'index')
         actual = minidom.parseString(output.replace("  ", ""))
 
-        expected_serverRef = self.SERVER_HREF
+        expected_server_href = self.SERVER_HREF
+        expected_server_bookmark = self.SERVER_BOOKMARK
+        expected_href = self.IMAGE_HREF % 1
+        expected_bookmark = self.IMAGE_BOOKMARK % 1
+        expected_href_two = self.IMAGE_HREF % 2
+        expected_bookmark_two = self.IMAGE_BOOKMARK % 2
         expected_now = self.TIMESTAMP
         expected = minidom.parseString("""
-        <images xmlns="http://docs.openstack.org/compute/api/v1.1">
-            <image id="1"
-                    name="Image1"
-                    serverRef="%(expected_serverRef)s"
-                    updated="%(expected_now)s"
-                    created="%(expected_now)s"
-                    status="ACTIVE">
-                <links>
-                    <link href="http://localhost/v1.1/images/1" rel="bookmark"
-                        type="application/json" />
-                </links>
-            </image>
-            <image id="2"
-                    name="queued image"
-                    serverRef="%(expected_serverRef)s"
-                    updated="%(expected_now)s"
-                    created="%(expected_now)s"
-                    status="QUEUED">
-                <links>
-                    <link href="http://localhost/v1.1/images/2" rel="bookmark"
-                        type="application/json" />
-                </links>
-            </image>
+        <images
+                xmlns="http://docs.openstack.org/compute/api/v1.1"
+                xmlns:atom="http://www.w3.org/2005/Atom">
+        <image id="1" name="Image1">
+            <atom:link href="%(expected_href)s" rel="self"/>
+        </image>
+        <image id="2" name="Image2">
+            <atom:link href="%(expected_href_two)s" rel="self"/>
+        </image>
         </images>
         """.replace("  ", "") % (locals()))
 
@@ -1356,10 +1547,10 @@ class ImageXMLSerializationTest(test.TestCase):
         output = serializer.serialize(fixtures, 'index')
         actual = minidom.parseString(output.replace("  ", ""))
 
-        expected_serverRef = self.SERVER_HREF
-        expected_now = self.TIMESTAMP
         expected = minidom.parseString("""
-        <images xmlns="http://docs.openstack.org/compute/api/v1.1" />
+        <images
+                xmlns="http://docs.openstack.org/compute/api/v1.1"
+                xmlns:atom="http://www.w3.org/2005/Atom" />
         """.replace("  ", "") % (locals()))
 
         self.assertEqual(expected.toxml(), actual.toxml())
@@ -1367,84 +1558,102 @@ class ImageXMLSerializationTest(test.TestCase):
     def test_detail(self):
         serializer = images.ImageXMLSerializer()
 
-        fixtures = {
+        fixture = {
             'images': [
                 {
                     'id': 1,
                     'name': 'Image1',
                     'created': self.TIMESTAMP,
                     'updated': self.TIMESTAMP,
-                    'serverRef': self.SERVER_HREF,
                     'status': 'ACTIVE',
-                    'metadata': {
-                        'key1': 'value1',
-                        'key2': 'value2',
+                    'server': {
+                        'id': 1,
+                        'links': [
+                            {
+                                'href': self.SERVER_HREF,
+                                'rel': 'self',
+                            },
+                            {
+                                'href': self.SERVER_BOOKMARK,
+                                'rel': 'bookmark',
+                            },
+                        ],
                     },
                     'links': [
                         {
-                            'href': 'http://localhost/v1.1/images/1',
+                            'href': self.IMAGE_HREF % 1,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.IMAGE_BOOKMARK % 1,
                             'rel': 'bookmark',
-                            'type': 'application/json',
                         },
                     ],
                 },
                 {
                     'id': 2,
-                    'name': 'queued image',
+                    'name': 'Image2',
                     'created': self.TIMESTAMP,
                     'updated': self.TIMESTAMP,
-                    'serverRef': self.SERVER_HREF,
-                    'metadata': {},
-                    'status': 'QUEUED',
+                    'status': 'SAVING',
+                    'progress': 80,
+                    'metadata': {
+                        'key1': 'value1',
+                    },
                     'links': [
                         {
-                            'href': 'http://localhost/v1.1/images/2',
+                            'href': self.IMAGE_HREF % 2,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.IMAGE_BOOKMARK % 2,
                             'rel': 'bookmark',
-                            'type': 'application/json',
                         },
                     ],
                 },
-            ],
+            ]
         }
 
-        output = serializer.serialize(fixtures, 'detail')
+        output = serializer.serialize(fixture, 'detail')
         actual = minidom.parseString(output.replace("  ", ""))
 
-        expected_serverRef = self.SERVER_HREF
+        expected_server_href = self.SERVER_HREF
+        expected_server_bookmark = self.SERVER_BOOKMARK
+        expected_href = self.IMAGE_HREF % 1
+        expected_bookmark = self.IMAGE_BOOKMARK % 1
+        expected_href_two = self.IMAGE_HREF % 2
+        expected_bookmark_two = self.IMAGE_BOOKMARK % 2
         expected_now = self.TIMESTAMP
         expected = minidom.parseString("""
-        <images xmlns="http://docs.openstack.org/compute/api/v1.1">
-            <image id="1"
-                    name="Image1"
-                    serverRef="%(expected_serverRef)s"
-                    updated="%(expected_now)s"
-                    created="%(expected_now)s"
-                    status="ACTIVE">
-                <links>
-                    <link href="http://localhost/v1.1/images/1" rel="bookmark"
-                        type="application/json" />
-                </links>
-                <metadata>
-                    <meta key="key2">
-                        value2
-                    </meta>
-                    <meta key="key1">
-                        value1
-                    </meta>
-                </metadata>
-            </image>
-            <image id="2"
-                    name="queued image"
-                    serverRef="%(expected_serverRef)s"
-                    updated="%(expected_now)s"
-                    created="%(expected_now)s"
-                    status="QUEUED">
-                <links>
-                    <link href="http://localhost/v1.1/images/2" rel="bookmark"
-                        type="application/json" />
-                </links>
-                <metadata />
-            </image>
+        <images
+                xmlns="http://docs.openstack.org/compute/api/v1.1"
+                xmlns:atom="http://www.w3.org/2005/Atom">
+        <image id="1"
+                name="Image1"
+                updated="%(expected_now)s"
+                created="%(expected_now)s"
+                status="ACTIVE">
+            <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>
+        <image id="2"
+                name="Image2"
+                updated="%(expected_now)s"
+                created="%(expected_now)s"
+                status="SAVING"
+                progress="80">
+            <metadata>
+                <meta key="key1">
+                    value1
+                </meta>
+            </metadata>
+            <atom:link href="%(expected_href_two)s" rel="self"/>
+            <atom:link href="%(expected_bookmark_two)s" rel="bookmark"/>
+        </image>
         </images>
         """.replace("  ", "") % (locals()))
 
@@ -1459,16 +1668,32 @@ class ImageXMLSerializationTest(test.TestCase):
                 'name': 'Image1',
                 'created': self.TIMESTAMP,
                 'updated': self.TIMESTAMP,
-                'serverRef': self.SERVER_HREF,
-                'status': 'ACTIVE',
+                'status': 'SAVING',
+                'progress': 80,
+                'server': {
+                    'id': 1,
+                    'links': [
+                        {
+                            'href': self.SERVER_HREF,
+                            'rel': 'self',
+                        },
+                        {
+                            'href': self.SERVER_BOOKMARK,
+                            'rel': 'bookmark',
+                        },
+                    ],
+                },
                 'metadata': {
                     'key1': 'value1',
                 },
                 'links': [
                     {
-                        'href': self.IMAGE_HREF % (1,),
+                        'href': self.IMAGE_HREF % 1,
+                        'rel': 'self',
+                    },
+                    {
+                        'href': self.IMAGE_BOOKMARK % 1,
                         'rel': 'bookmark',
-                        'type': 'application/json',
                     },
                 ],
             },
@@ -1478,25 +1703,30 @@ class ImageXMLSerializationTest(test.TestCase):
         actual = minidom.parseString(output.replace("  ", ""))
 
         expected_server_href = self.SERVER_HREF
-        expected_href = self.IMAGE_HREF % (1, )
+        expected_server_bookmark = self.SERVER_BOOKMARK
+        expected_href = self.IMAGE_HREF % 1
+        expected_bookmark = self.IMAGE_BOOKMARK % 1
         expected_now = self.TIMESTAMP
         expected = minidom.parseString("""
         <image id="1"
+                xmlns="http://docs.openstack.org/compute/api/v1.1"
+                xmlns:atom="http://www.w3.org/2005/Atom"
                 name="Image1"
-                serverRef="%(expected_server_href)s"
                 updated="%(expected_now)s"
                 created="%(expected_now)s"
-                status="ACTIVE"
-                xmlns="http://docs.openstack.org/compute/api/v1.1">
-            <links>
-                <link href="%(expected_href)s" rel="bookmark"
-                    type="application/json" />
-            </links>
+                status="SAVING"
+                progress="80">
+            <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
                 </meta>
             </metadata>
+            <atom:link href="%(expected_href)s" rel="self"/>
+            <atom:link href="%(expected_bookmark)s" rel="bookmark"/>
         </image>
         """.replace("  ", "") % (locals()))
 
diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py
index 08522f720..0c8d6c313 100644
--- a/nova/tests/integrated/test_servers.py
+++ b/nova/tests/integrated/test_servers.py
@@ -209,7 +209,6 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
 
         network_list = [{'id': 1, 'fixed_ip': '10.0.0.3'},
                         {'id': 2, 'fixed_ip': '10.0.0.12'}]
-        
         server['networks'] = network_list
 
         post = {'server': server}
@@ -326,7 +325,6 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
         self.assertRaises(client.OpenStackApiException,
                           self.api.post_server, post)
 
-
     def test_create_server_with_networks_empty_fixed_ip(self):
         """Creates a server with networks."""