moving to multi-plcs daily tests

[tests.git] / system / TestMapper.py

diff --git a/system/TestMapper.py b/system/TestMapper.py
index 13a0780..8b9e915 100644 (file)
--- a/system/TestMapper.py
+++ b/system/TestMapper.py
@@ -22,14 +22,21 @@ class TestMapper:
 
     @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 self.options.verbose:
-                print 'dbg: TestMapper/',type,'name=',name,'& pattern=',map_pattern
             if utils.match (name,map_pattern):
-                utils.header("TestMapper/%s : applying rules '%s' on %s"%(type,map_pattern,name))
+                if not self.options.quiet:
+                    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(':')
@@ -38,30 +45,25 @@ 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 not self.options.quiet:
+                                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 not self.options.quiet:
+                        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.find('%s')>=0:
                         v=v%obj[k]
-                    print("TestMapper, rewriting %s: %s into %s"%(name,k,v))
+                    if not self.options.quiet:
+                        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):
 
         plc_maps  = mapper.get('plc',[])