From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Tue, 26 May 2009 18:46:00 +0000 (+0000)
Subject: attributes are now tagnames.  Also move debugging output to statements before places... 
X-Git-Tag: NodeManager-1.8-8~25
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2db2c3cc4c3fb52894fc18ea87cbe84f686af717;p=nodemanager.git

attributes are now tagnames.  Also move debugging output to statements before places where data is used.
---

diff --git a/nm.py b/nm.py
index 05eaee7..2c05d20 100755
--- a/nm.py
+++ b/nm.py
@@ -55,8 +55,8 @@ def GetSlivers(plc, config):
     try: 
         logger.log("Syncing w/ PLC")
         data = plc.GetSlivers()
-        getPLCDefaults(data, config)
         if (options.verbose): logger.log_slivers(data)
+        getPLCDefaults(data, config)
     except: 
         logger.log_exc()
         #  XXX So some modules can at least boostrap.
@@ -81,7 +81,7 @@ def getPLCDefaults(data, config):
     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'] 
+            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