From 479b55aefadd88e59a6cd489a39df53fecc46bdf Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Wed, 6 Jul 2011 13:19:37 -0400 Subject: updated expected xml in images show test to represent current spec --- nova/tests/api/openstack/test_images.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index 1e046531c..9291997bc 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1161,7 +1161,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() @@ -1181,7 +1183,6 @@ class ImageXMLSerializationTest(test.TestCase): { 'href': self.IMAGE_HREF % (1,), 'rel': 'bookmark', - 'type': 'application/json', }, ], }, @@ -1191,24 +1192,27 @@ class ImageXMLSerializationTest(test.TestCase): actual = minidom.parseString(output.replace(" ", "")) 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_now = self.TIMESTAMP expected = minidom.parseString(""" - - - + progress="80"> + + + + + + - - value1 - + value1 """.replace(" ", "") % (locals())) -- cgit From 94a6af26e46d4df35294ad0bf4dc4883b7bf052e Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Wed, 6 Jul 2011 14:47:41 -0400 Subject: Further test update and begin correcting serialization --- nova/tests/api/openstack/test_images.py | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'nova/tests') 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"> - + - value1 + + value1 + """.replace(" ", "") % (locals())) + print actual.toxml() self.assertEqual(expected.toxml(), actual.toxml()) def test_show_zero_metadata(self): -- cgit From 0415c413872697c6f9fecc28928af0525780f868 Mon Sep 17 00:00:00 2001 From: Mark Washenberger Date: Wed, 6 Jul 2011 16:40:00 -0400 Subject: correct test_show --- nova/tests/api/openstack/test_images.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index 4f00ac1f8..873607997 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1177,18 +1177,19 @@ class ImageXMLSerializationTest(test.TestCase): 'created': self.TIMESTAMP, 'updated': self.TIMESTAMP, 'status': 'ACTIVE', + 'progress': 80, 'server': { 'id': 1, 'name': 'Server1', 'links': [ - { - 'href': self.SERVER_BOOKMARK, - 'rel': 'bookmark', - }, { 'href': self.SERVER_HREF, 'rel': 'self', }, + { + 'href': self.SERVER_BOOKMARK, + 'rel': 'bookmark', + }, ], }, 'metadata': { @@ -1197,11 +1198,11 @@ class ImageXMLSerializationTest(test.TestCase): 'links': [ { 'href': self.IMAGE_HREF % (1,), - 'rel': 'bookmark', + 'rel': 'self', }, { 'href': self.IMAGE_BOOKMARK % (1,), - 'rel': 'self', + 'rel': 'bookmark', }, ], }, @@ -1225,19 +1226,21 @@ class ImageXMLSerializationTest(test.TestCase): status="ACTIVE" progress="80"> - - + + - - value1 + + """.replace(" ", "") % (locals())) + print expected.toxml() + print '---' print actual.toxml() self.assertEqual(expected.toxml(), actual.toxml()) -- cgit From b50e92d43f958bf966fce4f608daa467b40453c1 Mon Sep 17 00:00:00 2001 From: Mark Washenberger Date: Thu, 7 Jul 2011 10:48:17 -0400 Subject: make server and image metadata optional --- nova/tests/api/openstack/test_images.py | 158 +++++++++++++++++++++++++------- 1 file changed, 124 insertions(+), 34 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index 873607997..25c7001f5 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1197,11 +1197,11 @@ class ImageXMLSerializationTest(test.TestCase): }, 'links': [ { - 'href': self.IMAGE_HREF % (1,), + 'href': self.IMAGE_HREF % 1, 'rel': 'self', }, { - 'href': self.IMAGE_BOOKMARK % (1,), + 'href': self.IMAGE_BOOKMARK % 1, 'rel': 'bookmark', }, ], @@ -1213,8 +1213,8 @@ class ImageXMLSerializationTest(test.TestCase): 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 = self.IMAGE_HREF % 1 + expected_bookmark = self.IMAGE_BOOKMARK % 1 expected_now = self.TIMESTAMP expected = minidom.parseString(""" """.replace(" ", "") % (locals())) - print expected.toxml() - print '---' - print actual.toxml() self.assertEqual(expected.toxml(), actual.toxml()) def test_show_zero_metadata(self): serializer = images.ImageXMLSerializer() + 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_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', }, ], }, @@ -1270,21 +1284,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(""" - - - - + status="ACTIVE"> + + + + + + """.replace(" ", "") % (locals())) @@ -1293,22 +1310,38 @@ class ImageXMLSerializationTest(test.TestCase): def test_show_image_no_metadata_key(self): serializer = images.ImageXMLSerializer() + 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_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', }, ], - }, } @@ -1316,21 +1349,78 @@ 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(""" - - - - + status="ACTIVE"> + + + + + + + + """.replace(" ", "") % (locals())) + + self.assertEqual(expected.toxml(), actual.toxml()) + + def test_show_no_server(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, + '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(""" + + + + value1 + + + + """.replace(" ", "") % (locals())) @@ -1528,7 +1618,7 @@ class ImageXMLSerializationTest(test.TestCase): }, 'links': [ { - 'href': self.IMAGE_HREF % (1,), + 'href': self.IMAGE_HREF % 1, 'rel': 'bookmark', 'type': 'application/json', }, @@ -1540,7 +1630,7 @@ class ImageXMLSerializationTest(test.TestCase): actual = minidom.parseString(output.replace(" ", "")) expected_server_href = self.SERVER_HREF - expected_href = self.IMAGE_HREF % (1, ) + expected_href = self.IMAGE_HREF % 1 expected_now = self.TIMESTAMP expected = minidom.parseString(""" Date: Thu, 7 Jul 2011 11:06:35 -0400 Subject: Updated test_detail --- nova/tests/api/openstack/test_images.py | 117 +++++++++++++++++++------------- 1 file changed, 69 insertions(+), 48 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index 701d8be8a..3e8d4700d 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1473,84 +1473,105 @@ class ImageXMLSerializationTest(test.TestCase): def test_detail(self): serializer = images.ImageXMLSerializer() - fixtures = { + #so we can see the full diff in the output + self.maxDiff = None + 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, + 'name': 'Server1', + '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(""" - - - - - - - - value2 - - - value1 - - - - - - - - - + + + + + + + + + + + + + value1 + + + + + """.replace(" ", "") % (locals())) -- cgit From 63d579523985cbd4c896d9a05e523761e1cadb3a Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 7 Jul 2011 11:11:40 -0400 Subject: fixed image create response test --- nova/tests/api/openstack/test_images.py | 44 +++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index 3e8d4700d..c8e7df096 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1580,22 +1580,41 @@ class ImageXMLSerializationTest(test.TestCase): def test_create(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', + 'status': 'SAVING', + 'progress': 80, + 'server': { + 'id': 1, + 'name': 'Server1', + 'links': [ + { + 'href': self.SERVER_HREF, + 'rel': 'self', + }, + { + 'href': self.SERVER_BOOKMARK, + 'rel': 'bookmark', + }, + ], + }, 'metadata': { 'key1': 'value1', }, 'links': [ { 'href': self.IMAGE_HREF % 1, + 'rel': 'self', + }, + { + 'href': self.IMAGE_BOOKMARK % 1, 'rel': 'bookmark', - 'type': 'application/json', }, ], }, @@ -1605,25 +1624,30 @@ class ImageXMLSerializationTest(test.TestCase): actual = minidom.parseString(output.replace(" ", "")) 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_now = self.TIMESTAMP expected = minidom.parseString(""" - - - + status="SAVING" + progress="80"> + + + + value1 + + """.replace(" ", "") % (locals())) -- cgit From ddc33b8163423c5138b40885cb3430104896c676 Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 7 Jul 2011 11:36:45 -0400 Subject: Added image index --- nova/tests/api/openstack/test_images.py | 71 +++++++++++++-------------------- 1 file changed, 28 insertions(+), 43 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index c8e7df096..cf68f5f53 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1383,70 +1383,53 @@ class ImageXMLSerializationTest(test.TestCase): def test_index(self): serializer = images.ImageXMLSerializer() - fixtures = { + #so we can see the full diff in the output + self.maxDiff = None + 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(""" - - - - - - - - - - - + + + + + + + """.replace(" ", "") % (locals())) @@ -1465,7 +1448,9 @@ class ImageXMLSerializationTest(test.TestCase): expected_serverRef = self.SERVER_HREF expected_now = self.TIMESTAMP expected = minidom.parseString(""" - + """.replace(" ", "") % (locals())) self.assertEqual(expected.toxml(), actual.toxml()) -- cgit From e9d712c52830725b24f20da7ff8662e97d22014d Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 7 Jul 2011 14:51:12 -0400 Subject: Removed bookmark link from non detailed image viewbuilder --- nova/tests/api/openstack/test_images.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index cf68f5f53..d45195286 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -559,10 +559,6 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): "links": [{ "rel": "self", "href": href, - }, - { - "rel": "bookmark", - "href": bookmark, }], } self.assertTrue(test_image in response_list) -- cgit From 1940ccffb6c22c39d6c21be4e84f20e350599f71 Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 7 Jul 2011 16:19:21 -0400 Subject: Removed serverRef from some tests and viewbuilder --- nova/tests/api/openstack/test_images.py | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index d45195286..7e2240830 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -401,12 +401,13 @@ 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", @@ -648,7 +649,6 @@ 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', @@ -668,7 +668,6 @@ 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', @@ -689,7 +688,6 @@ 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', @@ -709,7 +707,6 @@ 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', @@ -1029,30 +1026,6 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): response = req.get_response(fakes.wsgi_app()) self.assertEqual(200, response.status_int) - def test_create_image_v1_1_actual_server_ref(self): - - serverRef = 'http://localhost/v1.1/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(200, response.status_int) - result = json.loads(response.body) - self.assertEqual(result['image']['serverRef'], serverRef) - - def test_create_image_v1_1_server_ref_bad_hostname(self): - - serverRef = 'http://asdf/v1.1/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_no_server_ref(self): body = dict(image=dict(name='Snapshot 1')) @@ -1441,8 +1414,6 @@ 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(""" Date: Thu, 7 Jul 2011 16:29:17 -0400 Subject: Temporarily moved create server node functionality into images.py Temporarily changed image XML tests to expect server entities with only ids --- nova/tests/api/openstack/test_images.py | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index 7e2240830..d407057a8 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1148,10 +1148,7 @@ class ImageXMLSerializationTest(test.TestCase): created="%(expected_now)s" status="ACTIVE" progress="80"> - - - - + value1 @@ -1219,10 +1216,7 @@ class ImageXMLSerializationTest(test.TestCase): updated="%(expected_now)s" created="%(expected_now)s" status="ACTIVE"> - - - - + @@ -1284,10 +1278,7 @@ class ImageXMLSerializationTest(test.TestCase): updated="%(expected_now)s" created="%(expected_now)s" status="ACTIVE"> - - - - + @@ -1503,10 +1494,7 @@ class ImageXMLSerializationTest(test.TestCase): updated="%(expected_now)s" created="%(expected_now)s" status="ACTIVE"> - - - - + @@ -1589,10 +1577,7 @@ class ImageXMLSerializationTest(test.TestCase): created="%(expected_now)s" status="SAVING" progress="80"> - - - - + value1 -- cgit From a8c9082c701a65f221f218cd8baa92b3859fc0ab Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 7 Jul 2011 16:52:32 -0400 Subject: Added server entity to images that only has id --- nova/tests/api/openstack/test_images.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index d407057a8..87e5c6d7f 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -411,6 +411,9 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): "updated": self.NOW_API_FORMAT, "created": self.NOW_API_FORMAT, "status": "QUEUED", + 'server': { + 'id': 42, + }, "metadata": { "instance_ref": "http://localhost/v1.1/servers/42", "user_id": "1", @@ -652,6 +655,9 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): 'updated': self.NOW_API_FORMAT, 'created': self.NOW_API_FORMAT, 'status': 'QUEUED', + 'server': { + 'id': 42, + }, "links": [{ "rel": "self", "href": "http://localhost/v1.1/images/124", @@ -672,6 +678,9 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): 'created': self.NOW_API_FORMAT, 'status': 'SAVING', 'progress': 0, + 'server': { + 'id': 42, + }, "links": [{ "rel": "self", "href": "http://localhost/v1.1/images/125", @@ -691,6 +700,9 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): 'updated': self.NOW_API_FORMAT, 'created': self.NOW_API_FORMAT, 'status': 'ACTIVE', + 'server': { + 'id': 42, + }, "links": [{ "rel": "self", "href": "http://localhost/v1.1/images/126", @@ -710,6 +722,9 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): 'updated': self.NOW_API_FORMAT, 'created': self.NOW_API_FORMAT, 'status': 'FAILED', + 'server': { + 'id': 42, + }, "links": [{ "rel": "self", "href": "http://localhost/v1.1/images/127", -- cgit From 495137fb383766ae5345fd8b30610a93483c0eaf Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Tue, 12 Jul 2011 12:01:13 -0400 Subject: Updated remove_version_from_href to be more intelligent Added tests --- nova/tests/api/openstack/test_common.py | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py index 29cb8b944..584953c3a 100644 --- a/nova/tests/api/openstack/test_common.py +++ b/nova/tests/api/openstack/test_common.py @@ -190,3 +190,42 @@ 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(webob.exc.HTTPBadRequest, + 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(webob.exc.HTTPBadRequest, + common.get_id_from_href, + fixture) + -- cgit From 50357685282b9200ccc8c82361c5266f1f413531 Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Tue, 12 Jul 2011 12:11:49 -0400 Subject: pep8 --- nova/tests/api/openstack/test_common.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py index 584953c3a..1143fb502 100644 --- a/nova/tests/api/openstack/test_common.py +++ b/nova/tests/api/openstack/test_common.py @@ -195,37 +195,31 @@ class PaginationParamsTest(test.TestCase): 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(webob.exc.HTTPBadRequest, 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(webob.exc.HTTPBadRequest, common.get_id_from_href, fixture) - -- cgit From 5ab2fd27ea930669c01f309dbbfb794fd7c37ad6 Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Tue, 12 Jul 2011 12:42:56 -0400 Subject: updated images tests --- nova/tests/api/openstack/test_images.py | 74 ++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 2 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index 306c0b1db..696493d4f 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -413,6 +413,14 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): "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", @@ -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, @@ -657,6 +667,14 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): 'status': 'QUEUED', 'server': { 'id': 42, + "links": [{ + "rel": "self", + "href": server_href, + }, + { + "rel": "bookmark", + "href": server_bookmark, + }], }, "links": [{ "rel": "self", @@ -680,6 +698,14 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): 'progress': 0, 'server': { 'id': 42, + "links": [{ + "rel": "self", + "href": server_href, + }, + { + "rel": "bookmark", + "href": server_bookmark, + }], }, "links": [{ "rel": "self", @@ -702,6 +728,14 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): 'status': 'ACTIVE', 'server': { 'id': 42, + "links": [{ + "rel": "self", + "href": server_href, + }, + { + "rel": "bookmark", + "href": server_bookmark, + }], }, "links": [{ "rel": "self", @@ -724,6 +758,14 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): 'status': 'FAILED', 'server': { 'id': 42, + "links": [{ + "rel": "self", + "href": server_href, + }, + { + "rel": "bookmark", + "href": server_bookmark, + }], }, "links": [{ "rel": "self", @@ -1044,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' @@ -1052,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' @@ -1065,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): -- cgit From 3c8de7e99e7cd8868f63fb0d15845b2462b77b3e Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Tue, 12 Jul 2011 12:46:15 -0400 Subject: Updated images viewbuilder to return links in server entity --- nova/tests/api/openstack/test_images.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index 696493d4f..c1ead6e28 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1096,7 +1096,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): self.assertEqual(200, response.status_int) result = json.loads(response.body) expected = { - 'id': '1', + 'id': 1, 'links': [ { 'rel': 'self', @@ -1123,7 +1123,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): self.assertEqual(200, response.status_int) result = json.loads(response.body) expected = { - 'id': '1', + 'id': 1, 'links': [ { 'rel': 'self', -- cgit From f4dc32ad0729b40ebe5765a57edff9535b992953 Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Tue, 12 Jul 2011 12:55:37 -0400 Subject: Updated ImageXMLSerializer to serialize links in the server entity --- nova/tests/api/openstack/test_images.py | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'nova/tests') 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"> - + + + + 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"> - + + + + @@ -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"> - + + + + @@ -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"> - + + + + @@ -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"> - + + + + value1 -- cgit From 7a700362d63de1da51e9a890d854c3b0eeb97aae Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Tue, 12 Jul 2011 13:29:26 -0400 Subject: minor cleanup --- nova/tests/api/openstack/test_images.py | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index f0d7be2b9..716b73f6c 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1213,8 +1213,6 @@ 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, @@ -1288,7 +1286,6 @@ class ImageXMLSerializationTest(test.TestCase): def test_show_zero_metadata(self): serializer = images.ImageXMLSerializer() - self.maxDiff = None fixture = { 'image': { 'id': 1, @@ -1353,7 +1350,6 @@ class ImageXMLSerializationTest(test.TestCase): def test_show_image_no_metadata_key(self): serializer = images.ImageXMLSerializer() - self.maxDiff = None fixture = { 'image': { 'id': 1, @@ -1417,8 +1413,6 @@ class ImageXMLSerializationTest(test.TestCase): def test_show_no_server(self): serializer = images.ImageXMLSerializer() - #so we can see the full diff in the output - self.maxDiff = None fixture = { 'image': { 'id': 1, @@ -1471,8 +1465,6 @@ class ImageXMLSerializationTest(test.TestCase): def test_index(self): serializer = images.ImageXMLSerializer() - #so we can see the full diff in the output - self.maxDiff = None fixture = { 'images': [ { @@ -1544,8 +1536,6 @@ class ImageXMLSerializationTest(test.TestCase): def test_detail(self): serializer = images.ImageXMLSerializer() - #so we can see the full diff in the output - self.maxDiff = None fixture = { 'images': [ { @@ -1650,8 +1640,6 @@ class ImageXMLSerializationTest(test.TestCase): def test_create(self): serializer = images.ImageXMLSerializer() - #so we can see the full diff in the output - self.maxDiff = None fixture = { 'image': { 'id': 1, -- cgit From c085294ccb6a8d449ccfd5739be67ee12538f48f Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Tue, 12 Jul 2011 14:19:30 -0400 Subject: Updated some common.py functions to raise ValueErrors instead of HTTPBadRequests --- nova/tests/api/openstack/test_common.py | 4 ++-- nova/tests/api/openstack/test_images.py | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py index 1143fb502..7440bccfb 100644 --- a/nova/tests/api/openstack/test_common.py +++ b/nova/tests/api/openstack/test_common.py @@ -208,7 +208,7 @@ class MiscFunctionsTest(test.TestCase): def test_remove_version_from_href_bad_request(self): fixture = 'http://www.testsite.com/1.1/images' - self.assertRaises(webob.exc.HTTPBadRequest, + self.assertRaises(ValueError, common.remove_version_from_href, fixture) @@ -220,6 +220,6 @@ class MiscFunctionsTest(test.TestCase): def test_get_id_from_href_bad_request(self): fixture = 'http://45' - self.assertRaises(webob.exc.HTTPBadRequest, + 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 716b73f6c..c1bdd6906 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1158,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 -- cgit