X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliver.py;h=e9aa7aa803d6e7a1c295c1ed93fdb72a34dcb923;hb=55177a1292ca841809a3194015d32f76f1f0420c;hp=f0238b30efaa5ae87bb413e30385379e9a0dbef6;hpb=72d71234525f6e2fe5c15cf50eeaf942a4eab802;p=tests.git

diff --git a/system/TestSliver.py b/system/TestSliver.py
index f0238b3..e9aa7aa 100644
--- a/system/TestSliver.py
+++ b/system/TestSliver.py
@@ -1,3 +1,6 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 import utils
 import os, os.path
 import datetime
@@ -21,53 +24,65 @@ class TestSliver:
             print str(e)
             
     def create_test_ssh(self):
-        (found,privatekey) = self.get_privateKey()
-        if not found:
+        private_key = self.test_slice.locate_private_key()
+        if not private_key:
             raise Exception,"Cannot find the private key for slice %s"%self.test_slice.name()
-        return TestSsh (self.test_node.name(),key=privatekey,username=self.test_slice.name(),
+        return TestSsh (self.test_node.name(),key=private_key,username=self.test_slice.name(),
                         # so that copies end up in the home dir
                         buildname=".")
 
     def name (self):
         return "%s@%s"%(self.test_slice.name(),self.test_node.name())
 
-    def check_initscript(self,initscript):
-        slice_spec=self.test_slice.slice_spec
-        initscript = slice_spec['initscriptname']
-        utils.header("Checking initscript %s on sliver %s"%(initscript,self.name()))
-        return self.test_ssh.run("ls -l /tmp/%s.stamp"%initscript)==0
+    def check_initscript_stamp(self,stamp):
+        utils.header("Checking for initscript stamp %s on sliver %s"%(stamp,self.name()))
+        return self.test_ssh.run("ls -l /var/tmp/%s.stamp"%stamp)==0
     
     def run_tcp_server (self,port,timeout=10):
         server_command = "./tcptest.py server -p %d -t %d"%(port,timeout)
         return self.test_ssh.copy("tcptest.py")==0 and \
             self.test_ssh.run(server_command,background=True)==0
 
-    def run_tcp_client (self,servername,port):
+    def run_tcp_client (self,servername,port,retry=5):
         client_command="./tcptest.py client -a %s -p %d"%(servername,port)
-        return self.test_ssh.copy("tcptest.py")==0 and \
-            self.test_ssh.run(client_command,background=True)==0
+        if self.test_ssh.copy("tcptest.py")!=0: return False
+        utils.header ("tcp client - first attempt")
+        if self.test_ssh.run(client_command,background=False)==0: return True
+        # if first try has failed, wait for <retry> s an try again
+        time.sleep(retry)
+        utils.header ("tcp client - second attempt")
+        if self.test_ssh.run(client_command,background=False)==0: return True
+        return False
 
+    # use the node's main ssh root entrance, as the slice entrance might be down
+    #def tar_var_logs (self):
+    #    return self.test_ssh.actual_command("sudo tar -C /var/log -cf - .")
     def tar_var_logs (self):
-        return self.test_ssh.actual_command("sudo tar -C /var/log -cf - .")
+        test_ssh=self.test_node.create_test_ssh()
+        dir_to_tar="/vservers/%s/var/log"%self.test_slice.name()
+        return test_ssh.actual_command("tar -C %s -cf - ."%dir_to_tar)
     
-    def check_sanity (self):
-        print 'NOTE: slice sanity check scripts NOT (yet?) run in sudo'
+    def check_hooks (self):
+        print 'NOTE: slice hooks check scripts NOT (yet?) run in sudo'
         extensions = [ 'py','pl','sh' ]
-        path='tests/qaapi/qa/tests/slice/'
-        scripts=utils.locate_sanity_scripts ('sliver '+self.name(), path,extensions)
+        path='hooks/slice/'
+        scripts=utils.locate_hooks_scripts ('sliver '+self.name(), path,extensions)
         overall = True
         for script in scripts:
-            if not self.check_sanity_script (script):
+            if not self.check_hooks_script (script):
                 overall = False
         return overall
 
-    def check_sanity_script (self,local_script):
-        ssh_handle=self.create_test_ssh()
-        ssh_handle.copy_home(local_script)
-        scriptname=os.path.basename(local_script)
-        if ssh_handle.run("./"+scriptname) != 0:
-            print "WARNING: sanity check script %s FAILED"%scriptname
-            # xxx - temporary : ignore result and always return true for now
+    def check_hooks_script (self,local_script):
+        script_name=os.path.basename(local_script)
+        utils.header ("SLIVER hook %s (%s)"%(script_name,self.name()))
+        test_ssh=self.create_test_ssh()
+        test_ssh.copy_home(local_script)
+        if test_ssh.run("./"+script_name) != 0:
+            utils.header ("WARNING: hooks check script %s FAILED (ignored)"%script_name)
             #return False
-        return True
+            return True
+        else:
+            utils.header ("SUCCESS: sliver hook %s OK"%script_name)
+            return True