X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=7d3ba22fdd2c374bee827fc5297db2e87f9df265;hb=5550f529209845d103ea5c064de00332bca48646;hp=86f31f49921144f906cb7779b7a711d4f937a390;hpb=2c60ea6a43bbf16cb2b4ebc67995dd3cb8cd01b0;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index 86f31f4..7d3ba22 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -67,9 +67,7 @@ def slice_sfa_mapper (method): overall=True slice_method = TestSliceSfa.__dict__[method.__name__] for slice_spec in self.plc_spec['sfa']['sfa_slice_specs']: - site_spec = self.locate_site (slice_spec['sitename']) - test_site = TestSite(self,site_spec) - test_slice=TestSliceSfa(self,test_site,slice_spec) + test_slice=TestSliceSfa(self,slice_spec) if not slice_method(test_slice,self.options): overall=False return overall # restore the doc text @@ -90,7 +88,8 @@ class TestPlc: 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP, 'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', SEP, 'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA, - 'sfi_configure@1', 'sfa_add_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA, + 'sfi_configure@1', 'sfa_add_site@1','sfa_add_pi@1', SEPSFA, + 'sfa_add_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA, 'sfa_create_slice@1', 'sfa_check_slice_plc@1', SEPSFA, 'sfa_update_user@1', 'sfa_update_slice@1', 'sfa_view@1', 'sfa_utest@1',SEPSFA, # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot @@ -98,7 +97,7 @@ class TestPlc: 'ssh_node_debug@1', 'plcsh_stress_test@1', SEP, 'ssh_node_boot@1', 'ssh_slice', 'check_initscripts', SEP, 'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA, - 'check_tcp', 'check_netflow', SEP, + 'check_tcp', 'check_sys_slice', SEP, 'force_gather_logs', SEP, ] other_steps = [ @@ -146,6 +145,9 @@ class TestPlc: self.url="https://%s:443/PLCAPI/"%plc_spec['vserverip'] self.apiserver=TestApiserver(self.url,options.dry_run) + def has_addresses_api (self): + return self.apiserver.has_method('AddIpAddress') + def name(self): name=self.plc_spec['name'] return "%s.%s"%(name,self.vservername) @@ -179,7 +181,7 @@ class TestPlc: #command gets run in the plc's vm def host_to_guest(self,command): if self.options.plcs_use_lxc: - return "ssh -o StrictHostKeyChecking=no %s %s"%(self.hostname(),command) + return "ssh -o StrictHostKeyChecking=no %s %s"%(self.vserverip,command) else: return "vserver %s exec %s"%(self.vservername,command) @@ -191,14 +193,14 @@ class TestPlc: def vm_timestamp_path (self): if self.options.plcs_use_lxc: - return "/var/lib/lxc/%s.timestamp"%(self.vservername) + return "/var/lib/lxc/%s/%s.timestamp"%(self.vservername,self.vservername) else: return "/vservers/%s.timestamp"%(self.vservername) #start/stop the vserver def start_guest_in_host(self): if self.options.plcs_use_lxc: - return "lxc-start --name=%s"%(self.vservername) + return "lxc-start --daemon --name=%s"%(self.vservername) else: return "vserver %s start"%(self.vservername) @@ -357,8 +359,8 @@ class TestPlc: #################### display config def show (self): "show test configuration after localization" - self.display_pass (1) - self.display_pass (2) + self.show_pass (1) + self.show_pass (2) return True def export (self): @@ -367,8 +369,13 @@ class TestPlc: domain=socket.gethostname().split('.',1)[1] fqdn="%s.%s"%(self.plc_spec['host_box'],domain) print "export BUILD=%s"%self.options.buildname - print "export PLCHOST=%s"%fqdn - print "export GUEST=%s"%self.plc_spec['vservername'] + if self.options.plcs_use_lxc: + print "export PLCHOSTLXC=%s"%fqdn + else: + print "export PLCHOSTVS=%s"%fqdn + print "export GUESTNAME=%s"%self.plc_spec['vservername'] + vplcname=self.plc_spec['vservername'].split('-')[-1] + print "export GUESTHOSTNAME=%s.%s"%(vplcname,domain) # find hostname of first node (hostname,qemubox) = self.all_node_infos()[0] print "export KVMHOST=%s.%s"%(qemubox,domain) @@ -377,7 +384,7 @@ class TestPlc: # entry point always_display_keys=['PLC_WWW_HOST','nodes','sites',] - def display_pass (self,passno): + def show_pass (self,passno): for (key,val) in self.plc_spec.iteritems(): if not self.options.verbose and key not in TestPlc.always_display_keys: continue if passno == 2: @@ -487,7 +494,7 @@ class TestPlc: # a first approx. is to store the timestamp close to the VM root like vs does stamp_path=self.vm_timestamp_path () stamp_dir = os.path.dirname (stamp_path) - utils.system(self.test_ssh.actual_command("mkdir -p %s"%stamp_dir) + utils.system(self.test_ssh.actual_command("mkdir -p %s"%stamp_dir)) return utils.system(self.test_ssh.actual_command("echo %d > %s"%(now,stamp_path)))==0 # this is called inconditionnally at the beginning of the test sequence @@ -497,6 +504,7 @@ class TestPlc: stamp_path=self.vm_timestamp_path() self.run_in_host("rm -f %s"%stamp_path) if self.options.plcs_use_lxc: + self.run_in_host("lxc-stop --name %s"%self.vservername) self.run_in_host("lxc-destroy --name %s"%self.vservername) return True else: @@ -1119,9 +1127,12 @@ class TestPlc: return overall # painfully enough, we need to allow for some time as netflow might show up last - def check_netflow (self): - "all nodes: check that the netflow slice is alive" - return self.check_systemslice ('netflow') + def check_sys_slice (self): + "all nodes: check that a system slice is alive" +# would probably make more sense to check for netflow, +# but that one is currently not working in the lxc distro +# return self.check_systemslice ('netflow') + return self.check_systemslice ('drl') # we have the slices up already here, so it should not take too long def check_systemslice (self, slicename, timeout_minutes=5, period=15): @@ -1129,7 +1140,7 @@ class TestPlc: test_nodes=self.all_nodes() while test_nodes: for test_node in test_nodes: - if test_node.check_systemslice (slicename): + if test_node.check_systemslice (slicename,dry_run=self.options.dry_run): utils.header ("ok") test_nodes.remove(test_node) else: @@ -1181,10 +1192,9 @@ class TestPlc: def sfa_dbclean(self): "thoroughly wipes off the SFA database" - self.run_in_guest("sfa-nuke.py")==0 or \ - self.run_in_guest("sfa-nuke-plc.py") or \ - self.run_in_guest("sfaadmin.py registry nuke") - return True + return self.run_in_guest("sfaadmin.py registry nuke")==0 or \ + self.run_in_guest("sfa-nuke.py")==0 or \ + self.run_in_guest("sfa-nuke-plc.py")==0 def sfa_plcclean(self): "cleans the PLC entries that were created as a side effect of running the script" @@ -1192,13 +1202,14 @@ class TestPlc: sfa_spec=self.plc_spec['sfa'] for sfa_slice_spec in sfa_spec['sfa_slice_specs']: - slicename='%s_%s'%(sfa_slice_spec['login_base'],sfa_slice_spec['slicename']) - try: self.apiserver.DeleteSlice(self.auth_root(),slicename) - except: print "Slice %s already absent from PLC db"%slicename + login_base=sfa_slice_spec['login_base'] + try: self.apiserver.DeleteSite (self.auth_root(),login_base) + except: print "Site %s already absent from PLC db"%login_base - username="%s@%s"%(sfa_slice_spec['regularuser'],sfa_slice_spec['domain']) - try: self.apiserver.DeletePerson(self.auth_root(),username) - except: print "User %s already absent from PLC db"%username + for key in ['piuser','regularuser']: + username="%s@%s"%(sfa_slice_spec[key],sfa_slice_spec['domain']) + try: self.apiserver.DeletePerson(self.auth_root(),username) + except: print "User %s already absent from PLC db"%username print "REMEMBER TO RUN sfa_import AGAIN" return True @@ -1340,10 +1351,9 @@ class TestPlc: sfa_spec=self.plc_spec['sfa'] # cannot use sfa_slice_mapper to pass dir_name for slice_spec in self.plc_spec['sfa']['sfa_slice_specs']: - site_spec = self.locate_site (slice_spec['sitename']) - test_site = TestSite(self,site_spec) - test_slice=TestSliceSfa(self,test_site,slice_spec) - dir_name=self.confsubdir("dot-sfi/%s"%slice_spec['slicename'],clean=True,dry_run=self.options.dry_run) + test_slice=TestSliceSfa(self,slice_spec) + dir_basename=os.path.basename(test_slice.sfi_path()) + dir_name=self.confsubdir("dot-sfi/%s"%dir_basename,clean=True,dry_run=self.options.dry_run) test_slice.sfi_config(dir_name) # push into the remote /root/sfi area location = test_slice.sfi_path() @@ -1359,6 +1369,16 @@ class TestPlc: self.run_in_guest("rm -rf /root/sfi") return True + @slice_sfa_mapper + def sfa_add_site (self): + "bootstrap a site using sfaadmin" + pass + + @slice_sfa_mapper + def sfa_add_pi (self): + "bootstrap a PI user for that site" + pass + @slice_sfa_mapper def sfa_add_user(self): "run sfi.py add" @@ -1436,6 +1456,7 @@ class TestPlc: "gets all possible logs from plc's/qemu node's/slice's for future reference" # (1.a) get the plc's /var/log/ and store it locally in logs/myplc.var-log./* # (1.b) get the plc's /var/lib/pgsql/data/pg_log/ -> logs/myplc.pgsql-log./* + # (1.c) get the plc's /root/sfi -> logs/sfi./ # (2) get all the nodes qemu log and store it as logs/node.qemu..log # (3) get the nodes /var/log and store is as logs/node.var-log./* # (4) as far as possible get the slice's /var/log as logs/sliver.var-log./* @@ -1445,6 +1466,9 @@ class TestPlc: # (1.b) print "-------------------- TestPlc.gather_logs : PLC's /var/lib/psql/data/pg_log/" self.gather_pgsql_logs () + # (1.c) + print "-------------------- TestPlc.gather_logs : PLC's /root/sfi/" + self.gather_root_sfi () # (2) print "-------------------- TestPlc.gather_logs : nodes's QEMU logs" for site_spec in self.plc_spec['sites']: @@ -1482,6 +1506,12 @@ class TestPlc: command = to_plc + "| tar -C logs/myplc.pgsql-log.%s -xf -"%self.name() utils.system(command) + def gather_root_sfi (self): + utils.system("mkdir -p logs/sfi.%s"%self.name()) + to_plc = self.actual_command_in_guest("tar -C /root/sfi/ -cf - .") + command = to_plc + "| tar -C logs/sfi.%s -xf -"%self.name() + utils.system(command) + def gather_nodes_var_logs (self): for site_spec in self.plc_spec['sites']: test_site = TestSite (self,site_spec)