Merge from branch.

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index 304db42..e9ca6d6 100755 (executable)
--- a/nm.py
+++ b/nm.py
@@ -50,18 +50,21 @@ if os.path.exists(options.path):
 
 modules = []
 
-def GetSlivers(plc):
+def GetSlivers(plc, config):
     '''Run call backs defined in modules'''
     try: 
         logger.log("Syncing w/ PLC")
         data = plc.GetSlivers()
+        getPLCDefaults(data, config)
+        if (options.verbose): logger.log_slivers(data)
     except: 
         logger.log_exc()
         #  XXX So some modules can at least boostrap.
+        logger.log("nm:  Can't contact PLC to GetSlivers().  Continuing.")
         data = {}
-    logger.log_slivers(data)
-    # Set i2 ip list for nodes in I2 nodegroup.
-    try: net.GetSlivers(plc, 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
     for module in modules:
@@ -70,6 +73,22 @@ def GetSlivers(plc):
             callback(data)
         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['name']] = 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
+
+
 def run():
     try:
         if options.daemon: tools.daemon()
@@ -118,7 +137,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)