fixed broken slice-creation

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index 72fbd80..4a561da 100755 (executable)
--- a/nm.py
+++ b/nm.py
@@ -65,13 +65,19 @@ def GetSlivers(config, plc):
     '''Run call backs defined in modules'''
     try: 
         logger.log("Syncing w/ PLC")
+        # retrieve GetSlivers from PLC
         data = plc.GetSlivers()
+        # use the magic 'default' slice to retrieve system-wide defaults
+        getPLCDefaults(data, config)
+        # tweak the 'vref' attribute from GetSliceFamily
+        setSliversVref (data)
+        # always dump it for debug purposes
         # used to be done only in verbose; very helpful though, and tedious to obtain,
         # so let's dump this unconditionnally
         logger.log_slivers(data)
-        getPLCDefaults(data, config)
+        logger.verbose("Sync w/ PLC done (3)")
     except: 
-        logger.log_exc()
+        logger.log_exc("failed in nm.GetSlivers")
         #  XXX So some modules can at least boostrap.
         logger.log("nm:  Can't contact PLC to GetSlivers().  Continuing.")
         data = {}
@@ -80,7 +86,7 @@ def GetSlivers(config, plc):
         try:        
             callback = getattr(module, 'GetSlivers')
             callback(data, config, plc)
-        except: logger.log_exc()
+        except: logger.log_exc("nm.GetSlivers failed to run callback for module %r"%module)
 
 
 def getPLCDefaults(data, config):
@@ -91,12 +97,6 @@ def getPLCDefaults(data, config):
         if slice['name'] == config.PLC_SLICE_PREFIX+"_default":
             attr_dict = {}
             for attr in slice.get('attributes'): attr_dict[attr['tagname']] = attr['value'] 
-            # GetSlivers exposes the result of GetSliceFamily() as an separate key in data
-            # It is safe to override the attributes with this, as this method has the right logic
-            try:
-                attr_dict['vref']=slice.get('GetSliceFamily')
-            except:
-                pass
             if len(attr_dict):
                 logger.verbose("Found default slice overrides.\n %s" % attr_dict)
                 config.OVERRIDES = attr_dict
@@ -107,6 +107,24 @@ def getPLCDefaults(data, config):
     if 'OVERRIDES' in dir(config): del config.OVERRIDES
 
 
+def setSliversVref (data):
+    '''
+    Tweak the 'vref' attribute in all slivers based on the 'GetSliceFamily' key
+    '''
+    # GetSlivers exposes the result of GetSliceFamily() as an separate key in data
+    # It is safe to override the attributes with this, as this method has the right logic
+    for sliver in data.get('slivers'): 
+        try:
+            slicefamily=sliver.get('GetSliceFamily')
+            for att in sliver['attributes']:
+                if att['tagname']=='vref': 
+                    att['value']=slicefamily
+                    continue
+            sliver['attributes'].append({ 'tagname':'vref','value':slicefamily})
+        except:
+            logger.log_exc("Could not overwrite 'vref' attribute from 'GetSliceFamily'",name=sliver['name'])
+    
+
 def run():
     try:
         if options.daemon: tools.daemon()
@@ -157,9 +175,9 @@ def run():
         while plc.check_authentication() != True:
             try:
                 plc.update_session()
-                logger.log("Authentication Failure.  Retrying")
+                logger.log("Authentication Failure. Retrying")
             except:
-                logger.log("Retry Failed.  Waiting")
+                logger.log("Retry Failed. Waiting")
             time.sleep(iperiod)
         logger.log("Authentication Succeeded!")
 
@@ -171,11 +189,11 @@ def run():
             delay=iperiod + random.randrange(0,irandom)
             logger.verbose('mainloop - sleeping for %d s'%delay)
             time.sleep(delay)
-    except: logger.log_exc()
+    except: logger.log_exc("failed in nm.run")
 
 
 if __name__ == '__main__':
-    logger.log("Entering nm.py "+id)
+    logger.log("======================================== Entering nm.py "+id)
     run()
 else:
     # This is for debugging purposes.  Open a copy of Python and import nm