default_steps = [
'show', SEP,
- 'vs_delete','timestamp_vs','vs_create', SEP,
-# 'plc_install', 'mod_python', 'plc_configure', 'plc_start', SEP,
+ 'plcvm_delete','plcvm_timestamp','plcvm_create', SEP,
'plc_install', 'plc_configure', 'plc_start', SEP,
'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP,
'plcapi_urls','speed_up_slices', SEP,
'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP,
# slices created under plcsh interactively seem to be fine but these ones don't have the tags
# keep this our of the way for now
-# 'check_vsys_defaults', SEP,
+ 'check_vsys_defaults_ignore', SEP,
+# run this first off so it's easier to re-run on another qemu box
+ 'qemu_kill_mine', SEP,
'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP,
- 'qemu_kill_mine','qemu_clean_mine', 'qemu_export', 'qemu_start', 'timestamp_qemu', SEP,
+ 'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 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,
'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_ignore', SEP,
+ 'ping_node', 'ssh_node_debug', 'plcsh_stress_test@1', SEP,
+ 'ssh_node_boot', 'node_bmlogs', '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,
# check slices are turned off properly
]
other_steps = [
'export', 'show_boxes', SEP,
- 'check_hooks', 'plc_stop', 'vs_start', 'vs_stop', SEP,
+ 'check_hooks', 'plc_stop', 'plcvm_start', 'plcvm_stop', SEP,
'delete_initscripts', 'delete_nodegroups','delete_all_sites', SEP,
'delete_sites', 'delete_nodes', 'delete_slices', 'keys_clean', SEP,
'delete_leases', 'list_leases', SEP,
def run_in_host (self,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):
- # need to backslash stuff here and not later on
- backslashed_command=TestSsh.backslash_shell_specials(command)
# f14 still needs some extra help
if self.options.fcdistro == 'f14':
- raw="virsh -c lxc:/// lxc-enter-namespace %s /bin/bash -c \\'PATH=/bin:/sbin:/usr/bin:/usr/sbin %s\\'" %(self.vservername,backslashed_command)
+ raw="virsh -c lxc:/// lxc-enter-namespace %s -- /usr/bin/env PATH=/bin:/sbin:/usr/bin:/usr/sbin %s" %(self.vservername,command)
else:
- raw="virsh -c lxc:/// lxc-enter-namespace %s /bin/bash -c \\'%s\\'" %(self.vservername,backslashed_command)
+ raw="virsh -c lxc:/// lxc-enter-namespace %s -- /usr/bin/env %s" %(self.vservername,command)
return raw
# this /vservers thing is legacy...
# write a timestamp in /vservers/<>.timestamp
# cannot be inside the vserver, that causes vserver .. build to cough
- def timestamp_vs (self):
+ def plcvm_timestamp (self):
"Create a timestamp to remember creation date for this plc"
now=int(time.time())
# TODO-lxc check this one
# this is called inconditionnally at the beginning of the test sequence
# just in case this is a rerun, so if the vm is not running it's fine
- def vs_delete(self):
+ def plcvm_delete(self):
"vserver delete the test myplc"
stamp_path=self.vm_timestamp_path()
self.run_in_host("rm -f %s"%stamp_path)
# historically the build was being fetched by the tests
# now the build pushes itself as a subdir of the tests workdir
# so that the tests do not have to worry about extracting the build (svn, git, or whatever)
- def vs_create (self):
+ def plcvm_create (self):
"vserver creation (no install done)"
# push the local build/ dir to the testplc box
if self.is_local():
# 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 plc_start(self):
- "service plc start (use a special trick to set SYSTEMCTL_SKIP_REDIRECT on f14)"
+ 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':
- self.run_in_guest ("service plc start")
+ 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
- self.run_in_guest ("sed -i -e 's,env -i ,,' /sbin/service")
- self.run_in_guest("SYSTEMCTL_SKIP_REDIRECT=true /etc/init.d/plc start")
- # retcod of service is not meaningful
- return True
+ return self.run_in_guest("SYSTEMCTL_SKIP_REDIRECT=true service %s %s"%(service,start_or_stop))==0
+
+ def plc_start(self):
+ "service plc start"
+ return self.start_service ('plc')
def plc_stop(self):
- "service plc stop (use a special trick to set SYSTEMCTL_SKIP_REDIRECT on f14)"
- if self.options.fcdistro != 'f14':
- self.run_in_guest ("service plc stop")
- else:
- # patch /sbin/service so it does not reset environment
- # this is because our own scripts in turn call service
- self.run_in_guest ("sed -i -e 's,env -i ,,' /sbin/service")
- self.run_in_guest("SYSTEMCTL_SKIP_REDIRECT=true /etc/init.d/plc stop")
- # retcod of service is not meaningful
- return True
-
- def vs_start (self):
+ "service plc stop"
+ return self.stop_service ('plc')
+
+ def plcvm_start (self):
"start the PLC vserver"
self.start_guest()
return True
- def vs_stop (self):
+ def plcvm_stop (self):
"stop the PLC vserver"
self.stop_guest()
return True
def nodes_booted(self):
return self.nodes_check_boot_state('boot',timeout_minutes=30,silent_minutes=28)
+ # probing nodes
+ def check_nodes_ping(self,timeout_seconds=120,period_seconds=10):
+ class CompleterTaskPingNode (CompleterTask):
+ def __init__ (self, hostname):
+ self.hostname=hostname
+ def run(self,silent):
+ command="ping -c 1 -w 1 %s >& /dev/null"%self.hostname
+ return utils.system (command, silent=silent)==0
+ def failure_message (self):
+ return "Cannot ping node with name %s"%self.hostname
+ timeout=timedelta (seconds=timeout_seconds)
+ graceout=timeout
+ period=timedelta (seconds=period_seconds)
+ node_infos = self.all_node_infos()
+ tasks = [ CompleterTaskPingNode (h) for (h,_) in node_infos ]
+ return Completer (tasks).run (timeout, graceout, period)
+
+ # ping node before we try to reach ssh, helpful for troubleshooting failing bootCDs
+ def ping_node (self):
+ "Ping nodes"
+ return self.check_nodes_ping ()
+
def check_nodes_ssh(self,debug,timeout_minutes,silent_minutes,period_seconds=15):
class CompleterTaskNodeSsh (CompleterTask):
def __init__ (self, hostname, qemuname, boot_state, local_key):
def qemu_start (self) : pass
@node_mapper
- def timestamp_qemu (self) : pass
+ def qemu_timestamp (self) : pass
# when a spec refers to a node possibly on another plc
def locate_sliver_obj_cross (self, nodename, slicename, other_plcs):
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"
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"
git://git.onelab.eu / tests.git / blobdiff