X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=f4a55dc40d5d1337c32007628bfdac5a8c253134;hb=1b53e7fba94188d65f5bbf6542a3f4298dad57ff;hp=a79c7c3f4b74c877d00afe40cc48714897ee2069;hpb=da03cb951b43207d9e46173a73c3edbef5caa79a;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index a79c7c3..f4a55dc 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -3,6 +3,7 @@ import xmlrpclib import utils from TestUser import TestUser +from TestBox import TestBox class TestNode: @@ -13,23 +14,29 @@ class TestNode: def name(self): return self.node_spec['node_fields']['hostname'] - - def is_vmware (self): - model=self.node_spec['node_fields']['model'] - return model.find("vmware") >= 0 - - def is_qemu (self): - model=self.node_spec['node_fields']['model'] + + @staticmethod + def is_qemu_model (model): return model.find("qemu") >= 0 + def is_qemu (self): + return TestNode.is_qemu_model(self.node_spec['node_fields']['model']) + @staticmethod + def is_real_model (model): + return not TestNode.is_qemu_model(model) def is_real (self): - return (not self.is_vmware()) and (not self.is_qemu()) + return TestNode.is_real_model (self.node_spec['node_fields']['model']) def host_box (self): - try: - return self.node_spec['host_box'] - except: - return 'localhost' + if self.is_real (): + utils.header("WARNING : real nodes dont have a host box") + return None + else: + try: + return self.node_spec['host_box'] + except: + utils.header("WARNING : qemu nodes need a host box") + return 'localhost' def create_node (self): ownername = self.node_spec['owner'] @@ -91,14 +98,7 @@ class TestNode: def conffile(self,image,hostname,path): model=self.node_spec['node_fields']['model'] - if self.is_vmware(): - host_box=self.host_box() - template='%s/template-vmplayer/node.vmx'%(path) - actual='%s/vmplayer-%s/node.vmx'%(path,hostname) - sed_command="sed -e s,@BOOTCD@,%s,g %s > %s"%(image,template,actual) - utils.header('Creating %s from %s'%(actual,template)) - utils.system(sed_command) - elif self.is_qemu(): + if self.is_qemu(): host_box=self.host_box() mac=self.node_spec['network_fields']['mac'] dest_dir="qemu-%s"%(hostname) @@ -114,7 +114,7 @@ class TestNode: utils.system(createdir_command) scp_command = "scp -r %s/qemu-%s/* root@%s:/root/%s"%(path,hostname,host_box,dest_dir) utils.system(scp_command) - + def create_boot_cd(self,path): model=self.node_spec['node_fields']['model'] node_spec=self.node_spec @@ -122,18 +122,8 @@ class TestNode: encoded=self.test_plc.server.GetBootMedium(self.test_plc.auth_root(), hostname, 'node-iso', '') if (encoded == ''): raise Exception, 'boot.iso not found' - - if model.find("vmware") >= 0: - utils.header('Initializing vmplayer area for node %s'%hostname) - clean_dir="rm -rf %s/vmplayer-%s"%(path,hostname) - mkdir_command="mkdir -p %s/vmplayer-%s"%(path,hostname) - tar_command="tar -C %s/template-vmplayer -cf - . | tar -C %s/vmplayer-%s -xf -"%(path,path,hostname) - utils.system(clean_dir) - utils.system(mkdir_command) - utils.system(tar_command); - utils.header('Creating boot medium for node %s'%hostname) - file=open(path+'/vmplayer-'+hostname+'/boot_file.iso','w') - elif model.find("qemu") >= 0: + + if model.find("qemu") >= 0: clean_dir="rm -rf %s/qemu-%s"%(path,hostname) mkdir_command="mkdir -p %s/qemu-%s"%(path,hostname) utils.system(clean_dir) @@ -152,40 +142,30 @@ class TestNode: file.close() utils.header('boot cd created for %s'%hostname) self.conffile('boot_file.iso',hostname, path) - + def start_node (self,options): model=self.node_spec['node_fields']['model'] - if model.find("vmware") >= 0: - self.start_vmware(options) - elif model.find("qemu") >= 0: + #starting the Qemu nodes before + if model.find("qemu") >= 0: self.start_qemu(options) else: utils.header("TestNode.start_node : ignoring model %s"%model) - def start_vmware (self,options): - hostname=self.node_spec['node_fields']['hostname'] - path=options.path - display=options.display - utils.header('Starting vmplayer for node %s on %s'%(hostname,display)) - utils.system('cd %s/vmplayer-%s ; DISPLAY=%s vmplayer node.vmx < /dev/null >/dev/null 2>/dev/null &'%(path,hostname,display)) - def start_qemu (self, options): + utils.header("Starting Qemu node") host_box=self.host_box() hostname=self.node_spec['node_fields']['hostname'] path=options.path display=options.display dest_dir="qemu-%s"%(hostname) utils.header('Starting qemu for node %s '%(hostname)) - utils.system("ssh root@%s ~/%s/env-qemu start "%(host_box, dest_dir )) - utils.system("ssh root@%s DISPLAY=%s ~/%s/start-qemu-node %s & "%( host_box, display, dest_dir, dest_dir)) + self.test_plc.run_in_host("ssh root@%s ~/%s/%s/env-qemu start"%(host_box, path, dest_dir )) + self.test_plc.run_in_host("ssh root@%s DISPLAY=%s ~/%s/start-qemu-node %s & "%( host_box, display, dest_dir, dest_dir)) - def stop_qemu(self): - if not self.is_qemu(): - return True - hostname=self.node_spec['node_fields']['hostname'] - host_box=self.host_box() - utils.system('ssh root@%s killall qemu'%host_box) - utils.header('Stoping qemu emulation of %s on the host machine %s and Restoring the initial network' - %(hostname,host_box)) - utils.system("ssh root@%s ~/qemu-%s/env-qemu stop "%(host_box, hostname )) + 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) return True