openstack/deb-nova
Code Issues Proposed changes

Further test update and begin correcting serialization

Browse Source
This commit is contained in:
Alex Meade
2011-07-06 14:47:41 -04:00
parent 479b55aefa
commit 94a6af26e4
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/api/openstack/images.py
View File

@@ -267,8 +267,9 @@ class ImageXMLSerializer(wsgi.XMLDictSerializer):
metadata = { metadata = {
"attributes": { "attributes": {
"image": ["id", "name", "updated", "created", "status", "image": ["id", "name", "updated", "created", "status",
"serverId", "progress", "serverRef"], "serverId", "progress"],
"link": ["rel", "type", "href"], "link": ["rel", "href"],
"server": ["name", "id"],
}, },
} }

30
nova/tests/api/openstack/test_images.py
View File

@@ -1168,14 +1168,29 @@ class ImageXMLSerializationTest(test.TestCase):
def test_show(self): def test_show(self):
serializer = images.ImageXMLSerializer() serializer = images.ImageXMLSerializer()
#so we can see the full diff in the output
self.maxDiff = None
fixture = { fixture = {
'image': { 'image': {
'id': 1, 'id': 1,
'name': 'Image1', 'name': 'Image1',
'created': self.TIMESTAMP, 'created': self.TIMESTAMP,
'updated': self.TIMESTAMP, 'updated': self.TIMESTAMP,
'serverRef': self.SERVER_HREF,
'status': 'ACTIVE', 'status': 'ACTIVE',
'server': {
'id': 1,
'name': 'Server1',
'links': [
{
'href': self.SERVER_BOOKMARK,
'rel': 'bookmark',
},
{
'href': self.SERVER_HREF,
'rel': 'self',
},
],
},
'metadata': { 'metadata': {
'key1': 'value1', 'key1': 'value1',
}, },
@@ -1184,6 +1199,10 @@ class ImageXMLSerializationTest(test.TestCase):
'href': self.IMAGE_HREF % (1,), 'href': self.IMAGE_HREF % (1,),
'rel': 'bookmark', 'rel': 'bookmark',
}, },
{
'href': self.IMAGE_BOOKMARK % (1,),
'rel': 'self',
},
], ],
}, },
} }
@@ -1192,7 +1211,7 @@ class ImageXMLSerializationTest(test.TestCase):
actual = minidom.parseString(output.replace(" ", "")) actual = minidom.parseString(output.replace(" ", ""))
expected_server_href = self.SERVER_HREF 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_href = self.IMAGE_HREF % (1, )
expected_bookmark = self.IMAGE_BOOKMARK % (1, ) expected_bookmark = self.IMAGE_BOOKMARK % (1, )
expected_now = self.TIMESTAMP expected_now = self.TIMESTAMP
@@ -1205,18 +1224,21 @@ class ImageXMLSerializationTest(test.TestCase):
created="%(expected_now)s" created="%(expected_now)s"
status="ACTIVE" status="ACTIVE"
progress="80"> progress="80">
<server name="" id=""> <server name="Server1" id="1">
<atom:link rel="bookmark" href="%(expected_server_href)s"/> <atom:link rel="bookmark" href="%(expected_server_href)s"/>
<atom:link rel="self" href="%(expected_server_bookmark)s"/> <atom:link rel="self" href="%(expected_server_bookmark)s"/>
</server> </server>
<atom:link href="%(expected_href)s" rel="self"/> <atom:link href="%(expected_href)s" rel="self"/>
<atom:link href="%(expected_bookmark)s" rel="bookmark"/> <atom:link href="%(expected_bookmark)s" rel="bookmark"/>
<metadata> <metadata>
<meta key="key1">value1</meta> <meta key="key1">
value1
</meta>
</metadata> </metadata>
</image> </image>
""".replace(" ", "") % (locals())) """.replace(" ", "") % (locals()))
print actual.toxml()
self.assertEqual(expected.toxml(), actual.toxml()) self.assertEqual(expected.toxml(), actual.toxml())
def test_show_zero_metadata(self): def test_show_zero_metadata(self):