From: Thierry Parmentelat Date: Mon, 3 Mar 2008 12:32:55 +0000 (+0000) Subject: first step towards using testbox properly X-Git-Tag: tests-4.2-4~215 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=df8006feda3e410f0ce2757ceb5e41ed8c5d8d63;p=tests.git first step towards using testbox properly --- diff --git a/system/TestBox.py b/system/TestBox.py index e5c3e48..7b6fa6b 100644 --- a/system/TestBox.py +++ b/system/TestBox.py @@ -1,39 +1,54 @@ # $Id$ # this models a box that hosts qemu nodes # could probably also be used for boxes that host plc instances +import os.path + import utils class TestBox: - def __init__(self,hostname,key=None): - self.hostname=hostname + def __init__(self,hostname,buildname,key=None): + self.hostname_value=hostname + self.buildname=buildname self.key=key + def hostname (self): + return self.hostname_value + def is_local(self): - return utils.is_local (self.hostname) + return utils.is_local (self.hostname()) - def run (self,command): + def run_in_buildname (self,command): if self.is_local(): return utils.system(command) - else: - if self.key: - to_run="ssh -i %s.rsa %s %s"%(self.key,self.hostname, - utils.backslash_shell_specials(command)) - else: - to_run="ssh %s %s"%(self.hostname, - utils.backslash_shell_specials(command)) - return utils.system(to_run) + ssh_comand="ssh " + if self.key: + ssh_comand += "-i %s.rsa "%(self.key) + ssh_command += "%s/%s"%(self.buildname,utils.backslash_shell_specials(command)) + return utils.system(ssh_command) - def copy (self,local_file): + # should use rsync instead + def copy (self,local_file,recursive=False): if self.is_local(): return 0 - else: - if self.key: - to_run="scp -i %s.rsa %s %s:"%(self.key,local_file,self.hostname) - else: - to_run="scp %s %s:"%(local_file,self.hostname) - return utils.system(to_run) + command="scp " + if recursive: command += "-r " + if self.key: + command += "-i %s.rsa " + command +="%s %s:%s/%s"%(local_file,self.hostname(),self.buildname, + os.path.basename(local_file) or ".") + return utils.system(command) + def clean_dir (self): + if self.is_local(): + return 0 + return utils.system("rm -rf %s"%self.buildname) + + def mkdir (self): + if self.is_local(): + return 0 + return utils.system("mkdir %s"%self.buildname) + def kill_all_qemus(self): - self.run("killall qemu") + self.run_in_buildname("killall qemu") diff --git a/system/TestMain.py b/system/TestMain.py index 04b5a28..576e8bb 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -36,6 +36,7 @@ class TestMain: def __init__ (self): self.path=os.path.dirname(sys.argv[0]) + os.chdir(self.path) @staticmethod def show_env (options, message): @@ -115,7 +116,7 @@ steps refer to a method in TestPlc or to a step_* module ('myplc_url','arg-myplc-url',"") , ) : # print 'handling',recname - path="%s/%s"%(self.path,filename) + path=filename is_list = isinstance(default,list) if not getattr(self.options,recname): try: diff --git a/system/TestNode.py b/system/TestNode.py index b482d09..d963ec2 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -27,18 +27,19 @@ class TestNode: def is_real (self): return TestNode.is_real_model (self.node_spec['node_fields']['model']) - @staticmethod - def is_local(host_box): - if (host_box == "localhost"): return True - else: return False - def buildname(self): return self.test_plc.options.buildname + def areaname (self): + if self.is_qemu(): + return "qemu-%s"%self.name() + else: + return "real-%s"%self.name() + + # this returns a hostname def host_box (self): if self.is_real (): - utils.header("WARNING : real nodes dont have a host box") - return None + return 'localhost' else: try: return self.node_spec['host_box'] @@ -46,6 +47,14 @@ class TestNode: utils.header("WARNING : qemu nodes need a host box") return 'localhost' + # this returns a TestBox instance - cached in .test_box_value + def test_box (self): + try: + return self.test_box_value + except: + self.test_box_value = TestBox (self.host_box(),self.buildname()) + return self.test_box_value + def create_node (self): ownername = self.node_spec['owner'] user_spec = self.test_site.locate_user(ownername) @@ -92,93 +101,64 @@ class TestNode: auth=self.test_plc.auth_root() self.test_plc.server.DeleteNode(auth,self.name()) - def get_node_status(self,hostname): - filter=['boot_state'] - status=False - node_status=self.test_plc.server.GetNodes(self.test_plc.auth_root(),hostname, filter) - utils.header('Actual status for node %s is [%s]'%(hostname,node_status)) - if (node_status[0]['boot_state'] == 'boot'): - utils.header('%s has reached boot state'%hostname) - status=True - elif (node_status[0]['boot_state'] == 'dbg' ): - utils.header('%s has reached debug state'%hostname) - return status - - def qemu_config(self,hostname,path): - model=self.node_spec['node_fields']['model'] + # Do most of the stuff locally - will be pushed on host_box - *not* the plc - later if needed + def prepare_area(self): + utils.system("rm -rf %s"%self.areaname()) + utils.system("mkdir %s"%self.areaname()) + if self.is_qemu(): + utils.system("rsync -v -a --exclude .svn template-qemu/ %s/"%self.areaname()) + + def create_boot_cd(self): + utils.header("Calling GetBootMedium for %s"%self.name()) + options = [] + if self.is_qemu(): + options=['serial'] + encoded=self.test_plc.server.GetBootMedium(self.test_plc.auth_root(), self.name(), 'node-iso', '', options) + if (encoded == ''): + raise Exception, 'GetBootmedium failed' + + filename="%s/%s.iso"%(self.areaname(),self.name()) + utils.header('Storing boot medium into %s'%filename) + file(filename,'w').write(base64.b64decode(encoded)) + + def configure_qemu(self): if not self.is_qemu(): - raise Exception,"wrong" - host_box=self.host_box() + return mac=self.node_spec['network_fields']['mac'] - # dest_dir is the path that needs to be relevant when qemu is invoked - conf_filename="%s/qemu-%s/start-qemu.conf"%(path,hostname) - utils.header('Storing qemu config for %s in %s'%(hostname,conf_filename)) + conf_filename="%s/start-qemu.conf"%(self.areaname()) + utils.header('Storing qemu config for %s in %s'%(self.name(),conf_filename)) file=open(conf_filename,'w') file.write('MACADDR=%s\n'%mac) - file.write('NODE_ISO=%s.iso\n'%hostname) + file.write('NODE_ISO=%s.iso\n'%self.name()) file.close() - if ( not self.is_local(host_box)): - dest_dir="%s/qemu-%s"%(self.buildname(),hostname) - utils.header ("Transferring configuration files for node %s"%hostname) - utils.header ("Using dir %s on %s"%(dest_dir,host_box)) - self.test_plc.run_in_host("ssh root@%s rm -rf %s"%(host_box, dest_dir)) - self.test_plc.run_in_host("ssh root@%s mkdir -p %s"%(host_box, dest_dir)) - self.test_plc.run_in_host("scp -r %s/qemu-%s/* root@%s:%s"%(path,hostname,host_box,dest_dir)) - - def create_boot_cd(self,path): - model=self.node_spec['node_fields']['model'] - node_spec=self.node_spec - hostname=node_spec['node_fields']['hostname'] - utils.header("Calling GetBootMedium for %s"%hostname) - encoded=self.test_plc.server.GetBootMedium(self.test_plc.auth_root(), hostname, 'node-iso', '', ['serial']) - if (encoded == ''): - raise Exception, 'boot.iso not found' - - if model.find("qemu") >= 0: - nodepath="%s/qemu-%s"%(path,hostname) - self.test_plc.run_in_host("rm -rf %s"%nodepath) - self.test_plc.run_in_host("mkdir -p %s"%nodepath) - template="%s/template-qemu"%path - self.test_plc.run_in_host("cp -r %s/* %s"%(template,nodepath)) - self.qemu_config(hostname, path) - else: - nodepath="%s/real-%s"%(path,hostname) - self.test_plc.run_in_host("rm -rf %s"%nodepath) - self.test_plc.run_in_host("mkdir -p %s"%nodepath) - filename="%s/%s.iso"%(nodepath,hostname) - utils.header('Storing boot medium into %s'%filename) - file(filename,'w').write(base64.b64decode(encoded)) - + # if relevant, push the qemu area onto the host box + if ( not self.test_box().is_local()): + utils.header ("Transferring configuration files for node %s onto %s"%(self.name(),self.host_box())) + self.test_box().clean_dir() + self.test_box().mkdir() + self.test_box().copy(self.areaname(),recursive=True) + def start_node (self,options): model=self.node_spec['node_fields']['model'] #starting the Qemu nodes before - if model.find("qemu") >= 0: + if self.is_qemu(): self.start_qemu(options) else: - utils.header("TestNode.start_node : ignoring model %s"%model) + utils.header("TestNode.start_node : %s model %s taken as real node"%(self.name(),model)) def start_qemu (self, options): - utils.header("Starting qemu node") - host_box=self.host_box() - hostname=self.node_spec['node_fields']['hostname'] - dest_dir=self.buildname()+"/qemu-%s"%(hostname) - utils.header("Starting qemu for node %s on %s"%(hostname,host_box)) - - if (not self.is_local(host_box)): - host_string="ssh root@%s"%host_box - else: - host_string="" - - self.test_plc.run_in_host("%s ~/%s/env-qemu start >> ~/%s/%s.log " - %(host_string, dest_dir, dest_dir, hostname )) - self.test_plc.run_in_host("%s ~/%s/start-qemu-node >> ~/%s/%s.log & " - %(host_string, dest_dir, dest_dir, hostname)) + test_box = self.test_box() + utils.header("Starting qemu node %s on %s"%(self.name(),test_box.hostname())) + + test_box.run_in_buildname("qemu-%s/env-qemu start >> qemu-%s/env-qemu.log"%( + self.name(),self.name())) + test_box.run_in_buildname("qemu-%s/start-qemu-node 2>&1 >> qemu-%s/start-qemu-node.log &"%( + self.name(),self.name())) def kill_qemu (self): - hostname = self.name() # kill the right processes - command="./qemu_kill.sh %s"%hostname - utils.header("Stopping qemu for host %s on box %s"%(hostname,self.host_box())) - TestBox(self.host_box()).run(command) + utils.header("Stopping qemu for host %s on box %s"%(self.name(),self.test_box().hostname())) + command="qemu_kill.sh %s"%self.name() + self.test_box().run_in_buildname(command) return True diff --git a/system/TestPlc.py b/system/TestPlc.py index 2fe909a..5785c15 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -164,23 +164,23 @@ class TestPlc: def kill_all_qemus(self,options): for (box,nodes) in self.gather_hostBoxes().iteritems(): # this is the brute force version, kill all qemus on that host box - TestBox(box).kill_all_qemus() + TestBox(box,options.buildname).kill_all_qemus() return True # make this a valid step def list_all_qemus(self,options): for (box,nodes) in self.gather_hostBoxes().iteritems(): # push the script - TestBox(box).copy("qemu_kill.sh") + TestBox(box,options.buildname).copy("qemu_kill.sh") # this is the brute force version, kill all qemus on that host box - TestBox(box).run("./qemu_kill.sh -l") + TestBox(box,options.buildname).run_in_buildname("qemu_kill.sh -l") return True # kill only the right qemus def kill_qemus(self,options): for (box,nodes) in self.gather_hostBoxes().iteritems(): # push the script - TestBox(box).copy("qemu_kill.sh") + TestBox(box,options.buildname).copy("qemu_kill.sh") # the fine-grain version for node in nodes: node.kill_qemu() @@ -501,7 +501,9 @@ class TestPlc: test_site = TestSite (self,site_spec) for node_spec in site_spec['nodes']: test_node=TestNode (self,test_site,node_spec) - test_node.create_boot_cd(options.path) + test_node.prepare_area() + test_node.create_boot_cd() + test_node.configure_qemu() return True def do_check_intiscripts(self): diff --git a/system/utils.py b/system/utils.py index b246b18..2d30edc 100644 --- a/system/utils.py +++ b/system/utils.py @@ -130,6 +130,11 @@ def is_local (hostname): if hostname == "localhost": return True import socket - local_ip = socket.gethostbyname(socket.gethostname()) - remote_ip = socket.gethostbyname(hostname) - return local_ip==remote_ip + try: + local_ip = socket.gethostbyname(socket.gethostname()) + remote_ip = socket.gethostbyname(hostname) + return local_ip==remote_ip + except: + header("WARNING : something wrong in is_local with hostname=%s"%hostname) + return False +