actual.__doc__=TestSlice.__dict__[method.__name__].__doc__
return actual
+# 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 "self",self
+ 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
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,
'ssh_node_boot@1', 'node_bmlogs@1', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts', 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,
+ # 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', SEP,
'force_gather_logs', SEP,
]
other_steps = [
return self.locate_sliver_obj(nodename,slicename)
# all different hostboxes used in this plc
- def gather_hostBoxes(self):
+ def get_BoxNodes(self):
# maps on sites and nodes, return [ (host_box,test_node) ]
tuples=[]
for site_spec in self.plc_spec['sites']:
# a step for checking this stuff
def show_boxes (self):
'print summary of nodes location'
- for (box,nodes) in self.gather_hostBoxes().iteritems():
+ for (box,nodes) in self.get_BoxNodes().iteritems():
print box,":"," + ".join( [ node.name() for node in nodes ] )
return True
def qemu_kill_all(self):
'kill all qemu instances on the qemu boxes involved by this setup'
# this is the brute force version, kill all qemus on that host box
- for (box,nodes) in self.gather_hostBoxes().iteritems():
+ for (box,nodes) in self.get_BoxNodes().iteritems():
# pass the first nodename, as we don't push template-qemu on testboxes
nodedir=nodes[0].nodedir()
TestBoxQemu(box,self.options.buildname).qemu_kill_all(nodedir)
# make this a valid step
def qemu_list_all(self):
'list all qemu instances on the qemu boxes involved by this setup'
- for (box,nodes) in self.gather_hostBoxes().iteritems():
+ for (box,nodes) in self.get_BoxNodes().iteritems():
# this is the brute force version, kill all qemus on that host box
TestBoxQemu(box,self.options.buildname).qemu_list_all()
return True
- # kill only the right qemus
+ # kill only the qemus related to this test
def qemu_list_mine(self):
'list qemu instances for our nodes'
- for (box,nodes) in self.gather_hostBoxes().iteritems():
+ for (box,nodes) in self.get_BoxNodes().iteritems():
# the fine-grain version
for node in nodes:
node.list_qemu()
return True
+ # kill only the qemus related to this test
+ def qemu_clean_mine(self):
+ 'cleanup (rm -rf) qemu instances for our nodes'
+ for (box,nodes) in self.get_BoxNodes().iteritems():
+ # the fine-grain version
+ for node in nodes:
+ node.qemu_clean()
+ return True
+
# kill only the right qemus
def qemu_kill_mine(self):
'kill the qemu instances for our nodes'
- for (box,nodes) in self.gather_hostBoxes().iteritems():
+ for (box,nodes) in self.get_BoxNodes().iteritems():
# the fine-grain version
for node in nodes:
node.kill_qemu()
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
+ # pass the vbuild-nightly options to [lv]test-initvm
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"
+ script="ltest-initvm.sh"
else:
- script="vtest-init-vserver.sh"
+ script="vtest-initvm.sh"
vserver_name = self.vservername
vserver_options="--netdev eth0 --interface %s"%self.vserverip
try:
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
+
@slice_mapper
def ssh_slice_basics(self): pass
git://git.onelab.eu / tests.git / blobdiff