X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestMain.py;h=1f0945f9bd89d0c8b25f95622fbfabf20ec59c4e;hb=7e091116edb3263daceb18ef3ae3467999184722;hp=aae90c7fe1124b19d70e8e9a78898234286292da;hpb=7d1382e0f7ce9c37b5558b684a218572b8a3e74f;p=tests.git diff --git a/system/TestMain.py b/system/TestMain.py index aae90c7..1f0945f 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -8,6 +8,7 @@ from optparse import OptionParser import traceback from time import strftime import readline +import glob import utils from TestPlc import TestPlc @@ -18,11 +19,64 @@ from TestNode import TestNode sys.path.append(os.environ['HOME']) import LocalSubstrate +class Step: + + natives=TestPlc.__dict__ + + def __init__ (self, name): + self.name=name.replace('-','_') + # a native step is implemented as a method on TestPlc + self.native = name in Step.natives + if self.native: + self.method=Step.natives[self.name] + else: + # non-native steps (macros) are implemented as a 'Step' + try: + modulename = 'macro_' + self.name + module = __import__ (modulename) + self.substeps = module.sequence + except Exception,e: + print "Cannot load macro step %s (%s) - exiting"%(self.name,e) + raise + + def norm_name (self): return self.name.replace('_','-') + + def print_doc (self): + if self.native: + print '*',self.norm_name(),"\r",4*"\t", + try: + print self.method.__doc__ + except: + print "*** no doc found" + else: + print '*',self.norm_name(),"\r",3*"\t","========== BEG MACRO step" + for step in self.substeps: + Step(step).print_doc() + print '*',self.norm_name(),"\r",3*"\t","========== END MACRO step" + + # return a list of (name, method) for all native steps involved + def tuples (self): + if self.native: return [ (self.name, self.method,) ] + else: + result=[] + for substep in [ Step(name) for name in self.substeps ] : + result += substep.tuples() + return result + + # convenience for listing macros + # just do a listdir, hoping we're in the right directory... + @staticmethod + def list_macros (): + names= [ filename.replace('macro_','').replace('.py','') for filename in glob.glob ('macro_*.py')] + names.sort() + return names + class TestMain: subversion_id = "Now using git -- version tracker broken" default_config = [ 'default' ] + default_rspec_styles = [ 'pl', 'pg' ] default_build_url = "git://git.onelab.eu/tests" @@ -38,15 +92,21 @@ class TestMain: def init_steps(self): self.steps_message = 20*'x'+" Defaut steps are\n"+TestPlc.printable_steps(TestPlc.default_steps) self.steps_message += 20*'x'+" Other useful steps are\n"+TestPlc.printable_steps(TestPlc.other_steps) + self.steps_message += 20*'x'+" Macro steps are\n"+" ".join(Step.list_macros()) def list_steps(self): if not self.options.verbose: print self.steps_message, else: - testplc_method_dict = __import__("TestPlc").__dict__['TestPlc'].__dict__ - scopes = [("Default steps",TestPlc.default_steps)] - if self.options.all_steps: - scopes.append ( ("Other steps",TestPlc.other_steps) ) + # steps mentioned on the command line + if self.options.args: + scopes = [("Argument steps",self.options.args)] + else: + scopes = [("Default steps",TestPlc.default_steps)] + if self.options.all_steps: + scopes.append ( ("Other steps",TestPlc.other_steps) ) + # try to list macro steps as well + scopes.append ( ("Macro steps", Step.list_macros()) ) for (scope,steps) in scopes: print '--------------------',scope for step in [step for step in steps if TestPlc.valid_step(step)]: @@ -55,18 +115,7 @@ class TestMain: stepname=step for special in ['force']: stepname = stepname.replace(special+'_',"") - print '*',step,"\r",4*"\t", - try: - doc=testplc_method_dict[stepname].__doc__ - except: - try: - # locate the step_ module - modulename='step_'+stepname - doc = __import__(modulename).__doc__ - except: - doc=None - if doc: print doc - else: print "*** no doc found" + Step(stepname).print_doc() def run (self): self.init_steps() @@ -75,7 +124,7 @@ arch-rpms-url defaults to the last value used, as stored in arg-arch-rpms-url, no default config defaults to the last value used, as stored in arg-config, or %r -ips_vnode, ips_vplc and ips_qemu defaults to the last value used, as stored in arg-ips-{node,vplc,qemu}, +ips_vnode, ips_vplc and ips_qemu defaults to the last value used, as stored in arg-ips-{bplc,vplc,bnode,vnode}, default is to use IP scanning steps refer to a method in TestPlc or to a step_* module === @@ -100,16 +149,20 @@ steps refer to a method in TestPlc or to a step_* module help="Run all default steps") parser.add_option("-l","--list",action="store_true",dest="list_steps", default=False, help="List known steps") - parser.add_option("-N","--nodes",action="append", dest="ips_vnode", default=[], - help="Specify the set of hostname/IP's to use for nodes") + parser.add_option("-V","--vserver",action="append", dest="ips_bplc", default=[], + help="Specify the set of hostnames for the boxes that host the plcs") parser.add_option("-P","--plcs",action="append", dest="ips_vplc", default=[], - help="Specify the set of hostname/IP's to use for plcs") - parser.add_option("-Q","--qemus",action="append", dest="ips_qemu", default=[], - help="Specify the set of hostname/IP's to use for qemu boxes") + help="Specify the set of hostname/IP's to use for vplcs") + parser.add_option("-Q","--qemus",action="append", dest="ips_bnode", default=[], + help="Specify the set of hostnames for the boxes that host the nodes") + parser.add_option("-N","--nodes",action="append", dest="ips_vnode", default=[], + help="Specify the set of hostname/IP's to use for vnodes") parser.add_option("-s","--size",action="store",type="int",dest="size",default=1, help="sets test size in # of plcs - default is 1") parser.add_option("-q","--qualifier",action="store",type="int",dest="qualifier",default=None, help="run steps only on plc numbered , starting at 1") + parser.add_option("-y","--rspec-style",action="append",dest="rspec_styles",default=[], + help="pl is for planetlab rspecs, pg is for protogeni") parser.add_option("-k","--keep-going",action="store",dest="keep_going",default=False, help="proceeds even if some steps are failing") parser.add_option("-D","--dbname",action="store",dest="dbname",default=None, @@ -123,7 +176,6 @@ steps refer to a method in TestPlc or to a step_* module parser.add_option("-r","--restart-nm", action="store_true", dest="forcenm", default=False, help="Force the NM to restart in ssh_slices step") parser.add_option("-t","--trace", action="store", dest="trace_file", default=None, - #default="logs/trace-@TIME@.txt", help="Trace file location") (self.options, self.args) = parser.parse_args() @@ -137,15 +189,19 @@ steps refer to a method in TestPlc or to a step_* module result.append(el) return result # flatten relevant options - for optname in ['config','exclude','ips_vnode','ips_vplc','ips_qemu']: + for optname in ['config','exclude','ips_bplc','ips_vplc','ips_bnode','ips_vnode']: setattr(self.options,optname, flatten ( [ arg.split() for arg in getattr(self.options,optname) ] )) + if not self.options.rspec_styles: + self.options.rspec_styles=TestMain.default_rspec_styles + # handle defaults and option persistence for (recname,filename,default,need_reverse) in ( ('build_url','arg-build-url',TestMain.default_build_url,None) , - ('ips_vnode','arg-ips-vnode',[],True) , + ('ips_bplc','arg-ips-bplc',[],True), ('ips_vplc','arg-ips-vplc',[],True) , - ('ips_qemu','arg-ips-qemu',[],True) , + ('ips_bnode','arg-ips-bnode',[],True), + ('ips_vnode','arg-ips-vnode',[],True) , ('config','arg-config',TestMain.default_config,False) , ('arch_rpms_url','arg-arch-rpms-url',"",None) , ('personality','arg-personality',"linux64",None), @@ -196,6 +252,7 @@ steps refer to a method in TestPlc or to a step_* module TestPlc.check_whether_build_has_sfa(self.options.arch_rpms_url) # no step specified + self.options.args = self.args if len(self.args) == 0: self.options.steps=TestPlc.default_steps else: @@ -247,26 +304,31 @@ steps refer to a method in TestPlc or to a step_* module # provision on local substrate all_plc_specs = LocalSubstrate.local_substrate.provision(all_plc_specs,self.options) - # remember plc IP address(es) if not specified + # remember substrate IP address(es) for next run + ips_bplc_file=open('arg-ips-bplc','w') + for plc_spec in all_plc_specs: + ips_bplc_file.write("%s\n"%plc_spec['host_box']) + ips_bplc_file.close() ips_vplc_file=open('arg-ips-vplc','w') for plc_spec in all_plc_specs: ips_vplc_file.write("%s\n"%plc_spec['PLC_API_HOST']) ips_vplc_file.close() # ditto for nodes + ips_bnode_file=open('arg-ips-bnode','w') + for plc_spec in all_plc_specs: + for site_spec in plc_spec['sites']: + for node_spec in site_spec['nodes']: + ips_bnode_file.write("%s\n"%node_spec['host_box']) + ips_bnode_file.close() ips_vnode_file=open('arg-ips-vnode','w') for plc_spec in all_plc_specs: for site_spec in plc_spec['sites']: for node_spec in site_spec['nodes']: + # back to normal (unqualified) form stripped=node_spec['node_fields']['hostname'].split('.')[0] ips_vnode_file.write("%s\n"%stripped) ips_vnode_file.close() - # ditto for qemu boxes - ips_qemu_file=open('arg-ips-qemu','w') - for plc_spec in all_plc_specs: - for site_spec in plc_spec['sites']: - for node_spec in site_spec['nodes']: - ips_qemu_file.write("%s\n"%node_spec['host_box']) - ips_qemu_file.close() + # build a TestPlc object from the result, passing options for spec in all_plc_specs: spec['failed_step'] = False @@ -276,7 +338,6 @@ steps refer to a method in TestPlc or to a step_* module utils.init_options(self.options) overall_result = True - testplc_method_dict = __import__("TestPlc").__dict__['TestPlc'].__dict__ all_step_infos=[] for step in self.options.steps: if not TestPlc.valid_step(step): @@ -286,51 +347,35 @@ steps refer to a method in TestPlc or to a step_* module if step.find("force_") == 0: step=step.replace("force_","") force=True - # a cross step will run a method on TestPlc that has a signature like - # def cross_foo (self, all_test_plcs) - cross=False - if step.find("cross_") == 0: - cross=True # allow for steps to specify an index like in # run checkslice@2 try: (step,qualifier)=step.split('@') except: qualifier=self.options.qualifier - # try and locate a method in TestPlc - if testplc_method_dict.has_key(step): - all_step_infos += [ (step, testplc_method_dict[step] , force, cross, qualifier)] - # otherwise search for the 'run' method in the step_ module - else: - modulename='step_'+step - try: - # locate all methods named run* in the module - module_dict = __import__(modulename).__dict__ - names = [ key for key in module_dict.keys() if key.find("run")==0 ] - if not names: - raise Exception,"No run* method in module %s"%modulename - names.sort() - all_step_infos += [ ("%s.%s"%(step,name),module_dict[name],force,cross,qualifier) for name in names ] - except : - utils.header("********** FAILED step %s (NOT FOUND) -- won't be run"%step) - traceback.print_exc() - overall_result = False + try: + stepobj = Step (step) + for (substep, method) in stepobj.tuples(): + # a cross step will run a method on TestPlc that has a signature like + # def cross_foo (self, all_test_plcs) + cross=False + if substep.find("cross_") == 0: + cross=True + all_step_infos.append ( (substep, method, force, cross, qualifier, ) ) + except : + utils.header("********** FAILED step %s (NOT FOUND) -- won't be run"%step) + traceback.print_exc() + overall_result = False if self.options.dry_run: self.show_env(self.options,"Dry run") # init & open trace file if provided if self.options.trace_file and not self.options.dry_run: - time=strftime("%H-%M") - date=strftime("%Y-%m-%d") - trace_file=self.options.trace_file - trace_file=trace_file.replace("@TIME@",time) - trace_file=trace_file.replace("@DATE@",date) - self.options.trace_file=trace_file # create dir if needed - trace_dir=os.path.dirname(trace_file) + trace_dir=os.path.dirname(self.options.trace_file) if trace_dir and not os.path.isdir(trace_dir): os.makedirs(trace_dir) - trace=open(trace_file,"w") + trace=open(self.options.trace_file,"w") # do all steps on all plcs TIME_FORMAT="%H-%M-%S" @@ -352,7 +397,7 @@ steps refer to a method in TestPlc or to a step_* module if self.options.interactive: prompting=True while prompting: - msg="%d Run step %s on %s [r](un)/d(ry_run)/s(kip)/q(uit) ? "%(plc_counter,stepname,plcname) + msg="%d Run step %s on %s [r](un)/d(ry_run)/p(roceed)/s(kip)/q(uit) ? "%(plc_counter,stepname,plcname) answer=raw_input(msg).strip().lower() or "r" answer=answer[0] if answer in ['s','n']: # skip/no/next @@ -373,6 +418,10 @@ steps refer to a method in TestPlc or to a step_* module self.options.dry_run=dry_run plc_obj.options.dry_run=dry_run plc_obj.apiserver.set_dry_run(dry_run) + elif answer in ['p']: + # take it as a yes and leave interactive mode + prompting=False + self.options.interactive=False elif answer in ['r','y']: # run/yes prompting=False if skip_step: