X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=08dd17c6b27c53388e7454086ee23bf0f37a33ca;hb=d09cbd5b5d9d02ceadf6f09c446b17c8c1cb6f5e;hp=7e822fdbfce4db4a4c6f2517ac96ff3c0c1eb4d9;hpb=070ac7cd04e9258f40fba3757c809388f60bdb55;p=tests.git

diff --git a/system/TestNode.py b/system/TestNode.py
index 7e822fd..08dd17c 100644
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -1,4 +1,4 @@
-import os, sys, time, base64
+import sys, os, os.path, time, base64
 import xmlrpclib
 
 import utils
@@ -68,26 +68,26 @@ class TestNode:
                        self.test_site.site_spec['site_fields']['login_base'],
                        self.node_spec['node_fields'])
         # create as reinstall to avoid user confirmation
-        server.UpdateNode(userauth, self.name(), {'boot_state':'rins'})
+        server.UpdateNode(userauth, self.name(), {'boot_state':'reinstall'})
         # populate network interfaces - primary
         server.AddInterface(userauth,self.name(),
-                                            self.node_spec['network_fields'])
+                                            self.node_spec['interface_fields'])
         # 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['network_fields'])
+                                                    interface['interface_fields'])
                 if interface.has_key('settings'):
                     for (attribute,value) in interface['settings'].iteritems():
                         # locate node network
-                        nn = server.GetInterfaces(userauth,{'ip':interface['network_fields']['ip']})[0]
-                        nnid=nn['nodenetwork_id']
+                        nn = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0]
+                        nnid=nn['interface_id']
                         # locate or create node network attribute type
                         try:
-                            nnst = server.GetInterfaceSettingTypes(userauth,{'name':attribute})[0]
+                            nnst = server.GetTagTypes(userauth,{'name':attribute})[0]
                         except:
-                            nnst = server.AddInterfaceSettingType(rootauth,{'category':'test',
-                                                                              'name':attribute})
+                            nnst = server.AddTagType(rootauth,{'category':'test',
+                                                               'tagname':attribute})
                         # attach value
                         server.AddInterfaceSetting(userauth,nnid,attribute,value)
 
@@ -131,15 +131,15 @@ class TestNode:
 
     def reinstall_node (self):
         self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(),
-                                           self.name(),{'boot_state':'rins'})
+                                           self.name(),{'boot_state':'reinstall'})
         return True
     
     def configure_qemu(self):
         if not self.is_qemu():
             return
-        mac=self.node_spec['network_fields']['mac']
+        mac=self.node_spec['interface_fields']['mac']
         hostname=self.node_spec['node_fields']['hostname']
-        ip=self.node_spec['network_fields']['ip']
+        ip=self.node_spec['interface_fields']['ip']
         auth=self.test_plc.auth_root()
         target_arch=self.test_plc.apiserver.GetPlcRelease(auth)['build']['target-arch']
         conf_filename="%s/qemu.conf"%(self.nodedir())
@@ -179,9 +179,9 @@ class TestNode:
         test_box = self.test_box()
         utils.header("Starting qemu node %s on %s"%(self.name(),test_box.hostname()))
 
-        test_box.run_in_buildname("%s/qemu-bridge-init start >> %s/qemu.log"%(self.nodedir(),self.nodedir()))
+        test_box.run_in_buildname("%s/qemu-bridge-init start >> %s/log.txt"%(self.nodedir(),self.nodedir()))
         # kick it off in background, as it would otherwise hang
-        test_box.run_in_buildname("%s/qemu-start-node 2>&1 >> %s/qemu.log"%(self.nodedir(),self.nodedir()),True)
+        test_box.run_in_buildname("%s/qemu-start-node 2>&1 >> %s/log.txt"%(self.nodedir(),self.nodedir()),True)
 
     def list_qemu (self):
         utils.header("Listing qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
@@ -201,10 +201,38 @@ class TestNode:
     def gather_qemu_logs (self):
         if not self.is_qemu():
             return True
-        remote_log="%s/qemu.log"%self.nodedir()
+        remote_log="%s/log.txt"%self.nodedir()
         local_log="logs/node.qemu.%s.log"%self.name()
         self.test_box().test_ssh.fetch(remote_log,local_log)
 
     def clear_known_hosts (self):
         TestSsh(self.name()).clear_known_hosts()
         return True
+
+    def create_test_ssh(self):
+        # get the plc's keys for entering the node
+        vservername=self.test_plc.vservername
+        # assuming we've run testplc.fetch_keys()
+        key = "keys/%(vservername)s.rsa"%locals()
+        return TestSsh(self.name(), buildname=self.buildname(), key=key)
+
+    def check_sanity (self):
+        extensions = [ 'py','pl','sh' ]
+        path='tests/qaapi/qa/tests/node/'
+        scripts=utils.locate_sanity_scripts ('node '+self.name(), path,extensions)
+        overall = True
+        for script in scripts:
+            if not self.check_sanity_script (script):
+                overall = False
+        return overall
+
+    def check_sanity_script (self,local_script):
+        # push the script on the node's root context
+        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
+            #return False
+        return True