openstack/nova
Code Issues Proposed changes

fix for lp844364: fix check for fixed_ip association in os-floating-ips

Browse Source
This commit is contained in:
Anthony Young
2011-09-08 23:56:42 +00:00
committed by Tarmac
parent 67534d8978 fe355a10ad
commit 2446136426
2 changed files with 77 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/api/openstack/contrib/floating_ips.py
View File

@@ -107,7 +107,7 @@ class FloatingIPController(object):
context = req.environ['nova.context']
floating_ip = self.network_api.get_floating_ip(context, id)
if 'fixed_ip' in floating_ip:
if floating_ip.get('fixed_ip'):
self.network_api.disassociate_floating_ip(context,
floating_ip['address'])
@@ -161,7 +161,7 @@ class Floating_ips(extensions.ExtensionDescriptor):
raise webob.exc.HTTPBadRequest(explanation=msg)
floating_ip = self.network_api.get_floating_ip_by_ip(context, address)
if 'fixed_ip' in floating_ip:
if floating_ip.get('fixed_ip'):
self.network_api.disassociate_floating_ip(context, address)
return webob.Response(status_int=202)

78
nova/tests/api/openstack/contrib/test_floating_ips.py
View File

@@ -212,11 +212,45 @@ class FloatingIpTest(test.TestCase):
"fixed_ip": None}
self.assertEqual(ip, expected)
def test_floating_ip_release(self):
def test_floating_ip_release_associated(self):
self.disassociated = False
def get_floating_ip(ignore, context, id):
return {'id': 1, 'address': '10.10.10.10',
'fixed_ip': {'id': 1}}
def disassociate(ignore, context, floating_address):
self.disassociated = True
self.stubs.Set(network.api.API, "get_floating_ip",
get_floating_ip)
self.stubs.Set(network.api.API, "disassociate_floating_ip",
disassociate)
req = webob.Request.blank('/v1.1/123/os-floating-ips/1')
req.method = 'DELETE'
res = req.get_response(fakes.wsgi_app())
self.assertEqual(res.status_int, 202)
self.assertTrue(self.disassociated)
def test_floating_ip_release_disassociated(self):
self.disassociated = False
def fake_get_floating_ip(ignore, context, id):
return {'id': 1, 'address': '10.10.10.10',
'fixed_ip': None}
def fake_disassociate(ignore, context, floating_address):
self.disassociated = True
self.stubs.Set(network.api.API, "get_floating_ip",
fake_get_floating_ip)
self.stubs.Set(network.api.API, "disassociate_floating_ip",
fake_disassociate)
req = webob.Request.blank('/v1.1/123/os-floating-ips/1')
req.method = 'DELETE'
res = req.get_response(fakes.wsgi_app())
self.assertEqual(res.status_int, 202)
self.assertFalse(self.disassociated)
def test_add_floating_ip_to_instance(self):
self.stubs.Set(network.api.API, "associate_floating_ip",
@@ -289,8 +323,21 @@ class FloatingIpTest(test.TestCase):
self.assertEqual(resp.status_int, 202)
self.assertTrue(self.disassociated)
def test_remove_floating_ip_from_instance(self):
body = dict(removeFloatingIp=dict(address='11.0.0.1'))
def test_remove_associated_floating_ip_from_instance(self):
self.disassociated = False
def fake_get_floating_ip_by_ip(ignore, context, ip):
return {'id': 1, 'address': '10.10.10.10',
'fixed_ip': {'id': 1}}
def fake_disassociate(ignore, context, floating_address):
self.disassociated = True
self.stubs.Set(network.api.API, "get_floating_ip_by_ip",
fake_get_floating_ip_by_ip)
self.stubs.Set(network.api.API, "disassociate_floating_ip",
fake_disassociate)
body = dict(removeFloatingIp=dict(address='10.10.10.10'))
req = webob.Request.blank('/v1.1/123/servers/test_inst/action')
req.method = "POST"
req.body = json.dumps(body)
@@ -298,6 +345,31 @@ class FloatingIpTest(test.TestCase):
resp = req.get_response(fakes.wsgi_app())
self.assertEqual(resp.status_int, 202)
self.assertTrue(self.disassociated)
def test_remove_disassociated_floating_ip_from_instance(self):
self.disassociated = False
def fake_get_floating_ip_by_ip(ignore, context, ip):
return {'id': 1, 'address': '10.10.10.10',
'fixed_ip': None}
def fake_disassociate(ignore, context, floating_address):
self.disassociated = True
self.stubs.Set(network.api.API, "get_floating_ip_by_ip",
fake_get_floating_ip_by_ip)
self.stubs.Set(network.api.API, "disassociate_floating_ip",
fake_disassociate)
body = dict(removeFloatingIp=dict(address='10.10.10.10'))
req = webob.Request.blank('/v1.1/123/servers/test_inst/action')
req.method = "POST"
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
resp = req.get_response(fakes.wsgi_app())
self.assertEqual(resp.status_int, 202)
self.assertFalse(self.disassociated)
def test_bad_address_param_in_remove_floating_ip(self):
body = dict(removeFloatingIp=dict(badparam='11.0.0.1'))