X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=c8ca1e8ab8dbcb81b2d08be505823bfbd1e5ad5f;hb=2599163df4acc4c239239f955fcdb8128b04b9d0;hp=e4cc1d4c33545e8b6344133fe8fda6f395395604;hpb=c751d0185114516c11f185363391636068be786d;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index e4cc1d4..c8ca1e8 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -2,12 +2,30 @@ # Copyright (C) 2010 INRIA # import sys, os, os.path, time, base64 -import xmlrpclib import utils from TestUser import TestUser from TestBoxQemu import TestBoxQemu from TestSsh import TestSsh +from Completer import CompleterTask + +class CompleterTaskNodeSsh (CompleterTask): + def __init__ (self, hostname, qemuname, local_key, command=None, boot_state="boot", expected=True, dry_run=False): + self.hostname=hostname + self.qemuname=qemuname + self.boot_state=boot_state + self.local_key=local_key + self.command=command if command is not None else "hostname;uname -a" + self.expected=expected + self.dry_run = dry_run + self.test_ssh = TestSsh (self.hostname,key=self.local_key) + def run (self, silent): + command = self.test_ssh.actual_command(self.command) + retcod=utils.system (command, silent=silent, dry_run=self.dry_run) + if self.expected: return retcod==0 + else: return retcod !=0 + def failure_epilogue (self): + print "Cannot reach %s in %s mode"%(self.hostname, self.boot_state) class TestNode: @@ -19,6 +37,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 +163,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 +190,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 +207,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 +220,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)" @@ -220,25 +246,26 @@ class TestNode: utils.header("TestNode.qemu_start : %s model %s taken as real node"%(self.name(),model)) return True - def timestamp_qemu (self): + def qemu_timestamp (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 +274,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 +282,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" @@ -299,8 +326,8 @@ 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): - sitename=self.test_plc.plc_spec['PLC_SLICE_PREFIX'] + def _check_system_slice (self, slicename,dry_run=False): + sitename=self.test_plc.plc_spec['settings']['PLC_SLICE_PREFIX'] vservername="%s_%s"%(sitename,slicename) test_ssh=self.create_test_ssh() if self.has_libvirt():