subversion_id = "$Id$"
- default_config = [ 'onelab' ]
+ default_config = [ 'default' ]
- default_steps = ['uninstall','install','install_rpm',
- 'configure', 'start',
- 'clear_ssh_config','store_keys', 'initscripts',
- 'sites', 'nodes', 'slices',
- 'bootcd', 'nodegroups',
- 'kill_all_qemus', 'start_nodes',
- 'standby_20',
- 'nodes_booted', 'nodes_ssh', 'check_slices','check_initscripts',
- 'force_kill_qemus', ]
- other_steps = [ 'stop_all_vservers','fresh_install', 'stop','check_tcp',
- 'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys',
- 'list_all_qemus', 'list_qemus', 'stop_nodes' ,
- 'db_dump' , 'db_restore',
- 'standby_1 through 20',
- ]
default_build_url = "http://svn.planet-lab.org/svn/build/trunk"
def __init__ (self):
- self.path=os.path.dirname(sys.argv[0])
+ self.path=os.path.dirname(sys.argv[0]) or "."
os.chdir(self.path)
@staticmethod
def show_env (options, message):
utils.header (message)
- utils.pprint("main options",options)
+ utils.show_options("main options",options)
@staticmethod
def optparse_list (option, opt, value, parser):
setattr(parser.values,option.dest,value.split())
def run (self):
- steps_message="Defaut steps are\n\t%s"%(" ".join(TestMain.default_steps))
- steps_message += "\nOther useful steps are\n\t %s"%(" ".join(TestMain.other_steps))
+ steps_message=20*'x'+" Defaut steps are\n"+TestPlc.printable_steps(TestPlc.default_steps)
+ steps_message += "\n"+20*'x'+" Other useful steps are\n"+TestPlc.printable_steps(TestPlc.other_steps)
usage = """usage: %%prog [options] steps
myplc-url defaults to the last value used, as stored in arg-myplc-url,
no default
parser.add_option("-c","--config",action="callback", callback=TestMain.optparse_list, dest="config",
nargs=1,type="string",
help="Config module - can be set multiple times, or use quotes")
+ parser.add_option("-x","--exclude",action="callback", callback=TestMain.optparse_list, dest="exclude",
+ nargs=1,type="string",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")
parser.add_option("-l","--list",action="store_true",dest="list_steps", default=False,
help="List known steps")
- parser.add_option("-s","--state",action="store",dest="dbname",default=None,
- help="Used by db_dump and db_restore")
- parser.add_option("-d","--display", action="store", dest="display", default='bellami.inria.fr:0.0',
- help="Set DISPLAY for vmplayer")
parser.add_option("-i","--ip",action="callback", callback=TestMain.optparse_list, dest="ips",
nargs=1,type="string",
help="Specify the set of IP addresses to use in vserver mode (disable scanning)")
+ parser.add_option("-s","--vserver",action="store_true",dest="native",default=False,
+ help="deploy myplc-native rather than former chroot-based package")
+ parser.add_option("-1","--small",action="store_true",dest="small_test",default=False,
+ help="run a small test -- typically only one node")
+ parser.add_option("-d","--dbname",action="store",dest="dbname",default=None,
+ help="Used by db_dump and db_restore")
parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False,
help="Run in verbose mode")
parser.add_option("-q","--quiet", action="store_true", dest="quiet", default=False,
if len(self.args) == 0:
if self.options.all_steps:
- self.options.steps=TestMain.default_steps
+ self.options.steps=TestPlc.default_steps
elif self.options.dry_run:
- self.options.steps=TestMain.default_steps
+ self.options.steps=TestPlc.default_steps
elif self.options.list_steps:
print steps_message
sys.exit(1)
fsave.close()
# utils.header('Saved %s into %s'%(recname,filename))
+ self.options.arch = "i386"
+ if self.options.myplc_url.find("x86_64") >= 0:
+ self.options.arch="x86_64"
# steps
if not self.options.steps:
#default (all) steps
#self.options.steps=['dump','clean','install','populate']
- self.options.steps=TestMain.default_steps
+ self.options.steps=TestPlc.default_steps
+
+ # exclude
+ selected=[]
+ for step in self.options.steps:
+ keep=True
+ for exclude in self.options.exclude:
+ if utils.match(step,exclude):
+ keep=False
+ break
+ if keep: selected.append(step)
+ self.options.steps=selected
# this is useful when propagating on host boxes, to avoid conflicts
self.options.buildname = os.path.basename (os.path.abspath (self.path))
# show config
if not self.options.quiet:
utils.show_test_spec("Test specifications",all_plc_specs)
- # build a TestPlc object from the result
+ # build a TestPlc object from the result, passing options
for spec in all_plc_specs:
spec['disabled'] = False
- all_plcs = [ (x, TestPlc(x)) for x in all_plc_specs]
- # expose to the various objects
- for (spec,obj) in all_plcs:
- obj.options=self.options
+ all_plcs = [ (x, TestPlc(x,self.options)) for x in all_plc_specs]
+
+ # pass options to utils as well
+ 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):
+ continue
force=False
# is it a forcedstep
if step.find("force_") == 0:
names.sort()
all_step_infos += [ ("%s.%s"%(step,name),module_dict[name],force) for name in names ]
except :
- print 'Step %s -- ignored'%(step)
+ print '********** step %s NOT FOUND -- ignored'%(step)
traceback.print_exc()
overall_result = False
if self.options.dry_run:
self.show_env(self.options,"Dry run")
- return 0
# do all steps on all plcs
for (stepname,method,force) in all_step_infos:
force_msg=""
if force: force_msg=" (forced)"
utils.header("********** RUNNING step %s%s on plc %s"%(stepname,force_msg,plcname))
- step_result = method(obj,self.options)
+ step_result = method(obj)
if step_result:
utils.header('********** SUCCESSFUL step %s on %s'%(stepname,plcname))
else: