From 81ea3d5fc47bed84c5f4bf722b02dfa58792e19e Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Wed, 29 Jun 2011 18:26:51 -0400 Subject: Updated v1.1 links in flavors to represent the curret spec --- nova/tests/api/openstack/test_flavors.py | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/test_flavors.py index d1c62e454..47e6a3fd3 100644 --- a/nova/tests/api/openstack/test_flavors.py +++ b/nova/tests/api/openstack/test_flavors.py @@ -146,12 +146,10 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", "href": "http://localhost/v1.1/flavors/12", }, { "rel": "bookmark", - "type": "application/xml", "href": "http://localhost/v1.1/flavors/12", }, ], @@ -175,12 +173,10 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", "href": "http://localhost/v1.1/flavors/1", }, { "rel": "bookmark", - "type": "application/xml", "href": "http://localhost/v1.1/flavors/1", }, ], @@ -195,12 +191,10 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", "href": "http://localhost/v1.1/flavors/2", }, { "rel": "bookmark", - "type": "application/xml", "href": "http://localhost/v1.1/flavors/2", }, ], @@ -227,12 +221,10 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", "href": "http://localhost/v1.1/flavors/1", }, { "rel": "bookmark", - "type": "application/xml", "href": "http://localhost/v1.1/flavors/1", }, ], @@ -249,12 +241,10 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", "href": "http://localhost/v1.1/flavors/2", }, { "rel": "bookmark", - "type": "application/xml", "href": "http://localhost/v1.1/flavors/2", }, ], -- cgit From 8133b9af105f7924f03b710b30cf4f0acb52f143 Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 30 Jun 2011 10:29:31 -0400 Subject: refactored flavors viewbuilder --- nova/tests/api/openstack/test_flavors.py | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/test_flavors.py index 47e6a3fd3..7b4bd12f3 100644 --- a/nova/tests/api/openstack/test_flavors.py +++ b/nova/tests/api/openstack/test_flavors.py @@ -146,11 +146,7 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/12", - }, - { - "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/12", + "href": "http://localhost/flavors/12", }, ], } @@ -173,11 +169,7 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/1", - }, - { - "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/1", + "href": "http://localhost/flavors/1", }, ], }, @@ -191,11 +183,7 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/2", - }, - { - "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/2", + "href": "http://localhost/flavors/2", }, ], }, @@ -221,11 +209,7 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/1", - }, - { - "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/1", + "href": "http://localhost/flavors/1", }, ], }, @@ -241,11 +225,7 @@ class FlavorsTest(test.TestCase): }, { "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/2", - }, - { - "rel": "bookmark", - "href": "http://localhost/v1.1/flavors/2", + "href": "http://localhost/flavors/2", }, ], }, -- cgit From 5f772ea10c22549a7149f608cfc2ff932878d6fe Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 30 Jun 2011 11:18:19 -0400 Subject: updated servers --- nova/tests/api/openstack/test_servers.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index b53c6c9be..110445935 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -290,13 +290,7 @@ class ServersTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", - "href": "http://localhost/v1.1/servers/1", - }, - { - "rel": "bookmark", - "type": "application/xml", - "href": "http://localhost/v1.1/servers/1", + "href": "http://localhost/servers/1", }, ] @@ -514,13 +508,7 @@ class ServersTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", - "href": "http://localhost/v1.1/servers/%d" % (i,), - }, - { - "rel": "bookmark", - "type": "application/xml", - "href": "http://localhost/v1.1/servers/%d" % (i,), + "href": "http://localhost/servers/%d" % (i,), }, ] -- cgit From 386e2a28f2d92dea30a726722b49e97e1c7ebba7 Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 30 Jun 2011 11:29:45 -0400 Subject: updated images --- nova/tests/api/openstack/test_images.py | 78 ++++++--------------------------- 1 file changed, 14 insertions(+), 64 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index e11e1c046..b864ae9f4 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -400,6 +400,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): actual_image = json.loads(response.body) href = "http://localhost/v1.1/images/123" + bookmark = "http://localhost/images/123" expected_image = { "image": { @@ -414,13 +415,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", - "href": href, - }, - { - "rel": "bookmark", - "type": "application/xml", - "href": href, + "href": bookmark, }], }, } @@ -473,6 +468,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): actual_image = minidom.parseString(response.body.replace(" ", "")) expected_href = "http://localhost/v1.1/images/123" + expected_bookmark = "http://localhost/images/123" expected_now = self.NOW_API_FORMAT expected_image = minidom.parseString(""" - - + """.replace(" ", "") % (locals())) @@ -580,22 +573,17 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): continue href = "http://localhost/v1.1/images/%s" % image["id"] + bookmark = "http://localhost/images/%s" % image["id"] test_image = { "id": image["id"], "name": image["name"], "links": [{ "rel": "self", - "href": "http://localhost/v1.1/images/%s" % image["id"], - }, - { - "rel": "bookmark", - "type": "application/json", "href": href, }, { "rel": "bookmark", - "type": "application/xml", - "href": href, + "href": bookmark, }], } self.assertTrue(test_image in response_list) @@ -674,13 +662,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", - "href": "http://localhost/v1.1/images/123", - }, - { - "rel": "bookmark", - "type": "application/xml", - "href": "http://localhost/v1.1/images/123", + "href": "http://localhost/images/123", }], }, { @@ -696,13 +678,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", - "href": "http://localhost/v1.1/images/124", - }, - { - "rel": "bookmark", - "type": "application/xml", - "href": "http://localhost/v1.1/images/124", + "href": "http://localhost/images/124", }], }, { @@ -719,13 +695,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", - "href": "http://localhost/v1.1/images/125", - }, - { - "rel": "bookmark", - "type": "application/xml", - "href": "http://localhost/v1.1/images/125", + "href": "http://localhost/images/125", }], }, { @@ -741,13 +711,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", - "href": "http://localhost/v1.1/images/126", - }, - { - "rel": "bookmark", - "type": "application/xml", - "href": "http://localhost/v1.1/images/126", + "href": "http://localhost/images/126", }], }, { @@ -763,13 +727,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", - "href": "http://localhost/v1.1/images/127", - }, - { - "rel": "bookmark", - "type": "application/xml", - "href": "http://localhost/v1.1/images/127", + "href": "http://localhost/images/127", }], }, { @@ -784,13 +742,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): }, { "rel": "bookmark", - "type": "application/json", - "href": "http://localhost/v1.1/images/129", - }, - { - "rel": "bookmark", - "type": "application/xml", - "href": "http://localhost/v1.1/images/129", + "href": "http://localhost/images/129", }], }, ] @@ -1120,6 +1072,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): self.assertEqual(200, response.status_int) resp_xml = minidom.parseString(response.body.replace(" ", "")) expected_href = "http://localhost/v1.1/images/123" + expected_bookmark = "http://localhost/images/123" expected_image = minidom.parseString(""" - - + """.replace(" ", "") % (locals())) -- cgit