X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=5615095bb2b0e880a25f21d3c4c774fdbf71a0d4;hb=14f127cec6f64a00ba8c07087196cec4a39ddd27;hp=e6f57841e888a1dc4666f3a13e98d12350a7f049;hpb=83f8fd155b547ee4556d678c95d603ea5c993ffe;p=tests.git

diff --git a/system/TestNode.py b/system/TestNode.py
index e6f5784..5615095 100644
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -78,21 +78,20 @@ class TestNode:
         # populate network interfaces - others
         if self.node_spec.has_key('extra_interfaces'):
             for interface in self.node_spec['extra_interfaces']:
-                server.AddInterface(userauth,self.name(),
-                                                    interface['interface_fields'])
+                server.AddInterface(userauth,self.name(), interface['interface_fields'])
                 if interface.has_key('settings'):
                     for (attribute,value) in interface['settings'].iteritems():
                         # locate node network
-                        nn = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0]
-                        nnid=nn['interface_id']
+                        interface = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0]
+                        interface_id=interface['interface_id']
                         # locate or create node network attribute type
                         try:
-                            nnst = server.GetTagTypes(userauth,{'name':attribute})[0]
+                            interface_tagtype = server.GetTagTypes(userauth,{'name':attribute})[0]
                         except:
-                            nnst = server.AddTagType(rootauth,{'category':'test',
-                                                               'tagname':attribute})
+                            interface_tagtype = server.AddTagType(rootauth,{'category':'test',
+                                                                            'tagname':attribute})
                         # attach value
-                        server.AddInterfaceSetting(userauth,nnid,attribute,value)
+                        server.AddInterfaceTag(userauth,interface_id,attribute,value)
 
     def delete_node (self):
         # uses the right auth as far as poss.
@@ -197,7 +196,7 @@ class TestNode:
         #Prepare the log file before killing the nodes
         test_box = self.test_box()
         # kill the right processes 
-        utils.header("Stopping qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
+        utils.header("Stopping qemu for node %s on box %s"%(self.name(),self.test_box().hostname()))
         command="%s/qemu-kill-node %s"%(self.nodedir(),self.name())
         self.test_box().run_in_buildname(command)
         return True
@@ -232,12 +231,16 @@ class TestNode:
 
     def check_sanity_script (self,local_script):
         # push the script on the node's root context
+        script_name=os.path.basename(local_script)
+        utils.header ("NODE %s : running sanity check script %s"%(self.name(),script_name))
         ssh_handle=self.create_test_ssh()
         ssh_handle.copy_home(local_script)
-        script_name=os.path.basename(local_script)
         if ssh_handle.run("./"+script_name) != 0:
-            print "WARNING: sanity check script %s FAILED"%script_name
-            # xxx - temporary : always return true for now
+            utils.header ("WARNING: node sanity check script %s FAILED"%script_name)
+            print 'temporary : ignoring result and always return true for now'
             #return False
-        return True
+            return True
+        else:
+            utils.header ("SUCCESS: node sanity check script %s OK"%script_name)
+            return True