openstack/nova
Code Issues Proposed changes

Adds missing assertion to FloatingIP tests

Browse Source 
Adding assertions to some tests to ensure that we catch the
return status_int. Found that test_floating_ip_disassociate would
actually fail the test if status_int was caught. Adding the
get_instance_by_floating_ip_addr stub to to the disassociate test
to return the test instance on IP match. This is required because
get_instance_by_floating_ip_addr is stubbed in setup to return None.
Fixes bug 1039432.

Also making a minor change in test_bad_param_in_remove_floating_ip
which should call _remove_floating_ip rather than _add_floating_ip.

Change-Id: Id43f785bb0e6b7405e2d292292c4126d7ed656cb
This commit is contained in:
Sulochan Acharya
2012-08-21 11:53:04 -05:00
parent b090bdd088
commit 5dc0039c85
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nova/tests/api/openstack/compute/contrib/test_floating_ips.py
View File

@@ -304,13 +304,22 @@ class FloatingIpTest(test.TestCase):
body = dict(addFloatingIp=dict(address=self.floating_ip))
req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action')
self.manager._add_floating_ip(req, 'test_inst', body)
rsp = self.manager._add_floating_ip(req, 'test_inst', body)
self.assertTrue(rsp.status_int == 202)
def test_floating_ip_disassociate(self):
def get_instance_by_floating_ip_addr(self, context, address):
if address == '10.10.10.10':
return 'test_inst'
self.stubs.Set(network.api.API, "get_instance_id_by_floating_address",
get_instance_by_floating_ip_addr)
body = dict(removeFloatingIp=dict(address='10.10.10.10'))
req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action')
self.manager._remove_floating_ip(req, 'test_inst', body)
rsp = self.manager._remove_floating_ip(req, 'test_inst', body)
self.assertTrue(rsp.status_int == 202)
def test_floating_ip_disassociate_missing(self):
body = dict(removeFloatingIp=dict(address='10.10.10.10'))
@@ -326,7 +335,7 @@ class FloatingIpTest(test.TestCase):
req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action')
self.assertRaises(webob.exc.HTTPBadRequest,
self.manager._add_floating_ip, req, 'test_inst',
self.manager._remove_floating_ip, req, 'test_inst',
body)
def test_missing_dict_param_in_remove_floating_ip(self):