X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestMain.py;h=779d9570b27fa438f3e4e8968781fada43ab2933;hb=c3ac22516b3770b16764a3f7d5b83f73365c7fc7;hp=aae90c7fe1124b19d70e8e9a78898234286292da;hpb=7d1382e0f7ce9c37b5558b684a218572b8a3e74f;p=tests.git diff --git a/system/TestMain.py b/system/TestMain.py index aae90c7..779d957 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -75,7 +75,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 +100,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 +127,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 +140,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=['pl','pg'] + # 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), @@ -247,26 +254,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 @@ -320,17 +332,11 @@ steps refer to a method in TestPlc or to a step_* module # 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 +358,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 +379,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: