X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=c9d31f804c20a8dc89dd8a8c6d5f1fbae9a2fd2e;hb=d502e1d5482497fd083e028d21f25091a469355b;hp=ceae7718b89cdd137d7d424501a05b1c1da35698;hpb=0a1a5d0802b341b20b4e4485be4cd2a845027a99;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index ceae771..c9d31f8 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -2,7 +2,6 @@ # Copyright (C) 2010 INRIA # import sys, os, os.path, time, base64 -import xmlrpclib import utils from TestUser import TestUser @@ -19,6 +18,8 @@ class TestNode: def name(self): return self.node_spec['node_fields']['hostname'] + def dry_run (self): + return self.test_plc.options.dry_run @staticmethod def is_qemu_model (model): return model.find("qemu") >= 0 @@ -143,7 +144,7 @@ class TestNode: filename="%s/%s.iso"%(self.nodedir(),self.name()) utils.header('Storing boot medium into %s'%filename) - if self.test_plc.options.dry_run: + if self.dry_run(): print "Dry_run: skipped writing of iso image" return True else: @@ -170,7 +171,7 @@ class TestNode: def nodestate_show (self): "all nodes: show PLCAPI boot_state" - if self.test_plc.options.dry_run: + if self.dry_run(): print "Dry_run: skipped getting current node state" return True state=self.test_plc.apiserver.GetNodes(self.test_plc.auth_root(), self.name(), ['boot_state'])[0]['boot_state'] @@ -187,7 +188,7 @@ class TestNode: auth=self.test_plc.auth_root() target_arch=self.test_plc.apiserver.GetPlcRelease(auth)['build']['target-arch'] conf_filename="%s/qemu.conf"%(self.nodedir()) - if self.test_plc.options.dry_run: + if self.dry_run(): print "dry_run: skipped actual storage of qemu.conf" return True utils.header('Storing qemu config for %s in %s'%(self.name(),conf_filename)) @@ -200,15 +201,21 @@ class TestNode: file.close() return True + def qemu_clean (self): + utils.header("Cleaning up qemu for host %s on box %s"%(self.name(),self.test_box().hostname())) + dry_run=self.dry_run() + self.test_box().rmdir(self.nodedir(), dry_run=dry_run) + return True + def qemu_export (self): "all nodes: push local node-dep directory on the qemu box" # if relevant, push the qemu area onto the host box if self.test_box().is_local(): return True + dry_run=self.dry_run() utils.header ("Cleaning any former sequel of %s on %s"%(self.name(),self.host_box())) - self.test_box().run_in_buildname("rm -rf %s"%self.nodedir()) utils.header ("Transferring configuration files for node %s onto %s"%(self.name(),self.host_box())) - return self.test_box().copy(self.nodedir(),recursive=True)==0 + return self.test_box().copy(self.nodedir(),recursive=True,dry_run=dry_run)==0 def qemu_start (self): "all nodes: start the qemu instance (also runs qemu-bridge-init start)" @@ -223,22 +230,23 @@ class TestNode: def timestamp_qemu (self): "all nodes: start the qemu instance (also runs qemu-bridge-init start)" test_box = self.test_box() - test_box.run_in_buildname("mkdir -p %s"%self.nodedir()) + test_box.run_in_buildname("mkdir -p %s"%self.nodedir(), dry_run=self.dry_run()) now=int(time.time()) - return test_box.run_in_buildname("echo %d > %s/timestamp"%(now,self.nodedir()))==0 + return test_box.run_in_buildname("echo %d > %s/timestamp"%(now,self.nodedir()), dry_run=self.dry_run())==0 def start_qemu (self): 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/log.txt"%(self.nodedir(),self.nodedir())) + test_box.run_in_buildname("%s/qemu-bridge-init start >> %s/log.txt"%(self.nodedir(),self.nodedir()), + dry_run=self.dry_run()) # kick it off in background, as it would otherwise hang test_box.run_in_buildname("%s/qemu-start-node 2>&1 >> %s/log.txt"%(self.nodedir(),self.nodedir())) def list_qemu (self): utils.header("Listing qemu for host %s on box %s"%(self.name(),self.test_box().hostname())) command="%s/qemu-kill-node -l %s"%(self.nodedir(),self.name()) - self.test_box().run_in_buildname(command) + self.test_box().run_in_buildname(command, dry_run=self.dry_run()) return True def kill_qemu (self): @@ -247,7 +255,7 @@ class TestNode: # kill the right processes utils.header("Stopping qemu for node %s on box %s"%(self.name(),self.test_box().hostname())) command="%s/qemu-kill-node %s"%(self.nodedir(),self.name()) - self.test_box().run_in_buildname(command) + self.test_box().run_in_buildname(command, dry_run=self.dry_run()) return True def gather_qemu_logs (self): @@ -255,7 +263,7 @@ class TestNode: return True remote_log="%s/log.txt"%self.nodedir() local_log="logs/node.qemu.%s.txt"%self.name() - self.test_box().test_ssh.fetch(remote_log,local_log) + self.test_box().test_ssh.fetch(remote_log,local_log,dry_run=self.dry_run()) def keys_clear_known_hosts (self): "remove test nodes entries from the local known_hosts file" @@ -268,7 +276,7 @@ class TestNode: ### # assuming we've run testplc.fetch_keys() ### key = "keys/%(vservername)s.rsa"%locals() # fetch_keys doesn't grab the root key anymore - key = "keys/key1.rsa" + key = "keys/key_admin.rsa" return TestSsh(self.name(), buildname=self.buildname(), key=key) def check_hooks (self): @@ -299,7 +307,7 @@ class TestNode: test_ssh=self.create_test_ssh() return test_ssh.run ("rpm -q --quiet libvirt-client")==0 - def check_systemslice (self, slicename,dry_run=False): + def _check_system_slice (self, slicename,dry_run=False): sitename=self.test_plc.plc_spec['PLC_SLICE_PREFIX'] vservername="%s_%s"%(sitename,slicename) test_ssh=self.create_test_ssh()