X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=05653fa12474fc91691c39fc0a0fba7e639c650b;hb=1558599ffdfa4fa2dd53bdc68beaf56c2d9ad4aa;hp=7b5bccdac8d7e4b506651d4a48001213503fd26b;hpb=cd80e5acaa38ea44818c604a573e50e3f45ce082;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index 7b5bccd..05653fa 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -4,6 +4,7 @@ import xmlrpclib import utils from TestUser import TestUser from TestBox import TestBox +from TestSsh import TestSsh class TestNode: @@ -30,7 +31,7 @@ class TestNode: def buildname(self): return self.test_plc.options.buildname - def areaname (self): + def nodedir (self): if self.is_qemu(): return "qemu-%s"%self.name() else: @@ -62,33 +63,33 @@ class TestNode: userauth = test_user.auth() utils.header("node %s created by user %s"%(self.name(),test_user.name())) rootauth=self.test_plc.auth_root() - server = self.test_plc.server + server = self.test_plc.apiserver server.AddNode(userauth, self.test_site.site_spec['site_fields']['login_base'], self.node_spec['node_fields']) # create as reinstall to avoid user confirmation server.UpdateNode(userauth, self.name(), {'boot_state':'rins'}) # populate network interfaces - primary - server.AddNodeNetwork(userauth,self.name(), + server.AddInterface(userauth,self.name(), self.node_spec['network_fields']) # populate network interfaces - others if self.node_spec.has_key('extra_interfaces'): for interface in self.node_spec['extra_interfaces']: - server.AddNodeNetwork(userauth,self.name(), + server.AddInterface(userauth,self.name(), interface['network_fields']) if interface.has_key('settings'): for (attribute,value) in interface['settings'].iteritems(): # locate node network - nn = server.GetNodeNetworks(userauth,{'ip':interface['network_fields']['ip']})[0] - nnid=nn['nodenetwork_id'] + nn = server.GetInterfaces(userauth,{'ip':interface['network_fields']['ip']})[0] + nnid=nn['interface_id'] # locate or create node network attribute type try: - nnst = server.GetNodeNetworkSettingTypes(userauth,{'name':attribute})[0] + nnst = server.GetTagTypes(userauth,{'name':attribute})[0] except: - nnst = server.AddNodeNetworkSettingType(rootauth,{'category':'test', - 'name':attribute}) + nnst = server.AddTagType(rootauth,{'category':'test', + 'tagname':attribute}) # attach value - server.AddNodeNetworkSetting(userauth,nnid,attribute,value) + server.AddInterfaceSetting(userauth,nnid,attribute,value) def delete_node (self): # uses the right auth as far as poss. @@ -99,72 +100,111 @@ class TestNode: auth = test_user.auth() except: auth=self.test_plc.auth_root() - self.test_plc.server.DeleteNode(auth,self.name()) + self.test_plc.apiserver.DeleteNode(auth,self.name()) # 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()) - #create the tar log file - utils.system("rm -rf nodeslogs && mkdir nodeslogs") - if self.is_qemu(): - utils.system("rsync -v -a --exclude .svn template-qemu/ %s/"%self.areaname()) + def init_node(self): + utils.system("rm -rf %s"%self.nodedir()) + utils.system("mkdir %s"%self.nodedir()) + if not self.is_qemu(): + return True + return utils.system("rsync -v -a --exclude .svn template-qemu/ %s/"%self.nodedir())==0 - def create_boot_cd(self): + def bootcd(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) + encoded=self.test_plc.apiserver.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()) + filename="%s/%s.iso"%(self.nodedir(),self.name()) utils.header('Storing boot medium into %s'%filename) - file(filename,'w').write(base64.b64decode(encoded)) + if self.test_plc.options.dry_run: + print "Dry_run: skipped writing of iso image" + return True + else: + file(filename,'w').write(base64.b64decode(encoded)) + return True + + def reinstall_node (self): + self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(), + self.name(),{'boot_state':'rins'}) + return True def configure_qemu(self): if not self.is_qemu(): return mac=self.node_spec['network_fields']['mac'] - conf_filename="%s/start-qemu.conf"%(self.areaname()) + hostname=self.node_spec['node_fields']['hostname'] + ip=self.node_spec['network_fields']['ip'] + 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: + print "dry_run: skipped actual storage of qemu.conf" + return True 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'%self.name()) + file.write('HOSTNAME=%s\n'%hostname) + file.write('IP=%s\n'%ip) + file.write('TARGET_ARCH=%s\n'%target_arch) file.close() + return True + def export_qemu (self): # 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.buildname()) - self.test_box().mkdir(self.buildname()) - self.test_box().mkdir("nodeslogs") - self.test_box().copy(self.areaname(),recursive=True) - + if self.test_box().is_local(): + return True + 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 - def start_node (self,options): + def start_node (self): model=self.node_spec['node_fields']['model'] #starting the Qemu nodes before if self.is_qemu(): - self.start_qemu(options) + self.start_qemu() else: utils.header("TestNode.start_node : %s model %s taken as real node"%(self.name(),model)) + return True - def start_qemu (self, options): + def start_qemu (self): + options = self.test_plc.options 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 >> nodeslogs/%s.log"%(self.name(),self.name())) - test_box.run_in_buildname("qemu-%s/start-qemu-node 2>&1 >> nodeslogs/%s.log &"%(self.name(),self.name())) + test_box.run_in_buildname("%s/qemu-bridge-init start >> %s/qemu.log"%(self.nodedir(),self.nodedir())) + # kick it off in background, as it would otherwise hang + test_box.run_in_buildname("%s/qemu-start-node 2>&1 >> %s/qemu.log"%(self.nodedir(),self.nodedir()),True) + + 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) + return True def kill_qemu (self): #Prepare the log file before killing the nodes test_box = self.test_box() - if(not test_box.tar_logs()): - utils.header("Failed to get the nodes log files") # kill the right processes utils.header("Stopping qemu for host %s on box %s"%(self.name(),self.test_box().hostname())) - command="qemu_kill.sh %s"%self.name() + command="%s/qemu-kill-node %s"%(self.nodedir(),self.name()) self.test_box().run_in_buildname(command) return True + + def gather_qemu_logs (self): + if not self.is_qemu(): + return True + remote_log="%s/qemu.log"%self.nodedir() + local_log="logs/node.qemu.%s.log"%self.name() + self.test_box().test_ssh.fetch(remote_log,local_log) + + def clear_known_hosts (self): + TestSsh(self.name()).clear_known_hosts() + return True