return actual
def node_mapper (method):
- def actual(self):
+ def actual(self,*args, **kwds):
overall=True
node_method = TestNode.__dict__[method.__name__]
- for site_spec in self.plc_spec['sites']:
- test_site = TestSite (self,site_spec)
- for node_spec in site_spec['nodes']:
- test_node = TestNode (self,test_site,node_spec)
- if not node_method(test_node): overall=False
+ for test_node in self.all_nodes():
+ if not node_method(test_node, *args, **kwds): overall=False
return overall
# restore the doc text
actual.__doc__=method.__doc__
'ssh_node_debug@1', 'plcsh_stress_test@1', SEP,
'ssh_node_boot@1', 'ssh_slice', 'check_initscripts', SEP,
'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA,
- 'check_tcp', SEP,
+ 'check_tcp', 'check_netflow', SEP,
'force_gather_logs', SEP,
]
other_steps = [
self.plc_spec=plc_spec
self.options=options
self.test_ssh=TestSsh(self.plc_spec['host_box'],self.options.buildname)
- try:
- self.vserverip=plc_spec['vserverip']
- self.vservername=plc_spec['vservername']
- self.url="https://%s:443/PLCAPI/"%plc_spec['vserverip']
- self.vserver=True
- except:
- raise Exception,'chroot-based myplc testing is deprecated'
+ self.vserverip=plc_spec['vserverip']
+ self.vservername=plc_spec['vservername']
+ self.url="https://%s:443/PLCAPI/"%plc_spec['vserverip']
self.apiserver=TestApiserver(self.url,options.dry_run)
def name(self):
def run_in_host (self,command):
return self.test_ssh.run_in_buildname(command)
- #command gets run in the vserver
+ #command gets run in the plc's vm
def host_to_guest(self,command):
- return "vserver %s exec %s"%(self.vservername,command)
+ if self.options.plcs_use_lxc:
+ return "ssh -o StrictHostKeyChecking=no %s %s"%(self.vserverip,command)
+ else:
+ return "vserver %s exec %s"%(self.vservername,command)
+ 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)
+
+ def vm_timestamp_path (self):
+ if self.options.plcs_use_lxc:
+ return "/var/lib/lxc/%s.timestamp"%(self.vservername)
+ else:
+ return "/vservers/%s.timestamp"%(self.vservername)
+
#start/stop the vserver
def start_guest_in_host(self):
- return "vserver %s start"%(self.vservername)
+ if self.options.plcs_use_lxc:
+ return "lxc-start --daemon --name=%s"%(self.vservername)
+ else:
+ return "vserver %s start"%(self.vservername)
def stop_guest_in_host(self):
- return "vserver %s stop"%(self.vservername)
+ if self.options.plcs_use_lxc:
+ return "lxc-stop --name=%s"%(self.vservername)
+ else:
+ return "vserver %s stop"%(self.vservername)
# xxx quick n dirty
def run_in_guest_piped (self,local,remote):
if isinstance (rpms, list):
rpms=" ".join(rpms)
self.run_in_guest("yum -y install %s"%rpms)
- self.run_in_guest("yum-complete-transaction")
- return self.run_in_guest("rpm -q %s"%rpms)==0
+ # yum-complete-transaction comes with yum-utils, that is in vtest.pkgs
+ self.run_in_guest("yum-complete-transaction -y")
+ return self.run_in_guest("rpm -q %s"%rpms)==0
def auth_root (self):
return {'Username':self.plc_spec['PLC_ROOT_USER'],
def export (self):
"print cut'n paste-able stuff to export env variables to your shell"
- # these work but the shell prompt does not get displayed..
- command1="ssh %s vserver %s enter"%(self.plc_spec['host_box'],self.plc_spec['vservername'])
- command2="ssh root@%s %s"%(socket.gethostname(),command1)
# guess local domain from hostname
domain=socket.gethostname().split('.',1)[1]
fqdn="%s.%s"%(self.plc_spec['host_box'],domain)
@staticmethod
def display_mapping_plc (plc_spec):
print '+ MyPLC',plc_spec['name']
+ # WARNING this would not be right for lxc-based PLC's - should be harmless though
print '+\tvserver address = root@%s:/vservers/%s'%(plc_spec['host_box'],plc_spec['vservername'])
print '+\tIP = %s/%s'%(plc_spec['PLC_API_HOST'],plc_spec['vserverip'])
for site_spec in plc_spec['sites']:
# cannot be inside the vserver, that causes vserver .. build to cough
def timestamp_vs (self):
now=int(time.time())
- return utils.system(self.test_ssh.actual_command("echo %d > /vservers/%s.timestamp"%(now,self.vservername)))==0
+ # TODO-lxc check this one
+ # a first approx. is to store the timestamp close to the VM root like vs does
+ stamp_path=self.vm_timestamp_path ()
+ stamp_dir = os.path.dirname (stamp_path)
+ utils.system(self.test_ssh.actual_command("mkdir -p %s"%stamp_dir))
+ return utils.system(self.test_ssh.actual_command("echo %d > %s"%(now,stamp_path)))==0
-# def local_pre (self):
-# "run site-dependant pre-test script as defined in LocalTestResources"
-# from LocalTestResources import local_resources
-# return local_resources.step_pre(self)
-#
-# def local_post (self):
-# "run site-dependant post-test script as defined in LocalTestResources"
-# from LocalTestResources import local_resources
-# return local_resources.step_post(self)
-#
-# def local_list (self):
-# "run site-dependant list script as defined in LocalTestResources"
-# from LocalTestResources import local_resources
-# return local_resources.step_list(self)
-#
-# def local_rel (self):
-# "run site-dependant release script as defined in LocalTestResources"
-# from LocalTestResources import local_resources
-# return local_resources.step_release(self)
-#
-# def local_rel_plc (self):
-# "run site-dependant release script as defined in LocalTestResources"
-# from LocalTestResources import local_resources
-# return local_resources.step_release_plc(self)
-#
-# def local_rel_qemu (self):
-# "run site-dependant release script as defined in LocalTestResources"
-# from LocalTestResources import local_resources
-# return local_resources.step_release_qemu(self)
-#
+ # 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):
"vserver delete the test myplc"
- self.run_in_host("vserver --silent %s delete"%self.vservername)
- self.run_in_host("rm -f /vservers/%s.timestamp"%self.vservername)
- return True
+ 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("lxc-stop --name %s"%self.vservername)
+ self.run_in_host("lxc-destroy --name %s"%self.vservername)
+ return True
+ else:
+ self.run_in_host("vserver --silent %s delete"%self.vservername)
+ return True
### install
# historically the build was being fetched by the tests
test_env_options += " -p %s"%self.options.personality
test_env_options += " -d %s"%self.options.pldistro
test_env_options += " -f %s"%self.options.fcdistro
- script="vtest-init-vserver.sh"
+ if self.options.plcs_use_lxc:
+ script="vtest-init-lxc.sh"
+ else:
+ script="vtest-init-vserver.sh"
vserver_name = self.vservername
vserver_options="--netdev eth0 --interface %s"%self.vserverip
try:
pkgs_list.append ("slicerepo-%s"%nodefamily)
pkgs_list.append ("myplc")
pkgs_list.append ("noderepo-%s"%nodefamily)
- pkgs_list.append ("bootstrapfs-%s-plain"%nodefamily)
+ pkgs_list.append ("nodeimage-%s-plain"%nodefamily)
pkgs_string=" ".join(pkgs_list)
return self.yum_install (pkgs_list)
if not os.path.isdir(dir):
os.mkdir(dir)
vservername=self.vservername
+ vm_root=self.vm_root_in_host()
overall=True
prefix = 'debug_ssh_key'
for ext in [ 'pub', 'rsa' ] :
- src="/vservers/%(vservername)s/etc/planetlab/%(prefix)s.%(ext)s"%locals()
+ src="%(vm_root)s/etc/planetlab/%(prefix)s.%(ext)s"%locals()
dst="keys/%(vservername)s-debug.%(ext)s"%locals()
if self.test_ssh.fetch(src,dst) != 0: overall=False
return overall
overall=False
return overall
+ # a list of TestNode objs
+ def all_nodes (self):
+ nodes=[]
+ for site_spec in self.plc_spec['sites']:
+ test_site = TestSite (self,site_spec)
+ for node_spec in site_spec['nodes']:
+ nodes.append(TestNode (self,test_site,node_spec))
+ return nodes
+
# return a list of tuples (nodename,qemuname)
def all_node_infos (self) :
node_infos = []
return True
def nodes_booted(self):
- return self.nodes_check_boot_state('boot',timeout_minutes=30,silent_minutes=20)
+ return self.nodes_check_boot_state('boot',timeout_minutes=30,silent_minutes=28)
def check_nodes_ssh(self,debug,timeout_minutes,silent_minutes,period=15):
# compute timeout
def ssh_node_debug(self):
"Tries to ssh into nodes in debug mode with the debug ssh key"
- return self.check_nodes_ssh(debug=True,timeout_minutes=10,silent_minutes=5)
+ return self.check_nodes_ssh(debug=True,timeout_minutes=10,silent_minutes=8)
def ssh_node_boot(self):
"Tries to ssh into nodes in production mode with the root ssh key"
- return self.check_nodes_ssh(debug=False,timeout_minutes=40,silent_minutes=15)
+ return self.check_nodes_ssh(debug=False,timeout_minutes=40,silent_minutes=38)
@node_mapper
def qemu_local_init (self):
overall=False
return overall
+ # painfully enough, we need to allow for some time as netflow might show up last
+ def check_netflow (self):
+ "all nodes: check that the netflow slice is alive"
+ return self.check_systemslice ('netflow')
+
+ # we have the slices up already here, so it should not take too long
+ def check_systemslice (self, slicename, timeout_minutes=5, period=15):
+ timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes)
+ test_nodes=self.all_nodes()
+ while test_nodes:
+ for test_node in test_nodes:
+ if test_node.check_systemslice (slicename):
+ utils.header ("ok")
+ test_nodes.remove(test_node)
+ else:
+ print '.',
+ if not test_nodes:
+ return True
+ if datetime.datetime.now () > timeout:
+ for test_node in test_nodes:
+ utils.header ("can't find system slice %s in %s"%(slicename,test_node.name()))
+ return False
+ time.sleep(period)
+ return True
+
def plcsh_stress_test (self):
"runs PLCAPI stress test, that checks Add/Update/Delete on all types - preserves contents"
# install the stress-test in the plc image
location = "/usr/share/plc_api/plcsh_stress_test.py"
- remote="/vservers/%s/%s"%(self.vservername,location)
+ remote="%s/%s"%(self.vm_root_in_host(),location)
self.test_ssh.copy_abs("plcsh_stress_test.py",remote)
command = location
command += " -- --check"
def sfa_dbclean(self):
"thoroughly wipes off the SFA database"
- self.run_in_guest("sfa-nuke-plc.py")==0
+ self.run_in_guest("sfa-nuke.py")==0 or \
+ self.run_in_guest("sfa-nuke-plc.py") or \
+ self.run_in_guest("sfaadmin.py registry nuke")
return True
def sfa_plcclean(self):
fileconf=open(tmpname,'w')
for var in [ 'SFA_REGISTRY_ROOT_AUTH',
'SFA_INTERFACE_HRN',
-# 'SFA_REGISTRY_LEVEL1_AUTH',
+ 'SFA_REGISTRY_LEVEL1_AUTH',
'SFA_REGISTRY_HOST',
'SFA_AGGREGATE_HOST',
'SFA_SM_HOST',
'SFA_PLC_PASSWORD',
'SFA_DB_HOST',
'SFA_DB_USER',
-# 'SFA_DB_PASSWORD',
- # should be tmp
-# 'SFA_DB_NAME',
+ 'SFA_DB_PASSWORD',
+ 'SFA_DB_NAME',
+ 'SFA_API_LOGLEVEL',
]:
- fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
+ if self.plc_spec['sfa'].has_key(var):
+ fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
# the way plc_config handles booleans just sucks..
- for var in ['SFA_API_DEBUG']:
+ for var in []:
val='false'
if self.plc_spec['sfa'][var]: val='true'
fileconf.write ('e %s\n%s\n'%(var,val))
file(reg_fname,"w").write("<registries>%s</registries>\n" % \
" ".join([ plc.registry_xml_line() for plc in other_plcs ]))
utils.header ("(Over)wrote %s"%reg_fname)
- return self.test_ssh.copy_abs(agg_fname,'/vservers/%s/etc/sfa/aggregates.xml'%self.vservername)==0 \
- and self.test_ssh.copy_abs(reg_fname,'/vservers/%s/etc/sfa/registries.xml'%self.vservername)==0
+ return self.test_ssh.copy_abs(agg_fname,'/%s/etc/sfa/aggregates.xml'%self.vm_root_in_host())==0 \
+ and self.test_ssh.copy_abs(reg_fname,'/%s/etc/sfa/registries.xml'%self.vm_root_in_host())==0
def sfa_import(self):
"sfa-import-plc"
- auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
- return self.run_in_guest('sfa-import-plc.py')==0
+ auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
+ return self.run_in_guest('sfa-import.py')==0 or \
+ self.run_in_guest('sfa-import-plc.py')==0 or \
+ self.run_in_guest('sfaadmin.py registry import_registry')==0
# not needed anymore
# self.run_in_guest('cp /etc/sfa/authorities/%s/%s.pkey /etc/sfa/authorities/server.key'%(auth,auth))
test_slice.sfi_config(dir_name)
# push into the remote /root/sfi area
location = test_slice.sfi_path()
- remote="/vservers/%s/%s"%(self.vservername,location)
+ remote="%s/%s"%(self.vm_root_in_host(),location)
self.test_ssh.mkdir(remote,abs=True)
# need to strip last level or remote otherwise we get an extra dir level
self.test_ssh.copy_abs(dir_name, os.path.dirname(remote), recursive=True)
"creates random entries in the PLCAPI"
# install the stress-test in the plc image
location = "/usr/share/plc_api/plcsh_stress_test.py"
- remote="/vservers/%s/%s"%(self.vservername,location)
+ remote="%s/%s"%(self.vm_root_in_host(),location)
self.test_ssh.copy_abs("plcsh_stress_test.py",remote)
command = location
command += " -- --preserve --short-names"
git://git.onelab.eu / tests.git / blobdiff