X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fomf_resctl.py;h=4fd2e8e77ac7f6f9c02e0239db69fd7254a8f758;hb=08d6f2b70b86a10b222a5afe80945598296196ad;hp=1401bc809fa341fce9fa398c20cde64bdcf16c64;hpb=342c63a2acd2acfb5876b872cea47f152ca5f12e;p=nodemanager.git

diff --git a/plugins/omf_resctl.py b/plugins/omf_resctl.py
index 1401bc8..4fd2e8e 100644
--- a/plugins/omf_resctl.py
+++ b/plugins/omf_resctl.py
@@ -5,24 +5,23 @@
 # NodeManager plugin - first step of handling omf_controlled slices
 
 """
-Overwrites the 'resctl' tag of slivers controlled by OMF so sm.py does the right thing
+Overwrites the 'resctl' tag of slivers controlled by OMF so slivermanager.py does the right thing
 """
 
+import os
+import glob
 import subprocess
 
 import tools
 import logger
 
-priority = 11
+priority = 50
 
-### xxx this should not be version-dependent
-service_name='omf-resctl-5.3'
-
-def start(options, conf):
+def start():
     logger.log("omf_resctl: plugin starting up...")
 
 def GetSlivers(data, conf = None, plc = None):
-    if 'accounts' not in data: 
+    if 'accounts' not in data:
         logger.log_missing_data("omf_resctl.GetSlivers",'accounts')
         return
 
@@ -33,25 +32,44 @@ 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'
+
     for sliver in data['slivers']:
         name=sliver['name']
         for chunk in sliver['attributes']:
             if chunk['tagname']=='omf_control':
-                # filenames
-                yaml="/vservers/%s/etc/omf-resctl/omf-resctl.yaml"%name
-                template="%s.in"%yaml
-                # read template and replace
-                template=file(template).read()
-                yaml_contents=template\
-                    .replace('@XMPP_SERVER@',xmpp_server)\
-                    .replace('@NODE_HRN@','default')\
-                    .replace('@SLICE_NAME@',name)
-                changes=tools.replace_file_with_string(yaml,yaml_contents)
-                if changes:
-                    sp=subprocess.Popen(['vserver',name,'exec','service',service_name,'restart'],
-                                        stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
-                    (output,retcod)=sp.communicate()
-                    logger.log("omf_resctl: %s: restarted resource controller (retcod=%r)"%(name,retcod))
-                    logger.log("omf_resctl: got output\n%s"%output)
-                else:
-                    logger.log("omf_resctl: %s: omf_control'ed sliver has no change" % name)
+                # scan all versions of omf-resctl
+                etc_path="/vservers/%s/etc/"%name
+                pattern = etc_path + "omf-resctl-*/omf-resctl.yaml.in"
+                templates = glob.glob (pattern)
+                if not templates:
+                    logger.log("WARNING: omf_resctl plugin, no template found for slice %s using pattern %s"\
+                                   %(name,pattern))
+                    continue
+                for template in templates:
+                    # remove the .in extension
+                    yaml=template[:-3]
+                    # figure service name as subdir under etc/
+                    service_name=os.path.split(template.replace(etc_path,''))[0]
+                    # read template and replace
+                    template_contents=file(template).read()
+                    yaml_contents=template_contents\
+                        .replace('@XMPP_SERVER@',xmpp_server)\
+                        .replace('@NODE_HRN@',node_hrn)\
+                        .replace('@SLICE_NAME@',name)
+                    changes=tools.replace_file_with_string(yaml,yaml_contents)
+                    if changes:
+                        sp=subprocess.Popen(['vserver',name,'exec','service',service_name,'restart'],
+                                            stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
+                        (output,retcod)=sp.communicate()
+                        logger.log("omf_resctl: %s: restarted resource controller (retcod=%r)"%(name,retcod))
+                        logger.log("omf_resctl: got output\n%s"%output)
+                    else:
+                        logger.log("omf_resctl: %s: omf_control'ed sliver has no change" % name)