X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=7134cc2f56ef05b943724a7c94fe2557ab726638;hb=b9e119571675a2eda425baf89798ce6261fb48d2;hp=4d684dcb359aa3eb51126e1557f61b7dbd61b55d;hpb=1c87dd36c45ad0896491f51aa8bdf63f8668da25;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index 4d684dc..7134cc2 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -2,7 +2,6 @@ # Copyright (C) 2010 INRIA # import sys, os, os.path, time, base64 -import xmlrpclib import utils from TestUser import TestUser @@ -19,6 +18,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 @@ -67,17 +68,30 @@ class TestNode: utils.header("node %s created by user %s"%(self.name(),test_user.name())) rootauth=self.test_plc.auth_root() server = self.test_plc.apiserver - server.AddNode(userauth, - self.test_site.site_spec['site_fields']['login_base'], - self.node_spec['node_fields']) + node_id=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['interface_fields']) + + if not self.test_plc.has_addresses_api(): +# print 'USING OLD INTERFACE' + # populate network interfaces - primary + server.AddInterface(userauth,self.name(), + self.node_spec['interface_fields']) + else: +# print 'USING NEW INTERFACE with separate ip addresses' + # this is for setting the 'dns' stuff that now goes with the node + server.UpdateNode (userauth, self.name(), self.node_spec['node_fields_nint']) + interface_id = server.AddInterface (userauth, self.name(),self.node_spec['interface_fields_nint']) + server.AddIpAddress (userauth, interface_id, self.node_spec['ipaddress_fields']) + route_fields=self.node_spec['route_fields'] + route_fields['interface_id']=interface_id + server.AddRoute (userauth, node_id, self.node_spec['route_fields']) + pass # populate network interfaces - others if self.node_spec.has_key('extra_interfaces'): for interface in self.node_spec['extra_interfaces']: @@ -109,6 +123,7 @@ class TestNode: # Do most of the stuff locally - will be pushed on host_box - *not* the plc - later if needed def qemu_local_init(self): + "all nodes : init a clean local directory for holding node-dep stuff like iso image..." utils.system("rm -rf %s"%self.nodedir()) utils.system("mkdir %s"%self.nodedir()) if not self.is_qemu(): @@ -116,6 +131,7 @@ class TestNode: return utils.system("rsync -v -a --exclude .svn template-qemu/ %s/"%self.nodedir())==0 def bootcd(self): + "all nodes: invoke GetBootMedium and store result locally" utils.header("Calling GetBootMedium for %s"%self.name()) options = [] if self.is_qemu(): @@ -128,7 +144,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: @@ -136,22 +152,26 @@ class TestNode: return True def nodestate_reinstall (self): + "all nodes: mark PLCAPI boot_state as reinstall" self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(), self.name(),{'boot_state':'reinstall'}) return True def nodestate_safeboot (self): + "all nodes: mark PLCAPI boot_state as safeboot" self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(), self.name(),{'boot_state':'safeboot'}) return True def nodestate_boot (self): + "all nodes: mark PLCAPI boot_state as boot" self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(), self.name(),{'boot_state':'boot'}) return True def nodestate_show (self): - if self.test_plc.options.dry_run: + "all nodes: show PLCAPI boot_state" + 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'] @@ -159,6 +179,7 @@ class TestNode: return True def qemu_local_config(self): + "all nodes: compute qemu config qemu.conf and store it locally" if not self.is_qemu(): return mac=self.node_spec['interface_fields']['mac'] @@ -167,7 +188,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)) @@ -180,16 +201,24 @@ 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)" model=self.node_spec['node_fields']['model'] #starting the Qemu nodes before if self.is_qemu(): @@ -198,24 +227,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): @@ -224,7 +255,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): @@ -232,9 +263,10 @@ 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" TestSsh(self.name()).clear_known_hosts() return True @@ -244,7 +276,7 @@ class TestNode: ### # 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" + key = "keys/key_admin.rsa" return TestSsh(self.name(), buildname=self.buildname(), key=key) def check_hooks (self): @@ -273,22 +305,24 @@ class TestNode: def has_libvirt (self): test_ssh=self.create_test_ssh() - return test_ssh.run ("rpm -q libvirt-client")==0 + return test_ssh.run ("rpm -q --quiet libvirt-client")==0 - def check_systemslice (self, slicename,dry_run=False): + def _check_system_slice (self, slicename,dry_run=False): sitename=self.test_plc.plc_spec['PLC_SLICE_PREFIX'] vservername="%s_%s"%(sitename,slicename) test_ssh=self.create_test_ssh() if self.has_libvirt(): + utils.header("Checking system slice %s using virsh"%slicename) return test_ssh.run("virsh --connect lxc:// list | grep -q ' %s '"%vservername, dry_run=dry_run)==0 else: (retcod,output)=utils.output_of(test_ssh.actual_command("cat /vservers/%s/etc/slicefamily 2> /dev/null")%vservername) # get last line only as ssh pollutes the output slicefamily=output.split("\n")[-1] - utils.header("system slice %s has slicefamily %s"%(slicename, slicefamily)) + utils.header("Found slicefamily '%s'for slice %s"%(slicefamily,slicename)) if retcod != 0: return False + utils.header("Checking system slice %s using vserver-stat"%slicename) return test_ssh.run("vserver-stat | grep %s"%vservername,dry_run=dry_run)==0