FlatManager.init_host now inhibits call to method in superclass.

Floating IP methods have been redefined in FlatManager to raise NotImplementedError

1 files changed, 27 insertions, 0 deletions

diff --git a/nova/network/manager.py b/nova/network/manager.py
index c6eba225e..a7f263daa 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -322,6 +322,17 @@ class FlatManager(NetworkManager):
     """
     timeout_fixed_ips = False
 
+    def init_host(self):
+        """Do any initialization that needs to be run if this is a
+        standalone service.
+        """
+        #Fix for bug 723298 - do not call init_host on superclass
+        #Following code has been copied for NetworkManager.init_host
+        ctxt = context.get_admin_context()
+        for network in self.db.host_get_networks(ctxt, self.host):
+            self._on_set_network_host(ctxt, network['id'])
+
+
     def allocate_fixed_ip(self, context, instance_id, *args, **kwargs):
         """Gets a fixed ip from the pool."""
         # TODO(vish): when this is called by compute, we can associate compute
@@ -406,6 +417,22 @@ class FlatManager(NetworkManager):
         net['dns'] = FLAGS.flat_network_dns
         self.db.network_update(context, network_id, net)
 
+    def allocate_floating_ip(self, context, project_id):
+        #Fix for bug 723298
+        raise NotImplementedError()
+
+    def associate_floating_ip(self, context, floating_address, fixed_address):
+        #Fix for bug 723298
+        raise NotImplementedError()
+
+    def disassociate_floating_ip(self, context, floating_address):
+        #Fix for bug 723298
+        raise NotImplementedError()
+
+    def deallocate_floating_ip(self, context, floating_address):
+        #Fix for bug 723298
+        raise NotImplementedError()
+
 
 class FlatDHCPManager(FlatManager):
     """Flat networking with dhcp.