X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=380d8a97cce10a30e73d116ace1359c4fadfd987;hb=ac99c0d0dca7e345a97a92133b2cdb6040568dd6;hp=a32ce67c8d30f72bcf32164a8ab3bd3afa75c565;hpb=5abc2125f8a5aeb58783affd6a3b532f02acd216;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index a32ce67..380d8a9 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -1,3 +1,6 @@ +# Thierry Parmentelat +# Copyright (C) 2010 INRIA +# import sys, os, os.path, time, base64 import xmlrpclib @@ -67,29 +70,31 @@ class TestNode: server.AddNode(userauth, self.test_site.site_spec['site_fields']['login_base'], self.node_spec['node_fields']) + server.SetNodePlainBootstrapfs(userauth, + self.node_spec['node_fields']['hostname'], + 'YES') # create as reinstall to avoid user confirmation server.UpdateNode(userauth, self.name(), {'boot_state':'reinstall'}) # populate network interfaces - primary server.AddInterface(userauth,self.name(), - self.node_spec['network_fields']) + self.node_spec['interface_fields']) # populate network interfaces - others if self.node_spec.has_key('extra_interfaces'): for interface in self.node_spec['extra_interfaces']: - server.AddInterface(userauth,self.name(), - interface['network_fields']) + server.AddInterface(userauth,self.name(), interface['interface_fields']) if interface.has_key('settings'): for (attribute,value) in interface['settings'].iteritems(): # locate node network - nn = server.GetInterfaces(userauth,{'ip':interface['network_fields']['ip']})[0] - nnid=nn['interface_id'] + interface = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0] + interface_id=interface['interface_id'] # locate or create node network attribute type try: - nnst = server.GetTagTypes(userauth,{'name':attribute})[0] + interface_tagtype = server.GetTagTypes(userauth,{'name':attribute})[0] except: - nnst = server.AddTagType(rootauth,{'category':'test', - 'tagname':attribute}) + interface_tagtype = server.AddTagType(rootauth,{'category':'test', + 'tagname':attribute}) # attach value - server.AddInterfaceSetting(userauth,nnid,attribute,value) + server.AddInterfaceTag(userauth,interface_id,attribute,value) def delete_node (self): # uses the right auth as far as poss. @@ -114,7 +119,8 @@ class TestNode: utils.header("Calling GetBootMedium for %s"%self.name()) options = [] if self.is_qemu(): - options=['serial'] + options.append('serial') + options.append('no-hangcheck') encoded=self.test_plc.apiserver.GetBootMedium(self.test_plc.auth_root(), self.name(), 'node-iso', '', options) if (encoded == ''): @@ -134,12 +140,17 @@ class TestNode: self.name(),{'boot_state':'reinstall'}) return True + def safeboot_node (self): + self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(), + self.name(),{'boot_state':'safeboot'}) + return True + def configure_qemu(self): if not self.is_qemu(): return - mac=self.node_spec['network_fields']['mac'] + mac=self.node_spec['interface_fields']['mac'] hostname=self.node_spec['node_fields']['hostname'] - ip=self.node_spec['network_fields']['ip'] + ip=self.node_spec['interface_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()) @@ -179,9 +190,9 @@ class TestNode: 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/qemu.log"%(self.nodedir(),self.nodedir())) + test_box.run_in_buildname("%s/qemu-bridge-init start >> %s/log.txt"%(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) + 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())) @@ -193,7 +204,7 @@ class TestNode: #Prepare the log file before killing the nodes test_box = self.test_box() # kill the right processes - utils.header("Stopping qemu for host %s on box %s"%(self.name(),self.test_box().hostname())) + 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) return True @@ -201,8 +212,8 @@ class TestNode: 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() + 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) def clear_known_hosts (self): @@ -212,26 +223,33 @@ class TestNode: def create_test_ssh(self): # get the plc's keys for entering the node vservername=self.test_plc.vservername - # assuming we've run testplc.fetch_keys() - key = "keys/%(vservername)s.rsa"%locals() +### # 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" return TestSsh(self.name(), buildname=self.buildname(), key=key) - def check_sanity (self): + def check_hooks (self): extensions = [ 'py','pl','sh' ] - path='tests/qaapi/qa/tests/node/' - scripts=utils.locate_sanity_scripts ('node '+self.name(), path,extensions) + path='hooks/node' + scripts=utils.locate_hooks_scripts ('node '+self.name(), path,extensions) overall = True for script in scripts: - if not self.check_sanity_script (script): + if not self.check_hooks_script (script): overall = False return overall - def check_sanity_script (self,local_script): + def check_hooks_script (self,local_script): # push the script on the node's root context - ssh_handle=self.create_test_ssh() - ssh_handle.copy_home(local_script) - if ssh_handle.run("./"+os.path.basename(local_script)) != 0: - print "WARNING: sanity check script %s FAILED" - # xxx - temporary : always return true for now + script_name=os.path.basename(local_script) + utils.header ("NODE hook %s (%s)"%(script_name,self.name())) + test_ssh=self.create_test_ssh() + test_ssh.copy_home(local_script) + if test_ssh.run("./"+script_name) != 0: + utils.header ("WARNING: node hooks check script %s FAILED (ignored)"%script_name) #return False - return True + return True + else: + utils.header ("SUCCESS: node hook %s OK"%script_name) + return True +