summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2011-08-17 10:05:01 -0700
committerAnthony Young <sleepsonthefloor@gmail.com>2011-08-17 10:05:01 -0700
commit4f3a33859c350ff13b2fd94e33de4f10a7f93bc1 (patch)
tree90cce481c191aa71a47387b6c756cb759ea0fb08 /nova/tests
parent6165b4a4db3d35f900d7d994540c923a3d2e56b0 (diff)
fix some naming inconsistencies, make associate/disassociate PUTs
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/contrib/test_floating_ips.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/contrib/test_floating_ips.py
index 9b41a58c0..e506519f4 100644
--- a/nova/tests/api/openstack/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/contrib/test_floating_ips.py
@@ -159,9 +159,9 @@ class FloatingIpTest(test.TestCase):
self.assertEqual(res.status_int, 202)
def test_floating_ip_associate(self):
- body = dict(associate_address=dict(fixed_ip='11.0.0.1'))
+ body = dict(floating_ip=dict(fixed_ip='11.0.0.1'))
req = webob.Request.blank('/v1.1/os-floating-ips/1/associate')
- req.method = 'POST'
+ req.method = 'PUT'
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
@@ -179,7 +179,7 @@ class FloatingIpTest(test.TestCase):
def test_floating_ip_disassociate(self):
body = dict()
req = webob.Request.blank('/v1.1/os-floating-ips/1/disassociate')
- req.method = 'POST'
+ req.method = 'PUT'
req.body = json.dumps(body)
req.headers['Content-Type'] = 'application/json'
res = req.get_response(fakes.wsgi_app())