X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=system%2FTestMain.py;h=ae69fd82f2781d7c01ad58e948832def2d5c4792;hb=84c56ab4b28273e9f2a4b318895acb8224945fa9;hp=6b0c9fbe1631cc0429ce8921c8b41130443207c0;hpb=9fe430213f6cc2865f6159af132ffbcd2e677cb4;p=tests.git diff --git a/system/TestMain.py b/system/TestMain.py index 6b0c9fb..ae69fd8 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -8,21 +8,89 @@ from optparse import OptionParser import traceback from time import strftime import readline +import glob import utils from TestPlc import TestPlc from TestSite import TestSite from TestNode import TestNode +from macros import sequences # add $HOME in PYTHONPATH so we can import LocalSubstrate.py sys.path.append(os.environ['HOME']) import LocalSubstrate +class Step: + + natives=TestPlc.__dict__ + + def display (self): return self.name.replace('_','-') + def internal (self): return self.name.replace('-','_') + + def __init__ (self, name): + self.name=name + # a native step is implemented as a method on TestPlc + self.native = self.internal() in Step.natives + if self.native: + self.method=Step.natives[self.internal()] + else: + try: + self.substeps=sequences[self.internal()] + except Exception,e: + print "macro step %s not found in macros.py (%s) - exiting"%(self.display(),e) + raise + + def print_doc (self,level=0): + tab=32 + trail=8 + if self.native: + start=level*' '+'* ' + # 2 is the len of '* ' + width=tab-level-2 + format="%%-%ds"%width + line=start+format%self.display() + print line, + try: + print self.method.__doc__ + except: + print "*** no doc found" + else: + beg_start=level*' '+'>>> ' + end_start=level*' '+'<<< ' + trailer=trail*'-' + # 4 is the len of '>>> ' + width=tab-level-4-trail + format=("%%-%ds"%width) + beg_line=beg_start+format%self.display()+trail*'>' + end_line=end_start+format%self.display()+trail*'<' + print beg_line + for step in self.substeps: + Step(step).print_doc(level+1) + print end_line + + # return a list of (name, method) for all native steps involved + def tuples (self): + if self.native: return [ (self.internal(), 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= sequences.keys() + 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 +106,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 +129,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() @@ -94,7 +157,7 @@ steps refer to a method in TestPlc or to a step_* module help="pldistro - as in vbuild-nightly") parser.add_option("-f","--fcdistro",action="store", dest="fcdistro", help="fcdistro - as in vbuild-nightly") - parser.add_option("-x","--exclude",action="append", dest="exclude", default=[], + parser.add_option("-e","--exclude",action="append", dest="exclude", default=[], help="steps to exclude - can be set multiple times, or use quotes") parser.add_option("-a","--all",action="store_true",dest="all_steps", default=False, help="Run all default steps") @@ -108,10 +171,14 @@ steps refer to a method in TestPlc or to a step_* module 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 ('-X', "--lxc",action='store_true',dest='plcs_use_lxc', + help='use lxc-enabled plc boxes instead of vs-enabled ones') 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, @@ -125,7 +192,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() @@ -142,6 +208,9 @@ steps refer to a method in TestPlc or to a step_* module 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) , @@ -154,20 +223,24 @@ steps refer to a method in TestPlc or to a step_* module ('personality','arg-personality',"linux64",None), ('pldistro','arg-pldistro',"onelab",None), ('fcdistro','arg-fcdistro','f14',None), + ('plcs_use_lxc','arg-plcs-use-lxc',False,None), ) : # print 'handling',recname path=filename is_list = isinstance(default,list) + is_bool = isinstance(default,bool) if not getattr(self.options,recname): try: parsed=file(path).readlines() - if not is_list: # strings + if is_list: # lists + parsed=[x.strip() for x in parsed] + else: # strings and booleans if len(parsed) != 1: print "%s - error when parsing %s"%(sys.argv[1],path) sys.exit(1) parsed=parsed[0].strip() - else: # lists - parsed=[x.strip() for x in parsed] + if is_bool: + parsed = parsed.lower()=='true' setattr(self.options,recname,parsed) except: if default != "": @@ -179,11 +252,11 @@ steps refer to a method in TestPlc or to a step_* module # save for next run fsave=open(path,"w") - if not is_list: - fsave.write(getattr(self.options,recname) + "\n") - else: + if is_list: # lists for value in getattr(self.options,recname): fsave.write(value + "\n") + else: # strings and booleans - just call str() + fsave.write(str(getattr(self.options,recname)) + "\n") fsave.close() # utils.header('Saved %s into %s'%(recname,filename)) @@ -199,6 +272,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: @@ -248,6 +322,7 @@ steps refer to a method in TestPlc or to a step_* module raise # provision on local substrate + if self.options.plcs_use_lxc: LocalSubstrate.local_substrate.rescope (plcs_on_vs=False, plcs_on_lxc=True) all_plc_specs = LocalSubstrate.local_substrate.provision(all_plc_specs,self.options) # remember substrate IP address(es) for next run @@ -284,7 +359,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): @@ -294,51 +368,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" @@ -360,7 +418,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 @@ -381,6 +439,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: