X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliver.py;h=b1e68cac82b8928875f98a653531fd17343d2868;hb=dc0d985308143a990312b5fe118f21f2a9766028;hp=9dcda2b9a72de7dc21ce414c6b74075a6569ab56;hpb=7f94b698ee61962874ccb22df5bb4e0a9c4e7eb2;p=tests.git

diff --git a/system/TestSliver.py b/system/TestSliver.py
index 9dcda2b..b1e68ca 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,21 +24,19 @@ class TestSliver:
             print str(e)
             
     def create_test_ssh(self):
-        (found,privatekey) = self.get_privateKey()
-        if not found:
-            raise Exception,"Cannot find a valid key for slice %s"%self.test_slice.name()
-        return TestSsh (self.test_node.name(),key=privatekey,username=self.test_slice.name(),
+        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=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 /tmp/%s.stamp"%stamp)==0
     
     def run_tcp_server (self,port,timeout=10):
         server_command = "./tcptest.py server -p %d -t %d"%(port,timeout)
@@ -47,6 +48,35 @@ class TestSliver:
         return self.test_ssh.copy("tcptest.py")==0 and \
             self.test_ssh.run(client_command,background=True)==0
 
+    # 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_hooks (self):
+        print 'NOTE: slice hooks check scripts NOT (yet?) run in sudo'
+        extensions = [ 'py','pl','sh' ]
+        path='hooks/slice/'
+        scripts=utils.locate_hooks_scripts ('sliver '+self.name(), path,extensions)
+        overall = True
+        for script in scripts:
+            if not self.check_hooks_script (script):
+                overall = False
+        return overall
+
+    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
+        else:
+            utils.header ("SUCCESS: sliver hook %s OK"%script_name)
+            return True