summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJesse Andrews <anotherjesse@gmail.com>2011-08-15 02:55:22 -0700
committerJesse Andrews <anotherjesse@gmail.com>2011-08-15 02:55:22 -0700
commitb46320a4175adc4012e60d4eae793a42f3a8186b (patch)
tree286d917faa5fa789419d1ac6d48db49949b69fb0 /nova/tests
parent1fe628fbe1f9964ac4536ce1c859d84d9cd8cb08 (diff)
make list response for floating ip match other apis
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/contrib/test_floating_ips.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/contrib/test_floating_ips.py
index ab7ae2e54..7996ebbb9 100644
--- a/nova/tests/api/openstack/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/contrib/test_floating_ips.py
@@ -116,14 +116,14 @@ class FloatingIpTest(test.TestCase):
res = req.get_response(fakes.wsgi_app())
self.assertEqual(res.status_int, 200)
res_dict = json.loads(res.body)
- response = {'floating_ips': [{'floating_ip': {'instance_id': 11,
- 'ip': '10.10.10.10',
- 'fixed_ip': '10.0.0.1',
- 'id': 1}},
- {'floating_ip': {'instance_id': None,
- 'ip': '10.10.10.11',
- 'fixed_ip': None,
- 'id': 2}}]}
+ response = {'floating_ips': [{'instance_id': 11,
+ 'ip': '10.10.10.10',
+ 'fixed_ip': '10.0.0.1',
+ 'id': 1},
+ {'instance_id': None,
+ 'ip': '10.10.10.11',
+ 'fixed_ip': None,
+ 'id': 2}]}
self.assertEqual(res_dict, response)
def test_floating_ip_show(self):