From c44ce398eacbd95331fb8990390a662cf4ce8f24 Mon Sep 17 00:00:00 2001 From: Dongdong Zhou Date: Mon, 3 Sep 2012 21:44:36 +0100 Subject: Allow admins to de-allocate any floating IPs Fix bug 1045508 Change-Id: Ie5be3748c16a592209934cc85777f534e84842bc --- nova/tests/network/test_manager.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index bfe8d7a3b..31b600b16 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -581,6 +581,19 @@ class VlanNetworkTestCase(test.TestCase): 'project_id': ctxt.project_id} self.network._floating_ip_owned_by_project(ctxt, floating_ip) + ctxt = context.RequestContext(None, None, + is_admin=True) + + # does not raise (ctxt is admin) + floating_ip = {'address': '10.0.0.1', + 'project_id': None} + self.network._floating_ip_owned_by_project(ctxt, floating_ip) + + # does not raise (ctxt is admin) + floating_ip = {'address': '10.0.0.1', + 'project_id': 'testproject'} + self.network._floating_ip_owned_by_project(ctxt, floating_ip) + def test_allocate_floating_ip(self): ctxt = context.RequestContext('testuser', 'testproject', is_admin=False) -- cgit