#!/usr/bin/env python
# $Id$
-import os, sys
+import sys, os, os.path
from optparse import OptionParser
import traceback
default_config = [ 'onelab' ]
- default_steps = ['uninstall','install','configure', 'start', 'store_keys', 'initscripts',
- 'sites', 'nodes', 'slices', 'bootcd',
- 'nodegroups', 'start_nodes', 'check_nodes', 'check_slices' ]
- other_steps = [ 'fresh_install', 'stop', 'install_vserver_create', 'install_vserver_native',
+ 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_4', 'nodes_booted',
+ 'standby_6','nodes_ssh', 'check_slices',
+ 'check_tcp',
+ 'kill_qemus', ]
+ other_steps = [ 'fresh_install', 'stop',
'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys',
- 'stop_nodes' , 'db_dump' , 'db_restore',
+ 'list_all_qemus', 'kill_qemus', 'stop_nodes' ,
+ 'db_dump' , 'db_restore',
+ 'standby_1 through 20',
]
default_build_url = "http://svn.planet-lab.org/svn/build/trunk"
except:
setattr(parser.values,option.dest,value.split())
- def test_main (self):
+ 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))
usage = """usage: %%prog [options] steps
-myplc-url defaults to the last value used, as stored in MYPLC-URL,
+myplc-url defaults to the last value used, as stored in arg-myplc-url,
no default
-build-url defaults to the last value used, as stored in BUILD-URL,
+build-url defaults to the last value used, as stored in arg-build-url,
or %s
-config defaults to the last value used, as stored in CONFIG,
+config defaults to the last value used, as stored in arg-config,
or %r
-ips defaults to the last value used, as stored in IPS,
+ips defaults to the last value used, as stored in arg-ips,
default is to use IP scanning
-steps refer to a method in TestPlc or to a step_* module"""%(TestMain.default_build_url,TestMain.default_config)
- usage += "\n Defaut steps are %r"%TestMain.default_steps
- usage += "\n Other useful steps are %r"%TestMain.other_steps
+steps refer to a method in TestPlc or to a step_* module
+===
+"""%(TestMain.default_build_url,TestMain.default_config)
+ usage += steps_message
parser=OptionParser(usage=usage,version=self.subversion_id)
parser.add_option("-u","--url",action="store", dest="myplc_url",
help="myplc URL - for locating build output")
help="Build URL - for using vtest-init-vserver.sh in native mode")
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")
+ help="Config module - can be set multiple times, or use quotes")
parser.add_option("-a","--all",action="store_true",dest="all_steps", default=False,
- help="Runs all default steps")
+ 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")
+ help="Set DISPLAY for vmplayer")
parser.add_option("-i","--ip",action="callback", callback=TestMain.optparse_list, dest="ips",
nargs=1,type="string",
- help="allows to specify the set of IP addresses to use in vserver mode (disable scanning)")
+ help="Specify the set of IP addresses to use in vserver mode (disable scanning)")
parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False,
help="Run in verbose mode")
parser.add_option("-n","--dry-run", action="store_true", dest="dry_run", default=False,
help="Show environment and exits")
+ parser.add_option("-f","--forcenm", action="store_true", dest="forcenm", default=False,
+ help="Force the NM to restart in check_slices step")
(self.options, self.args) = parser.parse_args()
if len(self.args) == 0:
self.options.steps=TestMain.default_steps
elif self.options.dry_run:
self.options.steps=TestMain.default_steps
+ elif self.options.list_steps:
+ print steps_message
+ sys.exit(1)
else:
print 'No step found (do you mean -a ? )'
print "Run %s --help for help"%sys.argv[0]
else:
self.options.steps = self.args
- # display display
- utils.header('X11 display : %s'% self.options.display)
-
# handle defaults and option persistence
- for (recname,filename,default) in ( ('myplc_url','MYPLC-URL',"") ,
- ('build_url','BUILD-URL',TestMain.default_build_url) ,
- ('ips','IPS',[]) ,
- ('config','CONFIG',TestMain.default_config) , ) :
+ for (recname,filename,default) in ( ('myplc_url','arg-myplc-url',"") ,
+ ('build_url','arg-build-url',TestMain.default_build_url) ,
+ ('ips','arg-ips',[]) ,
+ ('config','arg-config',TestMain.default_config) , ) :
print 'handling',recname
path="%s/%s"%(self.path,filename)
is_list = isinstance(default,list)
# store self.path in options.path for the various callbacks
self.options.path = self.path
+ # this is useful when propagating on host boxes, to avoid conflicts
+ self.options.buildname = os.path.basename (os.path.abspath (self.path))
if self.options.verbose:
self.show_env(self.options,"Verbose")
return 0
# do all steps on all plcs
- for (name,method) in all_step_infos:
+ for (stepname,method) in all_step_infos:
for (spec,obj) in all_plcs:
- if not spec['disabled']:
+ plcname=spec['name']
+ if spec['disabled']:
+ utils.header("Plc %s is disabled - skipping step %s"%(plcname,stepname))
+ else:
try:
- utils.header("Running step %s on plc %s"%(name,spec['name']))
+ utils.header("Running step %s on plc %s"%(stepname,plcname))
step_result = method(obj,self.options)
if step_result:
- utils.header('Successful step %s on %s'%(name,spec['name']))
+ utils.header('********** SUCCESSFUL step %s on %s'%(stepname,plcname))
else:
overall_result = False
spec['disabled'] = True
- utils.header('Step %s on %s FAILED - discarding that plc from further steps'%(name,spec['name']))
+ utils.header('********** Step %s on %s FAILED - discarding that plc from further steps'%(stepname,plcname))
except:
overall_result=False
spec['disabled'] = True
- utils.header ('Step %s on plc %s FAILED (exception) - discarding this plc from further steps'%(name,spec['name']))
+ utils.header ('********** Step %s on plc %s FAILED (exception) - discarding this plc from further steps'%(stepname,plcname))
traceback.print_exc()
return overall_result
- # wrapper to shell
+ # wrapper to run, returns a shell-compatible result
def main(self):
try:
- success=self.test_main()
+ success=self.run()
if success:
return 0
else:
git://git.onelab.eu / tests.git / blobdiff