From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 22 Mar 2010 13:13:54 +0000 (+0000)
Subject: hrn might be empty during transition period
X-Git-Tag: NodeManager-2.0-4~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=f18f7cd6e1e79a1f30f49e5802820eca6fb16c1d;p=nodemanager.git

hrn might be empty during transition period
---

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index b8b5e16..bd09c05 100644
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -32,8 +32,12 @@ def GetSlivers(data, conf = None, plc = None):
         # xxx might need to clean up more deeply..
         return
 
+    # as hrn is set only at AddNode-time, upgraded myplcs might still miss this
+    # clue: just overwrite the hostname of all nodes
+    # for node in GetNodes(): UpdateNode(node['node_id'],{'hostname':node['hostname']})
     try:
         node_hrn = data['hrn']
+        if not hrn: raise Exception,"Empty hrn"
     except:
         node_hrn='default   # Failed to read hrn from GetSlivers, please upgrade PLCAPI'