X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=36d121bc581f0208b88e6522fc2550c2b64ca782;hb=c1536d8a8913935cb9283592da225a13b94b7583;hp=d76e972ec37d93e549d497660810d81cf3e7817e;hpb=74cfe970f7a90821ef896888a0c8ff1c6d4d354a;p=nodemanager.git

diff --git a/nm.py b/nm.py
index d76e972..36d121b 100755
--- a/nm.py
+++ b/nm.py
@@ -1,4 +1,13 @@
 #!/usr/bin/python
+
+#
+# Useful information can be found at https://svn.planet-lab.org/wiki/NodeManager
+#
+
+# Faiyaz Ahmed <faiyaza at cs dot princeton dot edu>
+# Copyright (C) 2008 The Trustees of Princeton University
+
+
 """Node Manager"""
 
 import optparse
@@ -20,6 +29,8 @@ import net
 id="$Id$"
 savedargv = sys.argv[:]
 
+known_modules=['conf_files', 'sm', 'bwmon', 'vsys', 'codemux']
+
 parser = optparse.OptionParser()
 parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized')
 parser.add_option('-s', '--startup', action='store_true', dest='startup', default=False, help='run all sliver startup scripts')
@@ -28,13 +39,26 @@ 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('-m', '--module', action='store', dest='module', default='', help='run a single module among '+' '.join(known_modules))
 (options, args) = parser.parse_args()
 
+# Deal with plugins directory
+if os.path.exists(options.path):
+    sys.path.append(options.path)
+    known_modules += [i[:-3] for i in os.listdir(options.path) if i.endswith(".py") and (i[:-3] not in known_modules)]
+
 modules = []
 
 def GetSlivers(plc):
-    try: data = plc.GetSlivers()
-    except: logger.log_exc()
+    '''Run call backs defined in modules'''
+    try: 
+        logger.log("Syncing w/ PLC")
+        data = plc.GetSlivers()
+    except: 
+        logger.log_exc()
+        #  XXX So some modules can at least boostrap.
+        data = {}
     if (options.verbose):
         logger.log_slivers(data)
     # Set i2 ip list for nodes in I2 nodegroup.
@@ -67,7 +91,13 @@ def run():
             print "Warning while writing PID file:", err
 
         # Load and start modules
-        for module in ['proper', 'conf_files', 'sm', 'bwmon']:
+        if options.module:
+            assert options.module in known_modules
+            running_modules=[options.module]
+            logger.verbose('Running single module %s'%options.module)
+        else:
+            running_modules=known_modules
+        for module in running_modules:
             try:
                 m = __import__(module)
                 m.start(options, config)