from TestSite import TestSite
from TestNode import TestNode
-# add $HOME in PYTHONPATH so we can import LocalTestResources.py
+# add $HOME in PYTHONPATH so we can import LocalSubstrate.py
sys.path.append(os.environ['HOME'])
-import LocalTestResources
+import LocalSubstrate
class TestMain:
for (scope,steps) in scopes:
print '--------------------',scope
for step in [step for step in steps if TestPlc.valid_step(step)]:
+ try: (step,qualifier)=step.split('@')
+ except: pass
stepname=step
- if step.find("force_") == 0:
- stepname=step.replace("force_","")
- force=True
+ for special in ['force']:
+ stepname = stepname.replace(special+'_',"")
print '*',step,"\r",4*"\t",
try:
- print testplc_method_dict[stepname].__doc__
+ doc=testplc_method_dict[stepname].__doc__
except:
- print "*** no doc found"
+ try:
+ # locate the step_<name> module
+ modulename='step_'+stepname
+ doc = __import__(modulename).__doc__
+ except:
+ doc=None
+ if doc: print doc
+ else: print "*** no doc found"
def run (self):
self.init_steps()
no default
config defaults to the last value used, as stored in arg-config,
or %r
-ips_node, ips_plc and ips_qemu defaults to the last value used, as stored in arg-ips-{node,plc,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
===
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_node", default=[],
- help="Specify the set of hostname/IP's to use for nodes")
- parser.add_option("-P","--plcs",action="append", dest="ips_plc", 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")
+ 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 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 <qualifier>, 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,
- help="Used by db_dump and db_restore")
+ help="Used by plc_db_dump and plc_db_restore")
parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False,
help="Run in verbose mode")
parser.add_option("-i","--interactive",action="store_true",dest="interactive",default=False,
parser.add_option("-n","--dry-run", action="store_true", dest="dry_run", default=False,
help="Show environment and exits")
parser.add_option("-r","--restart-nm", action="store_true", dest="forcenm", default=False,
- help="Force the NM to restart in check_slices step")
+ 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()
result.append(el)
return result
# flatten relevant options
- for optname in ['config','exclude','ips_node','ips_plc','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) in (
- ('build_url','arg-build-url',TestMain.default_build_url) ,
- ('ips_node','arg-ips-node',[]) ,
- ('ips_plc','arg-ips-plc',[]) ,
- ('ips_qemu','arg-ips-qemu',[]) ,
- ('config','arg-config',TestMain.default_config) ,
- ('arch_rpms_url','arg-arch-rpms-url',"") ,
- ('personality','arg-personality',"linux32"),
- ('pldistro','arg-pldistro',"planetlab"),
- ('fcdistro','arg-fcdistro','centos5'),
+ for (recname,filename,default,need_reverse) in (
+ ('build_url','arg-build-url',TestMain.default_build_url,None) ,
+ ('ips_bplc','arg-ips-bplc',[],True),
+ ('ips_vplc','arg-ips-vplc',[],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),
+ ('pldistro','arg-pldistro',"onelab",None),
+ ('fcdistro','arg-fcdistro','f14',None),
) :
# print 'handling',recname
path=filename
# utils.header('Saved %s into %s'%(recname,filename))
# lists need be reversed
- if isinstance(getattr(self.options,recname),list):
+ # I suspect this is useful for the various pools but for config, it's painful
+ if isinstance(getattr(self.options,recname),list) and need_reverse:
getattr(self.options,recname).reverse()
if self.options.verbose:
print 'Cannot load config %s -- ignored'%modulename
raise
- # run localize as defined by local_resources
- all_plc_specs = LocalTestResources.local_resources.localize(all_plc_specs,self.options)
+ # provision on local substrate
+ all_plc_specs = LocalSubstrate.local_substrate.provision(all_plc_specs,self.options)
- # remember plc IP address(es) if not specified
- ips_plc_file=open('arg-ips-plc','w')
+ # 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_plc_file.write("%s\n"%plc_spec['PLC_API_HOST'])
- ips_plc_file.close()
+ ips_vplc_file.write("%s\n"%plc_spec['PLC_API_HOST'])
+ ips_vplc_file.close()
# ditto for nodes
- ips_node_file=open('arg-ips-node','w')
+ 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_node_file.write("%s\n"%node_spec['node_fields']['hostname'])
- ips_node_file.close()
- # ditto for qemu boxes
- ips_qemu_file=open('arg-ips-qemu','w')
+ 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']:
- ips_qemu_file.write("%s\n"%node_spec['host_box'])
- ips_qemu_file.close()
+ # back to normal (unqualified) form
+ stripped=node_spec['node_fields']['hostname'].split('.')[0]
+ ips_vnode_file.write("%s\n"%stripped)
+ ips_vnode_file.close()
+
# build a TestPlc object from the result, passing options
for spec in all_plc_specs:
spec['failed_step'] = False
names.sort()
all_step_infos += [ ("%s.%s"%(step,name),module_dict[name],force,cross,qualifier) for name in names ]
except :
- print '********** step %s NOT FOUND -- ignored'%(step)
+ utils.header("********** FAILED step %s (NOT FOUND) -- won't be run"%step)
traceback.print_exc()
overall_result = False
# 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"
- TRACE_FORMAT="TRACE: beg=%(beg)s end=%(end)s status=%(status)s step=%(stepname)s plc=%(plcname)s force=%(force)s\n"
+ TRACE_FORMAT="TRACE: %(plc_counter)d %(beg)s->%(end)s status=%(status)s step=%(stepname)s plc=%(plcname)s force=%(force)s\n"
for (stepname,method,force,cross,qualifier) in all_step_infos:
plc_counter=0
for (spec,plc_obj) in all_plcs:
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
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:
continue
try:
force_msg=""
- if force and spec['failed_step']: force_msg=" (forced after %s has failed)"
+ if force and spec['failed_step']: force_msg=" (forced after %s has failed)"%spec['failed_step']
utils.header("********** %d RUNNING step %s%s on plc %s"%(plc_counter,stepname,force_msg,plcname))
if not cross: step_result = method(plc_obj)
else: step_result = method(plc_obj,across_plcs)
if self.options.trace_file and not self.options.dry_run:
trace.close()
+ # free local substrate
+ LocalSubstrate.local_substrate.release(self.options)
+
return overall_result
# wrapper to run, returns a shell-compatible result
git://git.onelab.eu / tests.git / blobdiff