Merge lp:~vishvananda/nova/lp720393 into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Makes FlatDHCPManager clean up old fixed_ips like VlanManager.

[Devin Carlen (devcamcar)]

So what calls periodic_tasks?

review: Needs Information

[Soren Hansen (soren)]

Devin, nova.service.Service() sets up a LoopingCall that calls the manager's periodic_tasks method every FLAGS.periodic_interval seconds.

[Soren Hansen (soren)]

I don't like that we have the exact same code in two places (the exact same code is in VlanManager's periodic_tasks).

Maybe you could make it a module level function or move it into the NetworkManager class and make it conditional on a "needs_dhcp_cleanup" class variable that is set appropriately for the various managers?

[Soren Hansen (soren)]

review: Needs Fixing

[Vish Ishaya (vishvananda)]

Soren: good point. I used timeout_fixed_ips as the flag.

[Vish Ishaya (vishvananda)]

oops, had an extra copy of periodic_tasks. Deleted.

[lp:~vishvananda/nova/lp720393]

688. By Vish Ishaya on 2011-02-17

remove leftover periodic tasks

[Soren Hansen (soren)]

Lovely! lgtm

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-02-17 21:47:02 +0000
+++ nova/network/manager.py	2011-02-17 22:54:16 +0000
@@ -110,6 +110,7 @@
 
     This class must be subclassed to support specific topologies.
     """
+    timeout_fixed_ips = True
 
     def __init__(self, network_driver=None, *args, **kwargs):
         if not network_driver:
@@ -138,6 +139,19 @@
                 self.driver.ensure_floating_forward(floating_ip['address'],
                                                     fixed_address)
 
+    def periodic_tasks(self, context=None):
+        """Tasks to be run at a periodic interval."""
+        super(NetworkManager, self).periodic_tasks(context)
+        if self.timeout_fixed_ips:
+            now = utils.utcnow()
+            timeout = FLAGS.fixed_ip_disassociate_timeout
+            time = now - datetime.timedelta(seconds=timeout)
+            num = self.db.fixed_ip_disassociate_all_by_timeout(context,
+                                                               self.host,
+                                                               time)
+            if num:
+                LOG.debug(_("Dissassociated %s stale fixed ip(s)"), num)
+
     def set_network_host(self, context, network_id):
         """Safely sets the host of the network."""
         LOG.debug(_("setting network host"), context=context)
@@ -306,6 +320,7 @@
     not do any setup in this mode, it must be done manually.  Requests to
     169.254.169.254 port 80 will need to be forwarded to the api server.
     """
+    timeout_fixed_ips = False
 
     def allocate_fixed_ip(self, context, instance_id, *args, **kwargs):
         """Gets a fixed ip from the pool."""
@@ -457,18 +472,6 @@
     instances in its subnet.
     """
 
-    def periodic_tasks(self, context=None):
-        """Tasks to be run at a periodic interval."""
-        super(VlanManager, self).periodic_tasks(context)
-        now = datetime.datetime.utcnow()
-        timeout = FLAGS.fixed_ip_disassociate_timeout
-        time = now - datetime.timedelta(seconds=timeout)
-        num = self.db.fixed_ip_disassociate_all_by_timeout(context,
-                                                           self.host,
-                                                           time)
-        if num:
-            LOG.debug(_("Dissassociated %s stale fixed ip(s)"), num)
-
     def init_host(self):
         """Do any initialization that needs to be run if this is a
         standalone service.