X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestBoxQemu.py;h=641a8dc0572d036e3ee7ec4ff701dd6f241cc3b6;hb=af6722f87d9f36e7385421f9ce21e8861167d5ca;hp=e2527e729faaf245534844515cd4db96dbdbd592;hpb=079fcad2d535401d0f078c2b52c928ecec7a2799;p=tests.git

diff --git a/system/TestBoxQemu.py b/system/TestBoxQemu.py
index e2527e7..641a8dc 100644
--- a/system/TestBoxQemu.py
+++ b/system/TestBoxQemu.py
@@ -7,6 +7,9 @@ import os.path
 import utils
 from TestSsh import TestSsh
 
+# Apriol 2013 - using /vservers/ for hosting this stuff as well, making IT-like stuff easier
+KVMROOT="/vservers"
+
 # xxx this should probably inherit TestSsh
 class TestBoxQemu:
 
@@ -14,7 +17,7 @@ class TestBoxQemu:
         self.hostname_value=hostname
         self.buildname=buildname
         self.key=key
-        self.test_ssh=TestSsh(self.hostname_value,self.buildname,self.key)
+        self.test_ssh=TestSsh(self.hostname_value,self.buildname,self.key,root=KVMROOT)
         
     def hostname (self):
         return self.hostname_value
@@ -22,25 +25,25 @@ class TestBoxQemu:
     def is_local(self):
         return self.test_ssh.is_local()
     
-    def run_in_buildname (self,command,background=False):
-        message="On %s: running %s"%(self.hostname(),command)
+    def run_in_buildname (self,command,background=False, dry_run=False):
+        message="On {}: running {}".format(self.hostname(), command)
         if background: message += " &"
         utils.header(message)
-        return self.test_ssh.run_in_buildname (command,background)
+        return self.test_ssh.run_in_buildname (command,background, dry_run)
 
     # xxx could/should use rsync instead
-    def copy (self,local_file,recursive=False):
-        return self.test_ssh.copy (local_file,recursive)
+    def copy (self,local_file,recursive=False,dry_run=False):
+        return self.test_ssh.copy (local_file,recursive,dry_run=dry_run)
 
-    def clean_dir (self,dirname):
-        return self.test_ssh.clean_dir(dirname)
+    def rmdir (self,dirname, dry_run=False):
+        return self.test_ssh.rmdir(dirname, dry_run=dry_run)
 
     def mkdir (self,dirname):
         return self.test_ssh.mkdir(dirname)
 
     # we need at least one nodename, as template-qemu is not synced on remote testboxes
     def qemu_kill_all(self,nodedir):
-        self.run_in_buildname("%s/qemu-kill-node"%nodedir)
+        self.run_in_buildname("{}/qemu-kill-node".format(nodedir))
         return True
 
     def qemu_list_all(self):