From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 12 Mar 2010 10:19:48 +0000 (+0000)
Subject: expose node hrn to the OMF resource controller
X-Git-Tag: NodeManager-2.0-3~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b1bba589701e2c1260b817f38a3fcdd33a6731fe;p=nodemanager.git

expose node hrn to the OMF resource controller
---

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index 406be09..b8b5e16 100644
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -32,6 +32,11 @@ def GetSlivers(data, conf = None, plc = None):
         # xxx might need to clean up more deeply..
         return
 
+    try:
+        node_hrn = data['hrn']
+    except:
+        node_hrn='default   # Failed to read hrn from GetSlivers, please upgrade PLCAPI'
+
     for sliver in data['slivers']:
         name=sliver['name']
         for chunk in sliver['attributes']:
@@ -53,7 +58,7 @@ def GetSlivers(data, conf = None, plc = None):
                     template_contents=file(template).read()
                     yaml_contents=template_contents\
                         .replace('@XMPP_SERVER@',xmpp_server)\
-                        .replace('@NODE_HRN@','default # xxx todo in omf-resctl nm plugin')\
+                        .replace('@NODE_HRN@',node_hrn)\
                         .replace('@SLICE_NAME@',name)
                     changes=tools.replace_file_with_string(yaml,yaml_contents)
                     if changes: