Merge database from trunk. Runs ensure created on every account type.

Fix bug in net where if no overrides, HTBs are never setup.

diff --git a/database.py b/database.py
index 92c5ef4..7e75d55 100644 (file)
--- a/database.py
+++ b/database.py
@@ -103,10 +103,18 @@ class Database(dict):
             logger.verbose("database:sync : loop on %s"%name)
             if name not in self: accounts.get(name).ensure_destroyed()
         for name, rec in self.iteritems():
-            if rec['instantiation'] == 'plc-instantiated': accounts.get(name).ensure_created(rec)
-            if rec['instantiation'] == 'nm-controller': accounts.get(name).ensure_created(rec)
-
-               # Wake up bwmom to update limits.
+            slivr = accounts.get(name)
+            logger.verbose("database:sync : %s is %s" %(name,slivr._get_class()))
+            # Make sure we refresh accounts that are running
+            if rec['instantiation'] == 'plc-instantiated': slivr.ensure_created(rec)
+            elif rec['instantiation'] == 'nm-controller': slivr.ensure_created(rec)
+            # Back door to ensure PLC overrides Ticket in delegation.
+            elif rec['instantiation'] == 'delegated' and slivr._get_class() != None:
+                # if the ticket has been delivered and the nm-contoroller started the slice
+                # update rspecs and keep them up to date.
+                if slivr.is_running(): slivr.ensure_created(rec)
+
+        # Wake up bwmom to update limits.
         bwmon.lock.set()
         global dump_requested
         dump_requested = True

diff --git a/net.py b/net.py
index d2cc7ed..606527c 100644 (file)
--- a/net.py
+++ b/net.py
@@ -14,16 +14,16 @@ import sioc, plnet
 import bwlimit, logger, iptables
 
 def GetSlivers(plc, data, config):
-    InitInterfaces(plc, data)
-    if 'OVERRIDES' in dir(config):
-        if config.OVERRIDES.get('net_max_rate') != -1:
-            InitNodeLimit(data)
-            InitI2(plc, data)
-        else:
-            logger.log("Slice and node BW Limits disabled.")
-            if len(bwlimit.get()): 
-                logger.verbose("*** DISABLING NODE BW LIMITS ***")
-                bwlimit.stop()
+    InitInterfaces(plc, data) # writes sysconfig files.
+    if ('OVERRIDES' in dir(config)) and (config.OVERRIDESget('net_max_rate') == -1):
+        logger.log("Slice and node BW Limits disabled.")
+        if len(bwlimit.get()): 
+            logger.verbose("*** DISABLING NODE BW LIMITS ***")
+            bwlimit.stop()
+    else:
+        InitNodeLimit(data)
+        InitI2(plc, data)
+        
     InitNAT(plc, data)
 
 def InitNodeLimit(data):