(*) the various modules have a priority; lower gets invoked first

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index 4a561da..7236cc8 100755 (executable)
--- a/nm.py
+++ b/nm.py
@@ -19,6 +19,7 @@ import socket
 import os
 import sys
 import resource
+import glob
 
 import logger
 import tools
@@ -31,6 +32,7 @@ id="$Id$"
 savedargv = sys.argv[:]
 
 # NOTE: modules listed here should also be loaded in this order
+# see the priority set in each module - lower comes first
 known_modules=['net','conf_files', 'sm', 'bwmon']
 
 plugin_path = "/usr/share/NodeManager/plugins"
@@ -57,14 +59,15 @@ parser.add_option('-m', '--module', action='store', dest='module', default='', h
 # 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)]
+    plugins = [ os.path.split(os.path.splitext(x)[0])[1] for x in glob.glob( os.path.join(options.path,'*.py') ) ]
+    known_modules += plugins
 
 modules = []
 
 def GetSlivers(config, plc):
     '''Run call backs defined in modules'''
     try: 
-        logger.log("Syncing w/ PLC")
+        logger.log("nm: Syncing w/ PLC")
         # retrieve GetSlivers from PLC
         data = plc.GetSlivers()
         # use the magic 'default' slice to retrieve system-wide defaults
@@ -75,18 +78,20 @@ def GetSlivers(config, plc):
         # used to be done only in verbose; very helpful though, and tedious to obtain,
         # so let's dump this unconditionnally
         logger.log_slivers(data)
-        logger.verbose("Sync w/ PLC done (3)")
+        logger.verbose("nm: Sync w/ PLC done")
     except: 
-        logger.log_exc("failed in nm.GetSlivers")
+        logger.log_exc("nm: failed in GetSlivers")
         #  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:
+#        logger.log('trigerring GetSlivers callback for module %s'%module.__name__)
         try:        
             callback = getattr(module, 'GetSlivers')
             callback(data, config, plc)
-        except: logger.log_exc("nm.GetSlivers failed to run callback for module %r"%module)
+        except: 
+            logger.log_exc("nm: GetSlivers failed to run callback for module %r"%module)
 
 
 def getPLCDefaults(data, config):
@@ -98,7 +103,7 @@ def getPLCDefaults(data, config):
             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)
+                logger.verbose("nm: Found default slice overrides.\n %s" % attr_dict)
                 config.OVERRIDES = attr_dict
                 return
     # NOTE: if an _default slice existed, it would have been found above and
@@ -122,7 +127,7 @@ def setSliversVref (data):
                     continue
             sliver['attributes'].append({ 'tagname':'vref','value':slicefamily})
         except:
-            logger.log_exc("Could not overwrite 'vref' attribute from 'GetSliceFamily'",name=sliver['name'])
+            logger.log_exc("nm: Could not overwrite 'vref' attribute from 'GetSliceFamily'",name=sliver['name'])
     
 
 def run():
@@ -148,7 +153,7 @@ def run():
         if options.module:
             assert options.module in known_modules
             running_modules=[options.module]
-            logger.verbose('Running single module %s'%options.module)
+            logger.verbose('nm: Running single module %s'%options.module)
         else:
             running_modules=known_modules
         for module in running_modules:
@@ -159,6 +164,15 @@ def run():
             except ImportError, err:
                 print "Warning while loading module %s:" % module, err
 
+        default_priority=100
+        # sort on priority (lower first)
+        def sort_module_priority (m1,m2):
+            return getattr(m1,'priority',default_priority) - getattr(m2,'priority',default_priority)
+        modules.sort(sort_module_priority)
+
+        logger.verbose('modules priorities and order:')
+        for module in modules: logger.verbose ('%s: %s'%(getattr(module,'priority',default_priority),module.__name__))
+
         # Load /etc/planetlab/session
         if os.path.exists(options.session):
             session = file(options.session).read().strip()
@@ -171,25 +185,25 @@ def run():
         plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2)
 
         #check auth
-        logger.log("Checking Auth.")
+        logger.log("nm: Checking Auth.")
         while plc.check_authentication() != True:
             try:
                 plc.update_session()
-                logger.log("Authentication Failure. Retrying")
+                logger.log("nm: Authentication Failure. Retrying")
             except:
-                logger.log("Retry Failed. Waiting")
+                logger.log("nm: Retry Failed. Waiting")
             time.sleep(iperiod)
-        logger.log("Authentication Succeeded!")
+        logger.log("nm: Authentication Succeeded!")
 
 
         while True:
         # Main NM Loop
-            logger.verbose('mainloop - nm:getSlivers - period=%d random=%d'%(iperiod,irandom))
+            logger.verbose('nm: mainloop - calling GetSlivers - period=%d random=%d'%(iperiod,irandom))
             GetSlivers(config, plc)
             delay=iperiod + random.randrange(0,irandom)
-            logger.verbose('mainloop - sleeping for %d s'%delay)
+            logger.verbose('nm: mainloop - sleeping for %d s'%delay)
             time.sleep(delay)
-    except: logger.log_exc("failed in nm.run")
+    except: logger.log_exc("nm: failed in run")
 
 
 if __name__ == '__main__':