Merge "Stub additional FloatingIP methods in FlatManager"

2 files changed, 48 insertions, 0 deletions

diff --git a/nova/network/manager.py b/nova/network/manager.py
index 8b27c50db..22b04c40f 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -1492,6 +1492,37 @@ class FlatManager(NetworkManager):
         #             we major version the network_rpcapi to 2.0.
         return []
 
+    @network_api.wrap_check_policy
+    def allocate_floating_ip(self, context, project_id, pool):
+        """Gets a floating ip from the pool."""
+        return None
+
+    @network_api.wrap_check_policy
+    def deallocate_floating_ip(self, context, address,
+                               affect_auto_assigned):
+        """Returns a floating ip to the pool."""
+        return None
+
+    @network_api.wrap_check_policy
+    def associate_floating_ip(self, context, floating_address, fixed_address,
+                              affect_auto_assigned=False):
+        """Associates a floating ip with a fixed ip.
+
+        Makes sure everything makes sense then calls _associate_floating_ip,
+        rpc'ing to correct host if i'm not it.
+        """
+        return None
+
+    @network_api.wrap_check_policy
+    def disassociate_floating_ip(self, context, address,
+                                 affect_auto_assigned=False):
+        """Disassociates a floating ip from its fixed ip.
+
+        Makes sure everything makes sense then calls _disassociate_floating_ip,
+        rpc'ing to correct host if i'm not it.
+        """
+        return None
+
     def migrate_instance_start(self, context, instance_uuid,
                                floating_addresses,
                                rxtx_factor=None, project_id=None,
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py
index fba565fc3..4344aa07b 100644
--- a/nova/tests/network/test_manager.py
+++ b/nova/tests/network/test_manager.py
@@ -456,6 +456,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):