X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=83a78f2fa57d69971a2605bb1f0279a2b587fa2a;hb=fbe93c2f926828da8fa6fe491a391b0d98608bc6;hp=1dd1b67ad0140a0257f5088b509a484c7782ddda;hpb=658683174ea538f4cacdab54302882005e148b8f;p=nodemanager.git

diff --git a/nm.py b/nm.py
index 1dd1b67..83a78f2 100755
--- a/nm.py
+++ b/nm.py
@@ -24,7 +24,6 @@ import tools
 from config import Config
 from plcapi import PLCAPI 
 import random
-import net
 
 id="$Id$"
 savedargv = sys.argv[:]
@@ -62,15 +61,11 @@ def GetSlivers(plc, config):
         #  XXX So some modules can at least boostrap.
         logger.log("nm:  Can't contact PLC to GetSlivers().  Continuing.")
         data = {}
-    # Set i2 ip list for nodes in I2 nodegroup
-    # and init network interfaces (unless overridden)
-    try: net.GetSlivers(plc, data, config) # TODO - num of args needs to be unified across mods.
-    except: logger.log_exc()
-    #  All other callback modules
+    #  Invoke GetSlivers() functions from the callback modules
     for module in modules:
         try:        
             callback = getattr(module, 'GetSlivers')
-            callback(data, plc, config)
+            callback(plc, data, config)
         except: logger.log_exc()