X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=c26290644c0a9a57ad7eeb3edfb45f3d06b4233b;hb=0ba47ab6fef533138f5a9c486ad9706800c25a0f;hp=3eaec87299d53daaf798dcee79da5e3a1de83c64;hpb=64d4adb26fce692ae87047632689abbf2ff9e128;p=nodemanager.git

diff --git a/nm.py b/nm.py
old mode 100644
new mode 100755
index 3eaec87..c262906
--- a/nm.py
+++ b/nm.py
@@ -1,5 +1,13 @@
 #!/usr/bin/python
-# Something relevant
+
+#
+# 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
@@ -16,10 +24,15 @@ import tools
 from config import Config
 from plcapi import PLCAPI 
 import random
-import net
 
+id="$Id$"
 savedargv = sys.argv[:]
 
+# 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')
 parser.add_option('-s', '--startup', action='store_true', dest='startup', default=False, help='run all sliver startup scripts')
@@ -28,25 +41,53 @@ 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=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()
 
+# 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()
-    if (options.verbose):
-        logger.log_slivers(data)
-    # Set i2 ip list for nodes in I2 nodegroup.
-    try: net.GetSlivers(plc, data)
-    except: logger.log_exc()
-    #  All other callback modules
+def GetSlivers(plc, config):
+    '''Run call backs defined in modules'''
+    try: 
+        logger.log("Syncing w/ PLC")
+        data = plc.GetSlivers()
+        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 = {}
+    #  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()
 
+
+def getPLCDefaults(data, config):
+    '''
+    Get PLC wide defaults from _default system slice.  Adds them to config class.
+    '''
+    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['tagname']] = attr['value'] 
+            if len(attr_dict):
+                logger.verbose("Found default slice overrides.\n %s" % attr_dict)
+                config.OVERRIDES = attr_dict
+        elif 'OVERRIDES' in dir(config): del config.OVERRIDES
+
+
 def run():
     try:
         if options.daemon: tools.daemon()
@@ -67,7 +108,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)
@@ -79,7 +126,7 @@ def run():
         if os.path.exists(options.session):
             session = file(options.session).read().strip()
         else:
-            session = options.session
+            session = None
 
         # Initialize XML-RPC client
         iperiod=int(options.period)
@@ -89,7 +136,7 @@ def run():
         while True:
         # Main NM Loop
             logger.verbose('mainloop - nm:getSlivers - period=%d random=%d'%(iperiod,irandom))
-            GetSlivers(plc)
+            GetSlivers(plc, config)
             delay=iperiod + random.randrange(0,irandom)
             logger.verbose('mainloop - sleeping for %d s'%delay)
             time.sleep(delay)
@@ -97,14 +144,7 @@ def run():
 
 
 if __name__ == '__main__':
-    logger.verbose("Entering nm.py")
-    stacklim = 512*1024  # 0.5 MiB
-    curlim = resource.getrlimit(resource.RLIMIT_STACK)[0]  # soft limit
-    if curlim > stacklim:
-        resource.setrlimit(resource.RLIMIT_STACK, (stacklim, stacklim))
-        # for some reason, doesn't take effect properly without the exec()
-        python = '/usr/bin/python'
-        os.execv(python, [python] + savedargv)
+    logger.log("Entering nm.py "+id)
     run()
 else:
     # This is for debugging purposes.  Open a copy of Python and import nm