summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-06-29 18:26:51 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-06-29 18:26:51 -0400
commit81ea3d5fc47bed84c5f4bf722b02dfa58792e19e (patch)
tree090f3d23c2a25fb1afaa5c9e57372fa805a2b18c
parent17d08b9644080265f6feb4d55825de8e4049c991 (diff)
downloadnova-81ea3d5fc47bed84c5f4bf722b02dfa58792e19e.tar.gz
nova-81ea3d5fc47bed84c5f4bf722b02dfa58792e19e.tar.xz
nova-81ea3d5fc47bed84c5f4bf722b02dfa58792e19e.zip
Updated v1.1 links in flavors to represent the curret spec
-rw-r--r--nova/api/openstack/views/flavors.py2
-rw-r--r--nova/tests/api/openstack/test_flavors.py10
2 files changed, 0 insertions, 12 deletions
diff --git a/nova/api/openstack/views/flavors.py b/nova/api/openstack/views/flavors.py
index 462890ab2..beef67a88 100644
--- a/nova/api/openstack/views/flavors.py
+++ b/nova/api/openstack/views/flavors.py
@@ -79,12 +79,10 @@ class ViewBuilderV11(ViewBuilder):
},
{
"rel": "bookmark",
- "type": "application/json",
"href": href,
},
{
"rel": "bookmark",
- "type": "application/xml",
"href": href,
},
]
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",
},
],