X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestMapper.py;h=7d0547f3e40c72891049ca2487d284eeecca803d;hb=a716dcc59fce208b11b575e3c29651181633adfb;hp=87ec6c481c36587b4572aeafbb3fb4881fb03f0c;hpb=2f5a9f05d3d581c1c5ebe75f1d4e55ef2c5d44d1;p=tests.git

diff --git a/system/TestMapper.py b/system/TestMapper.py
index 87ec6c4..7d0547f 100644
--- a/system/TestMapper.py
+++ b/system/TestMapper.py
@@ -1,14 +1,14 @@
 #
-# Thierry Parmentelat - INRIA Sophia Antipolis 
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 #
 # mapper class
 # 
 # this works on a spec as defined in a config file
-# and allows to remap various fields, typically to another testbox 
-# see an example in config_onelab_testbox32.py
+# and allows to remap various fields on the local substrate
 # 
 
-import re
 import utils
 
 class TestMapper:
@@ -17,23 +17,27 @@ class TestMapper:
         self.plcs=plcs
         self.options=options
 
-    @staticmethod
-    def match (name,key):
-        key=key.replace("*",".*")
-        return re.compile(key).match(name)
-
     @staticmethod
     def plc_name (plc):
         return plc['name']
 
     @staticmethod
     def node_name (node):
-        return node['node_fields']['hostname']
+        return node['name']
+
+    def node_names (self):
+        result=[]
+        for plc in self.plcs:
+            for site in plc['sites']:
+                for node in site['nodes']:
+                    result.append(node['name'])
+        return result
 
     def apply_first_map (self, type, name, obj, maplist):
         for (map_pattern,rename_dict) in maplist:
-            if TestMapper.match (name,map_pattern):
-                utils.header("TestMapper/%s : applying match key %s on plc %s"%(type,map_pattern,name))
+            if utils.match (name,map_pattern):
+                if self.options.verbose:
+                    utils.header("TestMapper/%s : applying rules '%s' on %s"%(type,map_pattern,name))
                 for (k,v) in rename_dict.iteritems():
                     # apply : separator
                     path=k.split(':')
@@ -42,41 +46,32 @@ class TestMapper:
                     for step in path[:-1]:
                         if not o.has_key(step):
                             o[step]={}
-                            utils.header ("WARNING : created step %s in path %s on %s %s"%(
-                                    step,path,type,name))
+                            if self.options.verbose:
+                                utils.header ("WARNING : created step %s in path %s on %s %s"%(
+                                        step,path,type,name))
                         o=o[step]
                     # last step is the one for side-effect
                     step=path[-1]
-                    if not o.has_key(step):
-                        utils.header ("WARNING : inserting key %s for path %s on %s %s"%(
-                                step,path,type,name))
+                    if self.options.verbose:
+                        if not o.has_key(step):
+                            utils.header ("WARNING : inserting key %s for path %s on %s %s"%(
+                                    step,path,type,name))
                     # apply formatting if '%s' found in the value
+                    if v is None:
+                        if self.options.verbose: print "TestMapper WARNING - None value - ignored, key=",k
+                        continue
                     if v.find('%s')>=0:
                         v=v%obj[k]
                     if self.options.verbose:
-                        utils.header("mapping %s->%s towards %s"%(name,k,v))
+                        print("TestMapper, rewriting %s: %s into %s"%(name,k,v))
                     o[step]=v
                 # only apply first rule
                 return
 
-    def node_names (self):
-        result=[]
-        for plc in self.plcs:
-            for site in plc['sites']:
-                for node in site['nodes']:
-                    result.append(node['node_fields']['hostname'])
-        return result
-
     def map (self,mapper):
 
-        try:
-            plc_maps = mapper['plc']
-        except:
-            plc_maps = []
-        try:
-            node_maps = mapper['node']
-        except:
-            node_maps = []
+        plc_maps  = mapper.get('plc',[])
+        node_maps = mapper.get('node',[])
 
         for plc in self.plcs:
             name=TestMapper.plc_name(plc)