actual.__doc__=TestSlice.__dict__[method.__name__].__doc__
return actual
+# run a step but return True so that we can go on
+def ignore_result (method):
+ def wrappee (self):
+ # ssh_slice_ignore->ssh_slice
+ ref_name=method.__name__.replace('_ignore','').replace('force_','')
+ ref_method=TestPlc.__dict__[ref_name]
+ result=ref_method(self)
+ print "Actual (but ignored) result for %(ref_name)s is %(result)s"%locals()
+ return Ignored (result)
+ wrappee.__doc__="ignored version of " + method.__name__.replace('_ignore','').replace('ignore_','')
+ return wrappee
+
+# a variant that expects the TestSlice method to return a list of CompleterTasks that
+# are then merged into a single Completer run to avoid wating for all the slices
+# esp. useful when a test fails of course
+# because we need to pass arguments we use a class instead..
+class slice_mapper__tasks (object):
+ # could not get this to work with named arguments
+ def __init__ (self,timeout_minutes,silent_minutes,period_seconds):
+ print "timeout_minutes,silent_minutes,period_seconds",timeout_minutes,silent_minutes,period_seconds
+ self.timeout=timedelta(minutes=timeout_minutes)
+ self.silent=timedelta(minutes=silent_minutes)
+ self.period=timedelta(seconds=period_seconds)
+ def __call__ (self, method):
+ decorator_self=self
+ # compute augmented method name
+ method_name = method.__name__ + "__tasks"
+ # locate in TestSlice
+ slice_method = TestSlice.__dict__[ method_name ]
+ def wrappee(self):
+ tasks=[]
+ for slice_spec in self.plc_spec['slices']:
+ site_spec = self.locate_site (slice_spec['sitename'])
+ test_site = TestSite(self,site_spec)
+ test_slice=TestSlice(self,test_site,slice_spec)
+ tasks += slice_method (test_slice, self.options)
+ return Completer (tasks).run (decorator_self.timeout, decorator_self.silent, decorator_self.period)
+ # restore the doc text from the TestSlice method even if a bit odd
+ wrappee.__doc__ = slice_method.__doc__
+ return wrappee
+
def auth_sfa_mapper (method):
def actual(self):
overall=True
actual.__doc__=TestAuthSfa.__dict__[method.__name__].__doc__
return actual
+class Ignored:
+ def __init__ (self,result):
+ self.result=result
+
SEP='<sep>'
SEPSFA='<sep_sfa>'
default_steps = [
'show', SEP,
'vs_delete','timestamp_vs','vs_create', SEP,
+# 'plc_install', 'mod_python', 'plc_configure', 'plc_start', SEP,
'plc_install', 'plc_configure', 'plc_start', SEP,
'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP,
'plcapi_urls','speed_up_slices', SEP,
# keep this our of the way for now
# 'check_vsys_defaults', SEP,
'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP,
- 'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', SEP,
+ 'qemu_kill_mine','qemu_clean_mine', 'qemu_export', 'qemu_start', 'timestamp_qemu', SEP,
'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA,
'sfi_configure@1', 'sfa_add_site@1','sfa_add_pi@1', SEPSFA,
'sfa_add_user@1', 'sfa_update_user@1', 'sfa_add_slice@1', 'sfa_renew_slice@1', SEPSFA,
'sfa_discover@1', 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
- 'sfi_list@1', 'sfi_show@1', 'sfi_slices@1', 'sfa_utest@1', SEPSFA,
+ 'sfi_list@1', 'sfi_show@1', 'sfa_utest@1', SEPSFA,
# we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot
# but as the stress test might take a while, we sometimes missed the debug mode..
'ssh_node_debug@1', 'plcsh_stress_test@1', SEP,
- 'ssh_node_boot@1', 'node_bmlogs@1', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts', SEP,
+ 'ssh_node_boot@1', 'node_bmlogs@1', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts_ignore', SEP,
'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA,
'cross_check_tcp@1', 'check_system_slice', SEP,
- 'empty_slices', 'ssh_slice_off', 'fill_slices', SEP,
- 'force_gather_logs', SEP,
+ # check slices are turned off properly
+ 'empty_slices', 'ssh_slice_off', SEP,
+ # check they are properly re-created with the same name
+ 'fill_slices', 'ssh_slice_again_ignore', SEP,
+ 'gather_logs_force', SEP,
]
other_steps = [
'export', 'show_boxes', SEP,
'delete_leases', 'list_leases', SEP,
'populate', SEP,
'nodestate_show','nodestate_safeboot','nodestate_boot', SEP,
- 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', 'qemu_clean_mine', SEP,
+ 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP,
'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA,
'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,
'plc_db_dump' , 'plc_db_restore', SEP,
'check_netflow','check_drl', SEP,
'debug_nodemanager', SEP,
- 'standby_1_through_20',SEP,
+ 'standby_1_through_20','yes','no',SEP,
]
@staticmethod
def vm_root_in_host(self):
if self.options.plcs_use_lxc:
- return "/vservers/%s/rootfs/"%(self.vservername)
+ return "/vservers/%s/"%(self.vservername)
else:
return "/vservers/%s"%(self.vservername)
for (box,nodes) in self.get_BoxNodes().iteritems():
# the fine-grain version
for node in nodes:
- node.clean_qemu()
+ node.qemu_clean()
return True
# kill only the right qemus
repo_url = self.options.arch_rpms_url
for level in [ 'arch' ]:
repo_url = os.path.dirname(repo_url)
- # pass the vbuild-nightly options to vtest-init-vserver
- test_env_options=""
- test_env_options += " -p %s"%self.options.personality
- test_env_options += " -d %s"%self.options.pldistro
- test_env_options += " -f %s"%self.options.fcdistro
- if self.options.plcs_use_lxc:
- script="vtest-init-lxc.sh"
- else:
- script="vtest-init-vserver.sh"
+
+ # invoke initvm (drop support for vs)
+ script="lbuild-initvm.sh"
+ script_options=""
+ # pass the vbuild-nightly options to [lv]test-initvm
+ script_options += " -p %s"%self.options.personality
+ script_options += " -d %s"%self.options.pldistro
+ script_options += " -f %s"%self.options.fcdistro
+ script_options += " -r %s"%repo_url
vserver_name = self.vservername
- vserver_options="--netdev eth0 --interface %s"%self.vserverip
try:
vserver_hostname=socket.gethostbyaddr(self.vserverip)[0]
- vserver_options += " --hostname %s"%vserver_hostname
+ script_options += " -n %s"%vserver_hostname
except:
print "Cannot reverse lookup %s"%self.vserverip
print "This is considered fatal, as this might pollute the test results"
return False
- create_vserver="%(build_dir)s/%(script)s %(test_env_options)s %(vserver_name)s %(repo_url)s -- %(vserver_options)s"%locals()
+ create_vserver="%(build_dir)s/%(script)s %(script_options)s %(vserver_name)s"%locals()
return self.run_in_host(create_vserver) == 0
### install_rpm
pkgs_string=" ".join(pkgs_list)
return self.yum_install (pkgs_list)
+ ###
+ def mod_python(self):
+ """yum install mod_python, useful on f18 and above so as to avoid broken wsgi"""
+ return self.yum_install ( [ 'mod_python' ] )
+
###
def plc_configure(self):
"run plc-config-tty"
test_slice.create_slice()
return True
- @slice_mapper
+ @slice_mapper__tasks(20,10,15)
def ssh_slice(self): pass
- @slice_mapper
+ @slice_mapper__tasks(20,19,15)
def ssh_slice_off (self): pass
+
+ # use another name so we can exclude/ignore it from the tests on the nightly command line
+ def ssh_slice_again(self): return self.ssh_slice()
+ # note that simply doing ssh_slice_again=ssh_slice would kind od work too
+ # but for some reason the ignore-wrapping thing would not
+
@slice_mapper
def ssh_slice_basics(self): pass
@auth_sfa_mapper
def sfi_show(self): pass
@auth_sfa_mapper
- def sfi_slices(self): pass
- @auth_sfa_mapper
def ssh_slice_sfa(self): pass
@auth_sfa_mapper
def sfa_delete_user(self): pass
utils.header('Database restored from ' + dump)
+ @staticmethod
+ def create_ignore_steps ():
+ for step in TestPlc.default_steps + TestPlc.other_steps:
+ # default step can have a plc qualifier
+ if '@' in step: (step,qualifier)=step.split('@')
+ # or be defined as forced or ignored by default
+ for keyword in ['_ignore','_force']:
+ if step.endswith (keyword): step=step.replace(keyword,'')
+ if step == SEP or step == SEPSFA : continue
+ method=getattr(TestPlc,step)
+ name=step+'_ignore'
+ wrapped=ignore_result(method)
+# wrapped.__doc__ = method.__doc__ + " (run in ignore-result mode)"
+ setattr(TestPlc, name, wrapped)
+
+# @ignore_result
+# def ssh_slice_again_ignore (self): pass
+# @ignore_result
+# def check_initscripts_ignore (self): pass
+
def standby_1_through_20(self):
"""convenience function to wait for a specified number of minutes"""
pass
def standby_19(): pass
@standby_generic
def standby_20(): pass
+
+ # convenience for debugging the test logic
+ def yes (self): return True
+ def no (self): return False
git://git.onelab.eu / tests.git / blobdiff