X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=e7d3fd3155646c7b55cbdad577b0c385da92de82;hb=b35bc5add66563dd7f7b3bf139c1a13c5d7803a4;hp=83a78f2fa57d69971a2605bb1f0279a2b587fa2a;hpb=b994d0a94352d9c4f3fc430c317f7a37dd3414d4;p=nodemanager.git

diff --git a/nm.py b/nm.py
index 83a78f2..e7d3fd3 100755
--- a/nm.py
+++ b/nm.py
@@ -28,7 +28,10 @@ import random
 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')
@@ -38,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()
 
@@ -81,7 +86,7 @@ def getPLCDefaults(data, config):
                 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():