Change local GetSlivers() callbacks to take args as (plc,data,config)

diff --git a/conf_files.py b/conf_files.py
index fc90da2..31c325c 100644 (file)
--- a/conf_files.py
+++ b/conf_files.py
@@ -86,7 +86,7 @@ class conf_files:
 
 def start(options, config): pass
 
 
 def start(options, config): pass
 

-def GetSlivers(data, plc = None, config = None):
+def GetSlivers(plc, data, config = None):

     logger.log("conf_files: Running.")
     cf = conf_files()
     cf.run_once(data)
     logger.log("conf_files: Running.")
     cf = conf_files()
     cf.run_once(data)

diff --git a/plugins/net.py b/plugins/net.py
index 30f44d8..7c9242d 100644 (file)
--- a/plugins/net.py
+++ b/plugins/net.py
@@ -16,7 +16,7 @@ import bwlimit, logger, iptables
 def start(options, conf):
     logger.log("net plugin starting up...")
 
 def start(options, conf):
     logger.log("net plugin starting up...")
 

-def GetSlivers(plc, data, conf):
+def GetSlivers(plc, data, config):

     logger.verbose("net:GetSlivers called.")
     InitInterfaces(plc, data) # writes sysconfig files.
     if 'OVERRIDES' in dir(config): 
     logger.verbose("net:GetSlivers called.")
     InitInterfaces(plc, data) # writes sysconfig files.
     if 'OVERRIDES' in dir(config): 

diff --git a/sm.py b/sm.py
index 5d5de69..62de7f9 100644 (file)
--- a/sm.py
+++ b/sm.py
@@ -54,7 +54,7 @@ DEFAULT_ALLOCATION = {
 start_requested = False  # set to True in order to request that all slivers be started
 
 @database.synchronized
 start_requested = False  # set to True in order to request that all slivers be started
 
 @database.synchronized

-def GetSlivers(data, plc = None, config = None, fullupdate=True):
+def GetSlivers(plc, data, config = None, fullupdate=True):

     """This function has two purposes.  One, convert GetSlivers() data
     into a more convenient format.  Two, even if no updates are coming
     in, use the GetSlivers() heartbeat as a cue to scan for expired
     """This function has two purposes.  One, convert GetSlivers() data
     into a more convenient format.  Two, even if no updates are coming
     in, use the GetSlivers() heartbeat as a cue to scan for expired