From 5640dab952b13a4ff7864a74d103e3d14b736b9e Mon Sep 17 00:00:00 2001 From: Frederic Lepied Date: Mon, 28 Jan 2013 22:16:54 +0100 Subject: Stub additional FloatingIP methods in FlatManager Fixes bug #989746. Added some stub methods for floating ip allocation in FlatManager in order to prevent exceptions from being raised when they are called. Changed get_floating_ip_by_address() in FlatManager to return a dict with expected keys for a floating ip, rather than None. Updated patch from Andrew Laski and added unit tests. Change-Id: I4ee1f5cf986b6f3411605aae5c1bc4e8cc2377b1 --- nova/tests/network/test_manager.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index 3728dd2e0..2068f9c00 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -442,6 +442,23 @@ class FlatNetworkTestCase(test.TestCase): self.assertEqual(len(addresses), 1) self.assertEqual(addresses[0], fixedip) + def test_allocate_floating_ip(self): + self.assertEqual(self.network.allocate_floating_ip(self.context, + 1, None), None) + + def test_deallocate_floating_ip(self): + self.assertEqual(self.network.deallocate_floating_ip(self.context, + 1, None), None) + + def test_associate_floating_ip(self): + self.assertEqual(self.network.associate_floating_ip(self.context, + None, None), None) + + def test_disassociate_floating_ip(self): + self.assertEqual(self.network.disassociate_floating_ip(self.context, + None, None), + None) + class VlanNetworkTestCase(test.TestCase): def setUp(self): -- cgit