X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=35c6722490835bea6f0a4a91ed4ad4f358a3fa1f;hb=161ead318cbbb6c79437f209052e8a938cce7ec7;hp=ef5fc7a565f75edafa0b18234c330d15159926c0;hpb=e4ba92acdf32c10601450aec20e917750223d746;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index ef5fc7a..35c6722 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -64,6 +64,46 @@ def slice_mapper (method): actual.__doc__=TestSlice.__dict__[method.__name__].__doc__ return actual +# run a step but return True so that we can go on +def ignore_result (method): + def wrappee (self): + # ssh_slice_ignore->ssh_slice + ref_name=method.__name__.replace('_ignore','').replace('force_','') + ref_method=TestPlc.__dict__[ref_name] + result=ref_method(self) + print "Actual (but ignored) result for %(ref_name)s is %(result)s"%locals() + return Ignored (result) + wrappee.__doc__="ignored version of " + method.__name__.replace('_ignore','').replace('ignore_','') + return wrappee + +# a variant that expects the TestSlice method to return a list of CompleterTasks that +# are then merged into a single Completer run to avoid wating for all the slices +# esp. useful when a test fails of course +# because we need to pass arguments we use a class instead.. +class slice_mapper__tasks (object): + # could not get this to work with named arguments + def __init__ (self,timeout_minutes,silent_minutes,period_seconds): + self.timeout=timedelta(minutes=timeout_minutes) + self.silent=timedelta(minutes=silent_minutes) + self.period=timedelta(seconds=period_seconds) + def __call__ (self, method): + decorator_self=self + # compute augmented method name + method_name = method.__name__ + "__tasks" + # locate in TestSlice + slice_method = TestSlice.__dict__[ method_name ] + def wrappee(self): + tasks=[] + for slice_spec in self.plc_spec['slices']: + site_spec = self.locate_site (slice_spec['sitename']) + test_site = TestSite(self,site_spec) + test_slice=TestSlice(self,test_site,slice_spec) + tasks += slice_method (test_slice, self.options) + return Completer (tasks).run (decorator_self.timeout, decorator_self.silent, decorator_self.period) + # restore the doc text from the TestSlice method even if a bit odd + wrappee.__doc__ = slice_method.__doc__ + return wrappee + def auth_sfa_mapper (method): def actual(self): overall=True @@ -76,6 +116,10 @@ def auth_sfa_mapper (method): actual.__doc__=TestAuthSfa.__dict__[method.__name__].__doc__ return actual +class Ignored: + def __init__ (self,result): + self.result=result + SEP='' SEPSFA='' @@ -84,6 +128,7 @@ class TestPlc: default_steps = [ 'show', SEP, 'vs_delete','timestamp_vs','vs_create', SEP, +# 'plc_install', 'mod_python', 'plc_configure', 'plc_start', SEP, 'plc_install', 'plc_configure', 'plc_start', SEP, 'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP, 'plcapi_urls','speed_up_slices', SEP, @@ -92,7 +137,7 @@ class TestPlc: # keep this our of the way for now # 'check_vsys_defaults', SEP, 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP, - 'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', SEP, + 'qemu_kill_mine','qemu_clean_mine', 'qemu_export', 'qemu_start', 'timestamp_qemu', SEP, 'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA, 'sfi_configure@1', 'sfa_add_site@1','sfa_add_pi@1', SEPSFA, 'sfa_add_user@1', 'sfa_update_user@1', 'sfa_add_slice@1', 'sfa_renew_slice@1', SEPSFA, @@ -101,11 +146,14 @@ class TestPlc: # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot # but as the stress test might take a while, we sometimes missed the debug mode.. 'ssh_node_debug@1', 'plcsh_stress_test@1', SEP, - 'ssh_node_boot@1', 'node_bmlogs@1', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts', SEP, + 'ssh_node_boot@1', 'node_bmlogs@1', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts_ignore', SEP, 'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA, 'cross_check_tcp@1', 'check_system_slice', SEP, - 'empty_slices', 'ssh_slice_off', 'fill_slices', SEP, - 'force_gather_logs', SEP, + # check slices are turned off properly + 'empty_slices', 'ssh_slice_off', SEP, + # check they are properly re-created with the same name + 'fill_slices', 'ssh_slice_again_ignore', SEP, + 'gather_logs_force', SEP, ] other_steps = [ 'export', 'show_boxes', SEP, @@ -121,7 +169,7 @@ class TestPlc: 'plc_db_dump' , 'plc_db_restore', SEP, 'check_netflow','check_drl', SEP, 'debug_nodemanager', SEP, - 'standby_1_through_20',SEP, + 'standby_1_through_20','yes','no',SEP, ] @staticmethod @@ -196,35 +244,22 @@ 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 -o UserKnownHostsFile=/dev/null %s %s"%(self.vserverip,command) - else: - return "vserver %s exec %s"%(self.vservername,command) + return "virsh -c lxc:/// lxc-enter-namespace %s %s" %(self.vservername,command) +# return "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null %s %s"%(self.vserverip,command) + # this /vservers thing is legacy... def vm_root_in_host(self): - if self.options.plcs_use_lxc: - return "/vservers/%s/rootfs/"%(self.vservername) - else: - return "/vservers/%s"%(self.vservername) + return "/vservers/%s/"%(self.vservername) def vm_timestamp_path (self): - if self.options.plcs_use_lxc: - return "/vservers/%s/%s.timestamp"%(self.vservername,self.vservername) - else: - return "/vservers/%s.timestamp"%(self.vservername) + return "/vservers/%s/%s.timestamp"%(self.vservername,self.vservername) #start/stop the vserver def start_guest_in_host(self): - if self.options.plcs_use_lxc: - return "virsh -c lxc:// start %s"%(self.vservername) - else: - return "vserver %s start"%(self.vservername) + return "virsh -c lxc:/// start %s"%(self.vservername) def stop_guest_in_host(self): - if self.options.plcs_use_lxc: - return "virsh -c lxc:// destroy %s"%(self.vservername) - else: - return "vserver %s stop"%(self.vservername) + return "virsh -c lxc:/// destroy %s"%(self.vservername) # xxx quick n dirty def run_in_guest_piped (self,local,remote): @@ -329,7 +364,7 @@ class TestPlc: return self.locate_sliver_obj(nodename,slicename) # all different hostboxes used in this plc - def gather_hostBoxes(self): + def get_BoxNodes(self): # maps on sites and nodes, return [ (host_box,test_node) ] tuples=[] for site_spec in self.plc_spec['sites']: @@ -350,7 +385,7 @@ class TestPlc: # a step for checking this stuff def show_boxes (self): 'print summary of nodes location' - for (box,nodes) in self.gather_hostBoxes().iteritems(): + for (box,nodes) in self.get_BoxNodes().iteritems(): print box,":"," + ".join( [ node.name() for node in nodes ] ) return True @@ -358,7 +393,7 @@ class TestPlc: def qemu_kill_all(self): 'kill all qemu instances on the qemu boxes involved by this setup' # this is the brute force version, kill all qemus on that host box - for (box,nodes) in self.gather_hostBoxes().iteritems(): + for (box,nodes) in self.get_BoxNodes().iteritems(): # pass the first nodename, as we don't push template-qemu on testboxes nodedir=nodes[0].nodedir() TestBoxQemu(box,self.options.buildname).qemu_kill_all(nodedir) @@ -367,24 +402,33 @@ class TestPlc: # make this a valid step def qemu_list_all(self): 'list all qemu instances on the qemu boxes involved by this setup' - for (box,nodes) in self.gather_hostBoxes().iteritems(): + for (box,nodes) in self.get_BoxNodes().iteritems(): # this is the brute force version, kill all qemus on that host box TestBoxQemu(box,self.options.buildname).qemu_list_all() return True - # kill only the right qemus + # kill only the qemus related to this test def qemu_list_mine(self): 'list qemu instances for our nodes' - for (box,nodes) in self.gather_hostBoxes().iteritems(): + for (box,nodes) in self.get_BoxNodes().iteritems(): # the fine-grain version for node in nodes: node.list_qemu() return True + # kill only the qemus related to this test + def qemu_clean_mine(self): + 'cleanup (rm -rf) qemu instances for our nodes' + for (box,nodes) in self.get_BoxNodes().iteritems(): + # the fine-grain version + for node in nodes: + node.qemu_clean() + return True + # kill only the right qemus def qemu_kill_mine(self): 'kill the qemu instances for our nodes' - for (box,nodes) in self.gather_hostBoxes().iteritems(): + for (box,nodes) in self.get_BoxNodes().iteritems(): # the fine-grain version for node in nodes: node.kill_qemu() @@ -410,10 +454,7 @@ class TestPlc: domain=socket.gethostname().split('.',1)[1] fqdn="%s.%s"%(self.plc_spec['host_box'],domain) print "export BUILD=%s"%self.options.buildname - if self.options.plcs_use_lxc: - print "export PLCHOSTLXC=%s"%fqdn - else: - print "export PLCHOSTVS=%s"%fqdn + print "export PLCHOSTLXC=%s"%fqdn print "export GUESTNAME=%s"%self.plc_spec['vservername'] vplcname=self.plc_spec['vservername'].split('-')[-1] print "export GUESTHOSTNAME=%s.%s"%(vplcname,domain) @@ -545,14 +586,10 @@ class TestPlc: "vserver delete the test myplc" 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("virsh -c lxc:// destroy %s"%self.vservername) - self.run_in_host("virsh -c lxc:// undefine %s"%self.vservername) - self.run_in_host("rm -fr /vservers/%s"%self.vservername) - return True - else: - self.run_in_host("vserver --silent %s delete"%self.vservername) - return True + self.run_in_host("virsh -c lxc:// destroy %s"%self.vservername) + self.run_in_host("virsh -c lxc:// undefine %s"%self.vservername) + self.run_in_host("rm -fr /vservers/%s"%self.vservername) + return True ### install # historically the build was being fetched by the tests @@ -578,25 +615,24 @@ class TestPlc: repo_url = self.options.arch_rpms_url for level in [ 'arch' ]: repo_url = os.path.dirname(repo_url) - # pass the vbuild-nightly options to vtest-init-vserver - test_env_options="" - test_env_options += " -p %s"%self.options.personality - test_env_options += " -d %s"%self.options.pldistro - test_env_options += " -f %s"%self.options.fcdistro - if self.options.plcs_use_lxc: - script="vtest-init-lxc.sh" - else: - script="vtest-init-vserver.sh" + + # invoke initvm (drop support for vs) + script="lbuild-initvm.sh" + script_options="" + # pass the vbuild-nightly options to [lv]test-initvm + script_options += " -p %s"%self.options.personality + script_options += " -d %s"%self.options.pldistro + script_options += " -f %s"%self.options.fcdistro + script_options += " -r %s"%repo_url vserver_name = self.vservername - vserver_options="--netdev eth0 --interface %s"%self.vserverip try: vserver_hostname=socket.gethostbyaddr(self.vserverip)[0] - vserver_options += " --hostname %s"%vserver_hostname + script_options += " -n %s"%vserver_hostname except: print "Cannot reverse lookup %s"%self.vserverip print "This is considered fatal, as this might pollute the test results" return False - create_vserver="%(build_dir)s/%(script)s %(test_env_options)s %(vserver_name)s %(repo_url)s -- %(vserver_options)s"%locals() + create_vserver="%(build_dir)s/%(script)s %(script_options)s %(vserver_name)s"%locals() return self.run_in_host(create_vserver) == 0 ### install_rpm @@ -624,6 +660,11 @@ class TestPlc: pkgs_string=" ".join(pkgs_list) return self.yum_install (pkgs_list) + ### + def mod_python(self): + """yum install mod_python, useful on f18 and above so as to avoid broken wsgi""" + return self.yum_install ( [ 'mod_python' ] ) + ### def plc_configure(self): "run plc-config-tty" @@ -657,14 +698,35 @@ class TestPlc: utils.system('rm %s'%tmpname) return True +# f14 is a bit odd in this respect, although this worked fine in guests up to f18 +# however using a vplc guest under f20 requires this trick +# the symptom is this: service plc start +# Starting plc (via systemctl): Failed to get D-Bus connection: \ +# Failed to connect to socket /org/freedesktop/systemd1/private: Connection refused +# weird thing is the doc says f14 uses upstart by default and not systemd +# so this sounds kind of harmless def plc_start(self): - "service plc start" - self.run_in_guest('service plc start') + "service plc start (use a special trick to set SYSTEMCTL_SKIP_REDIRECT on f14)" + if self.options.fcdistro != 'f14': + self.run_in_guest ("service plc start") + else: + # patch /sbin/service so it does not reset environment + # this is because our own scripts in turn call service + self.run_in_guest ("sed -i -e 's,env -i ,,' /sbin/service") + self.run_in_guest("SYSTEMCTL_SKIP_REDIRECT=true /etc/init.d/plc start") + # retcod of service is not meaningful return True def plc_stop(self): - "service plc stop" - self.run_in_guest('service plc stop') + "service plc stop (use a special trick to set SYSTEMCTL_SKIP_REDIRECT on f14)" + if self.options.fcdistro != 'f14': + self.run_in_guest ("service plc stop") + else: + # patch /sbin/service so it does not reset environment + # this is because our own scripts in turn call service + self.run_in_guest ("sed -i -e 's,env -i ,,' /sbin/service") + self.run_in_guest("SYSTEMCTL_SKIP_REDIRECT=true /etc/init.d/plc stop") + # retcod of service is not meaningful return True def vs_start (self): @@ -1120,10 +1182,16 @@ class TestPlc: test_slice.create_slice() return True - @slice_mapper + @slice_mapper__tasks(20,10,15) def ssh_slice(self): pass - @slice_mapper + @slice_mapper__tasks(20,19,15) def ssh_slice_off (self): pass + + # use another name so we can exclude/ignore it from the tests on the nightly command line + def ssh_slice_again(self): return self.ssh_slice() + # note that simply doing ssh_slice_again=ssh_slice would kind od work too + # but for some reason the ignore-wrapping thing would not + @slice_mapper def ssh_slice_basics(self): pass @@ -1645,6 +1713,26 @@ class TestPlc: utils.header('Database restored from ' + dump) + @staticmethod + def create_ignore_steps (): + for step in TestPlc.default_steps + TestPlc.other_steps: + # default step can have a plc qualifier + if '@' in step: (step,qualifier)=step.split('@') + # or be defined as forced or ignored by default + for keyword in ['_ignore','_force']: + if step.endswith (keyword): step=step.replace(keyword,'') + if step == SEP or step == SEPSFA : continue + method=getattr(TestPlc,step) + name=step+'_ignore' + wrapped=ignore_result(method) +# wrapped.__doc__ = method.__doc__ + " (run in ignore-result mode)" + setattr(TestPlc, name, wrapped) + +# @ignore_result +# def ssh_slice_again_ignore (self): pass +# @ignore_result +# def check_initscripts_ignore (self): pass + def standby_1_through_20(self): """convenience function to wait for a specified number of minutes""" pass @@ -1688,3 +1776,7 @@ class TestPlc: def standby_19(): pass @standby_generic def standby_20(): pass + + # convenience for debugging the test logic + def yes (self): return True + def no (self): return False