'bootcd', 'nodegroups',
'kill_all_qemus', 'start_nodes',
'standby_4', 'nodes_booted',
- 'standby_6','nodes_ssh', 'check_slices',
+ 'standby_6','nodes_ssh', 'check_slices','check_initscripts',
'check_tcp',
'kill_qemus', ]
other_steps = [ 'fresh_install', 'stop',
def __init__ (self):
self.path=os.path.dirname(sys.argv[0])
+ os.chdir(self.path)
@staticmethod
def show_env (options, message):
utils.header (message)
- utils.show_spec("main options",options)
+ utils.pprint("main options",options)
@staticmethod
def optparse_list (option, opt, value, parser):
self.options.steps = self.args
# handle defaults and option persistence
- 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)
+ for (recname,filename,default) in (
+ ('build_url','arg-build-url',TestMain.default_build_url) ,
+ ('ips','arg-ips',[]) ,
+ ('config','arg-config',TestMain.default_config) ,
+ ('myplc_url','arg-myplc-url',"") ,
+ ) :
+# print 'handling',recname
+ path=filename
is_list = isinstance(default,list)
if not getattr(self.options,recname):
try:
for value in getattr(self.options,recname):
fsave.write(value + "\n")
fsave.close()
- utils.header('Saved %s into %s'%(recname,filename))
+# utils.header('Saved %s into %s'%(recname,filename))
# steps
if not self.options.steps:
print 'Cannot load config %s -- ignored'%modulename
raise
# show config
- utils.show_spec("Test specifications",all_plc_specs)
+ utils.show_test_spec("Test specifications",all_plc_specs)
# build a TestPlc object from the result
for spec in all_plc_specs:
spec['disabled'] = False