X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=e7d3fd3155646c7b55cbdad577b0c385da92de82;hb=c3c0dfb34018f3950b76e9644dfd69026d033b38;hp=05eaee7c4159d81485560554b9e28cf34da1617c;hpb=bff98752ba3aa13c0fb61874b5d444a84d5291d6;p=nodemanager.git

diff --git a/nm.py b/nm.py
index 05eaee7..e7d3fd3 100755
--- a/nm.py
+++ b/nm.py
@@ -24,12 +24,14 @@ import tools
 from config import Config
 from plcapi import PLCAPI 
 import random
-import net
 
 id="$Id$"
 savedargv = sys.argv[:]
 
-known_modules=['conf_files', 'sm', 'bwmon', 'vsys', 'codemux']
+# NOTE: modules listed here should also be loaded in this order
+known_modules=['net','conf_files', 'sm', 'bwmon']
+
+plugin_path = "/usr/share/NodeManager/plugins"
 
 parser = optparse.OptionParser()
 parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized')
@@ -39,7 +41,9 @@ parser.add_option('-k', '--session', action='store', dest='session', default='/e
 parser.add_option('-p', '--period', action='store', dest='period', default=600, help='Polling interval (sec)')
 parser.add_option('-r', '--random', action='store', dest='random', default=301, help='Range for additional random polling interval (sec)')
 parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, help='more verbose log')
-parser.add_option('-P', '--path', action='store', dest='path', default='/usr/share/NodeManager/plugins', help='Path to plugins directory')
+parser.add_option('-P', '--path', action='store', dest='path', default=plugin_path, help='Path to plugins directory')
+
+# NOTE: BUG the 'help' for this parser.add_option() wont list plugins from the --path argument
 parser.add_option('-m', '--module', action='store', dest='module', default='', help='run a single module among '+' '.join(known_modules))
 (options, args) = parser.parse_args()
 
@@ -55,22 +59,18 @@ def GetSlivers(plc, config):
     try: 
         logger.log("Syncing w/ PLC")
         data = plc.GetSlivers()
-        getPLCDefaults(data, config)
         if (options.verbose): logger.log_slivers(data)
+        getPLCDefaults(data, config)
     except: 
         logger.log_exc()
         #  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)
+            callback(plc, data, config)
         except: logger.log_exc()
 
 
@@ -81,12 +81,12 @@ def getPLCDefaults(data, config):
     for slice in data.get('slivers'): 
         if slice['name'] == config.PLC_SLICE_PREFIX+"_default":
             attr_dict = {}
-            for attr in slice.get('attributes'): attr_dict[attr['name']] = attr['value'] 
+            for attr in slice.get('attributes'): attr_dict[attr['tagname']] = attr['value'] 
             if len(attr_dict):
                 logger.verbose("Found default slice overrides.\n %s" % attr_dict)
                 config.OVERRIDES = attr_dict
             return 
-    if 'OVERRIDES' in dir(config): del config.OVERRIDES
+    if 'OVERRIDES' not in dir(config): del config.OVERRIDES
 
 
 def run():