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

diff --git a/system/TestSliver.py b/system/TestSliver.py
index 0d5ab64..b1e68ca 100644
--- a/system/TestSliver.py
+++ b/system/TestSliver.py
@@ -24,21 +24,19 @@ 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 /tmp/%s.stamp"%stamp)==0
     
     def run_tcp_server (self,port,timeout=10):
         server_command = "./tcptest.py server -p %d -t %d"%(port,timeout)