X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=54ea416fd802b3dc527329ac9f31c83e4ffb9390;hb=c9b1f49bcd36492664afbd091f0468b144aa7e85;hp=687b526c06b79038f514a5d3c5a0eaa8e62e1397;hpb=acc29368268d995c2965a917409dba89d2373397;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index 687b526..54ea416 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -6,7 +6,7 @@ import xmlrpclib import utils from TestUser import TestUser -from TestBox import TestBox +from TestBoxQemu import TestBoxQemu from TestSsh import TestSsh class TestNode: @@ -51,12 +51,12 @@ class TestNode: utils.header("WARNING : qemu nodes need a host box") return 'localhost' - # this returns a TestBox instance - cached in .test_box_value + # this returns a TestBoxQemu 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()) + self.test_box_value = TestBoxQemu (self.host_box(),self.buildname()) return self.test_box_value def create_node (self): @@ -67,17 +67,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']: @@ -108,7 +121,7 @@ class TestNode: 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 init_node(self): + def qemu_local_init(self): utils.system("rm -rf %s"%self.nodedir()) utils.system("mkdir %s"%self.nodedir()) if not self.is_qemu(): @@ -135,12 +148,30 @@ class TestNode: file(filename,'w').write(base64.b64decode(encoded)) return True - def reinstall_node (self): + def nodestate_reinstall (self): self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(), self.name(),{'boot_state':'reinstall'}) return True - def configure_qemu(self): + def nodestate_safeboot (self): + self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(), + self.name(),{'boot_state':'safeboot'}) + return True + + def nodestate_boot (self): + 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: + 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'] + print self.name(),':',state + return True + + def qemu_local_config(self): if not self.is_qemu(): return mac=self.node_spec['interface_fields']['mac'] @@ -162,7 +193,7 @@ class TestNode: file.close() return True - def export_qemu (self): + def qemu_export (self): # if relevant, push the qemu area onto the host box if self.test_box().is_local(): return True @@ -171,17 +202,22 @@ class TestNode: 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): + def qemu_start (self): model=self.node_spec['node_fields']['model'] #starting the Qemu nodes before if self.is_qemu(): self.start_qemu() else: - utils.header("TestNode.start_node : %s model %s taken as real node"%(self.name(),model)) + utils.header("TestNode.qemu_start : %s model %s taken as real node"%(self.name(),model)) return True + def timestamp_qemu (self): + test_box = self.test_box() + test_box.run_in_buildname("mkdir -p %s"%self.nodedir()) + now=int(time.time()) + return test_box.run_in_buildname("echo %d > %s/timestamp"%(now,self.nodedir()))==0 + 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())) @@ -208,10 +244,10 @@ class TestNode: if not self.is_qemu(): return True remote_log="%s/log.txt"%self.nodedir() - local_log="logs/node.qemu.%s.log"%self.name() + local_log="logs/node.qemu.%s.txt"%self.name() self.test_box().test_ssh.fetch(remote_log,local_log) - def clear_known_hosts (self): + def keys_clear_known_hosts (self): TestSsh(self.name()).clear_known_hosts() return True @@ -248,3 +284,24 @@ class TestNode: utils.header ("SUCCESS: node hook %s OK"%script_name) return True + def has_libvirt (self): + test_ssh=self.create_test_ssh() + return test_ssh.run ("rpm -q libvirt-client")==0 + + def check_systemslice (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(): + 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)) + if retcod != 0: + return False + return test_ssh.run("vserver-stat | grep %s"%vservername,dry_run=dry_run)==0 + +