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):
+ 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>'
# 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,
'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 connect (self):
pass
- def actual_command_in_guest (self,command):
- return self.test_ssh.actual_command(self.host_to_guest(command))
+ def actual_command_in_guest (self,command, backslash=False):
+ raw1=self.host_to_guest(command)
+ raw2=self.test_ssh.actual_command(raw1,dry_run=self.options.dry_run, backslash=backslash)
+ return raw2
def start_guest (self):
- return utils.system(self.test_ssh.actual_command(self.start_guest_in_host()))
+ return utils.system(self.test_ssh.actual_command(self.start_guest_in_host(),dry_run=self.options.dry_run))
def stop_guest (self):
- return utils.system(self.test_ssh.actual_command(self.stop_guest_in_host()))
+ return utils.system(self.test_ssh.actual_command(self.stop_guest_in_host(),dry_run=self.options.dry_run))
- def run_in_guest (self,command):
- return utils.system(self.actual_command_in_guest(command))
+ def run_in_guest (self,command,backslash=False):
+ raw=self.actual_command_in_guest(command,backslash)
+ return utils.system(raw)
def run_in_host (self,command):
- return self.test_ssh.run_in_buildname(command)
+ return self.test_ssh.run_in_buildname(command, dry_run=self.options.dry_run)
+ # backslashing turned out so awful at some point that I've turned off auto-backslashing
+ # see e.g. plc_start esp. the version for f14
#command gets run in the plc's vm
def host_to_guest(self,command):
- if self.options.plcs_use_lxc:
- return "ssh -o StrictHostKeyChecking=no %s %s"%(self.vserverip,command)
+ # f14 still needs some extra help
+ if self.options.fcdistro == 'f14':
+ raw="virsh -c lxc:/// lxc-enter-namespace %s -- /usr/bin/env PATH=/bin:/sbin:/usr/bin:/usr/sbin %s" %(self.vservername,command)
else:
- return "vserver %s exec %s"%(self.vservername,command)
+ raw="virsh -c lxc:/// lxc-enter-namespace %s -- /usr/bin/env %s" %(self.vservername,command)
+ return raw
+ # this /vservers thing is legacy...
def vm_root_in_host(self):
- if self.options.plcs_use_lxc:
- return "/var/lib/lxc/%s/rootfs/"%(self.vservername)
- else:
- return "/vservers/%s"%(self.vservername)
+ return "/vservers/%s/"%(self.vservername)
def vm_timestamp_path (self):
- if self.options.plcs_use_lxc:
- return "/var/lib/lxc/%s/%s.timestamp"%(self.vservername,self.vservername)
- else:
- return "/vservers/%s.timestamp"%(self.vservername)
+ return "/vservers/%s/%s.timestamp"%(self.vservername,self.vservername)
#start/stop the vserver
def start_guest_in_host(self):
- if self.options.plcs_use_lxc:
- return "virsh -c lxc:// start %s"%(self.vservername)
- else:
- return "vserver %s start"%(self.vservername)
+ return "virsh -c lxc:/// start %s"%(self.vservername)
def stop_guest_in_host(self):
- if self.options.plcs_use_lxc:
- return "virsh -c lxc:// destroy %s"%(self.vservername)
- else:
- return "vserver %s stop"%(self.vservername)
+ return "virsh -c lxc:/// destroy %s"%(self.vservername)
# xxx quick n dirty
def run_in_guest_piped (self,local,remote):
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()
domain=socket.gethostname().split('.',1)[1]
fqdn="%s.%s"%(self.plc_spec['host_box'],domain)
print "export BUILD=%s"%self.options.buildname
- if self.options.plcs_use_lxc:
- print "export PLCHOSTLXC=%s"%fqdn
- else:
- print "export PLCHOSTVS=%s"%fqdn
+ print "export PLCHOSTLXC=%s"%fqdn
print "export GUESTNAME=%s"%self.plc_spec['vservername']
vplcname=self.plc_spec['vservername'].split('-')[-1]
print "export GUESTHOSTNAME=%s.%s"%(vplcname,domain)
"vserver delete the test myplc"
stamp_path=self.vm_timestamp_path()
self.run_in_host("rm -f %s"%stamp_path)
- if self.options.plcs_use_lxc:
- self.run_in_host("virsh -c lxc:// destroy %s"%self.vservername)
- self.run_in_host("virsh -c lxc:// undefine %s"%self.vservername)
- self.run_in_host("rm -fr /var/lib/lxc/%s"%self.vservername)
- return True
- else:
- self.run_in_host("vserver --silent %s delete"%self.vservername)
- return True
+ self.run_in_host("virsh -c lxc:// destroy %s"%self.vservername)
+ self.run_in_host("virsh -c lxc:// undefine %s"%self.vservername)
+ self.run_in_host("rm -fr /vservers/%s"%self.vservername)
+ return True
### install
# historically the build was being fetched by the tests
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"
utils.system('rm %s'%tmpname)
return True
+# f14 is a bit odd in this respect, although this worked fine in guests up to f18
+# however using a vplc guest under f20 requires this trick
+# the symptom is this: service plc start
+# Starting plc (via systemctl): Failed to get D-Bus connection: \
+# Failed to connect to socket /org/freedesktop/systemd1/private: Connection refused
+# weird thing is the doc says f14 uses upstart by default and not systemd
+# so this sounds kind of harmless
+ def start_service (self,service): return self.start_stop_service (service,'start')
+ def stop_service (self,service): return self.start_stop_service (service,'stop')
+
+ def start_stop_service (self, service,start_or_stop):
+ "utility to start/stop a service with the special trick for f14"
+ if self.options.fcdistro != 'f14':
+ return self.run_in_guest ("service %s %s"%(service,start_or_stop))==0
+ else:
+ # patch /sbin/service so it does not reset environment
+ self.run_in_guest ('sed -i -e \\"s,env -i,env,\\" /sbin/service')
+ # this is because our own scripts in turn call service
+ return self.run_in_guest("SYSTEMCTL_SKIP_REDIRECT=true service %s %s"%(service,start_or_stop))==0
+
def plc_start(self):
"service plc start"
- self.run_in_guest('service plc start')
- return True
+ return self.start_service ('plc')
def plc_stop(self):
"service plc stop"
- self.run_in_guest('service plc stop')
- return True
-
+ return self.stop_service ('plc')
+
def vs_start (self):
"start the PLC vserver"
self.start_guest()
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
def sfa_import(self):
"use sfaadmin to import from plc"
auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
- return \
- self.run_in_guest('sfaadmin reg import_registry')==0
-# not needed anymore
-# self.run_in_guest('cp /etc/sfa/authorities/%s/%s.pkey /etc/sfa/authorities/server.key'%(auth,auth))
+ return self.run_in_guest('sfaadmin reg import_registry')==0
def sfa_start(self):
"service sfa start"
- return self.run_in_guest('service sfa start')==0
+ return self.start_service('sfa')
+
def sfi_configure(self):
"Create /root/sfi on the plc side for sfi client configuration"
@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
def sfa_stop(self):
"service sfa stop"
- self.run_in_guest('service sfa stop')==0
- return True
+ return self.stop_service ('sfa')
def populate (self):
"creates random entries in the PLCAPI"
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