from TestKey import TestKey
from TestSlice import TestSlice
from TestSliver import TestSliver
-from TestBox import TestBox
+from TestBoxQemu import TestBoxQemu
from TestSsh import TestSsh
from TestApiserver import TestApiserver
from TestSliceSfa import TestSliceSfa
-from TestUserSfa import TestUserSfa
# step methods must take (self) and return a boolean (options is a member of the class)
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__
class TestPlc:
default_steps = [
- 'show', 'local_pre', SEP,
- 'vs_delete','vs_create','plc_install', 'plc_configure', 'plc_start', SEP,
+ 'show', SEP,
+ 'vs_delete','timestamp_vs','vs_create', SEP,
+ 'plc_install', 'plc_configure', 'plc_start', SEP,
'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP,
'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP,
- 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', 'qemu_export', 'qemu_kill_all', 'qemu_start', SEP,
- 'sfa_install', 'sfa_configure', 'cross_sfa_configure', 'sfa_import', 'sfa_start', SEPSFA,
+ 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP,
+ 'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', SEP,
+ 'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA,
'sfi_configure@1', 'sfa_add_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA,
'sfa_create_slice@1', 'sfa_check_slice_plc@1', SEPSFA,
'sfa_update_user@1', 'sfa_update_slice@1', 'sfa_view@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', 'plcsh_stress_test@1', SEP,
- 'ssh_node_boot', 'ssh_slice', 'check_initscripts', SEP,
+ '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', 'check_hooks@1', SEP,
- 'force_gather_logs', 'force_local_post', SEP,
+ 'check_tcp', 'check_netflow', SEP,
+ 'force_gather_logs', SEP,
]
other_steps = [
- 'free_all',
- 'show_boxes', 'local_list','local_rel','local_rel_plc','local_rel_qemu',SEP,
- 'plc_stop', 'vs_start', 'vs_stop', SEP,
+ 'export', 'show_boxes', SEP,
+ 'check_hooks', 'plc_stop', 'vs_start', 'vs_stop', SEP,
'delete_initscripts', 'delete_nodegroups','delete_all_sites', SEP,
'delete_sites', 'delete_nodes', 'delete_slices', 'keys_clean', SEP,
'delete_leases', 'list_leases', SEP,
'populate' , SEP,
'nodestate_show','nodestate_safeboot','nodestate_boot', SEP,
- 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_mine', SEP,
- 'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', 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,
- 'standby_1 through 20',SEP,
+ 'standby_1_through_20',SEP,
]
@staticmethod
return step != SEP and step != SEPSFA
# turn off the sfa-related steps when build has skipped SFA
- # this is originally for centos5 as recent SFAs won't build on this platformb
+ # this is originally for centos5 as recent SFAs won't build on this platform
@staticmethod
def check_whether_build_has_sfa (rpms_url):
# warning, we're now building 'sface' so let's be a bit more picky
def __init__ (self,plc_spec,options):
self.plc_spec=plc_spec
self.options=options
- self.test_ssh=TestSsh(self.plc_spec['hostname'],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.test_ssh=TestSsh(self.plc_spec['host_box'],self.options.buildname)
+ 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):
return "%s.%s"%(name,self.vservername)
def hostname(self):
- return self.plc_spec['hostname']
+ return self.plc_spec['host_box']
def is_local (self):
return self.test_ssh.is_local()
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):
return utils.system(local+" | "+self.test_ssh.actual_command(self.host_to_guest(remote),keep_stdin=True))
+ # does a yum install in the vs, ignore yum retcod, check with rpm
+ def yum_install (self, rpms):
+ if isinstance (rpms, list):
+ rpms=" ".join(rpms)
+ self.run_in_guest("yum -y install %s"%rpms)
+ # 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'],
'AuthMethod':'password',
for (box,nodes) in self.gather_hostBoxes().iteritems():
# pass the first nodename, as we don't push template-qemu on testboxes
nodedir=nodes[0].nodedir()
- TestBox(box,self.options.buildname).qemu_kill_all(nodedir)
+ TestBoxQemu(box,self.options.buildname).qemu_kill_all(nodedir)
return True
# make this a valid step
'list all qemu instances on the qemu boxes involved by this setup'
for (box,nodes) in self.gather_hostBoxes().iteritems():
# this is the brute force version, kill all qemus on that host box
- TestBox(box,self.options.buildname).qemu_list_all()
+ TestBoxQemu(box,self.options.buildname).qemu_list_all()
return True
# kill only the right qemus
self.display_pass (2)
return True
+ def export (self):
+ "print cut'n paste-able stuff to export env variables to your shell"
+ # guess local domain from hostname
+ domain=socket.gethostname().split('.',1)[1]
+ fqdn="%s.%s"%(self.plc_spec['host_box'],domain)
+ print "export BUILD=%s"%self.options.buildname
+ print "export PLCHOST=%s"%fqdn
+ print "export GUEST=%s"%self.plc_spec['vservername']
+ # find hostname of first node
+ (hostname,qemubox) = self.all_node_infos()[0]
+ print "export KVMHOST=%s.%s"%(qemubox,domain)
+ print "export NODE=%s"%(hostname)
+ return True
+
# entry point
always_display_keys=['PLC_WWW_HOST','nodes','sites',]
def display_pass (self,passno):
@staticmethod
def display_mapping_plc (plc_spec):
print '+ MyPLC',plc_spec['name']
- print '+\tvserver address = root@%s:/vservers/%s'%(plc_spec['hostname'],plc_spec['vservername'])
+ # 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']:
for node_spec in site_spec['nodes']:
print '+\tqemu box %s'%node_spec['host_box']
print '+\thostname=%s'%node_spec['node_fields']['hostname']
- 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)
-
+ # write a timestamp in /vservers/<>.timestamp
+ # cannot be inside the vserver, that causes vserver .. build to cough
+ def timestamp_vs (self):
+ now=int(time.time())
+ # 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
+
+ # 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)
- 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)
- self.run_in_guest("yum -y install %s"%pkgs_string)
- return self.run_in_guest("rpm -q %s"%pkgs_string)==0
+ return self.yum_install (pkgs_list)
###
def plc_configure(self):
'PLC_MAIL_ENABLED',
'PLC_MAIL_SUPPORT_ADDRESS',
'PLC_DB_HOST',
- 'PLC_DB_PASSWORD',
+# 'PLC_DB_PASSWORD',
# Above line was added for integrating SFA Testing
'PLC_API_HOST',
'PLC_WWW_HOST',
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):
"all nodes: start the qemu instance (also runs qemu-bridge-init start)"
pass
+ @node_mapper
+ def timestamp_qemu (self) :
+ "all nodes: start the qemu instance (also runs qemu-bridge-init start)"
+ pass
+
def check_tcp (self):
"check TCP connectivity between 2 slices (or in loopback if only one is defined)"
specs = self.plc_spec['tcp_test']
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"
# in particular runs with --preserve (dont cleanup) and without --check
# also it gets run twice, once with the --foreign option for creating fake foreign entries
- ### sfa_install_rpm
- def sfa_install(self):
- "yum install sfa, sfa-plc and sfa-client"
- # ignore yum retcod
- self.run_in_guest("yum -y install sfa sfa-client sfa-plc sfa-sfatables")
- return self.run_in_guest("rpm -q sfa sfa-client sfa-plc sfa-sfatables")==0
+ def sfa_install_all (self):
+ "yum install sfa sfa-plc sfa-sfatables sfa-client"
+ return self.yum_install ("sfa sfa-plc sfa-sfatables sfa-client")
+
+ def sfa_install_core(self):
+ "yum install sfa"
+ return self.yum_install ("sfa")
+
+ def sfa_install_plc(self):
+ "yum install sfa-plc"
+ return self.yum_install("sfa-plc")
+
+ def sfa_install_client(self):
+ "yum install sfa-client"
+ return self.yum_install("sfa-client")
+ def sfa_install_sfatables(self):
+ "yum install sfa-sfatables"
+ return self.yum_install ("sfa-sfatables")
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):
# ignore result
sfa_spec=self.plc_spec['sfa']
- slicename='%s_%s'%(sfa_spec['login_base'],sfa_spec['slicename'])
- try: self.apiserver.DeleteSlice(self.auth_root(),slicename)
- except: print "Slice %s already absent from PLC db"%slicename
+ for sfa_slice_spec in sfa_spec['sfa_slice_specs']:
+ slicename='%s_%s'%(sfa_slice_spec['login_base'],sfa_slice_spec['slicename'])
+ try: self.apiserver.DeleteSlice(self.auth_root(),slicename)
+ except: print "Slice %s already absent from PLC db"%slicename
- username="%s@%s"%(sfa_spec['regularuser'],sfa_spec['domain'])
- try: self.apiserver.DeletePerson(self.auth_root(),username)
- except: print "User %s already absent from PLC db"%username
+ username="%s@%s"%(sfa_slice_spec['regularuser'],sfa_slice_spec['domain'])
+ try: self.apiserver.DeletePerson(self.auth_root(),username)
+ except: print "User %s already absent from PLC db"%username
print "REMEMBER TO RUN sfa_import AGAIN"
return True
def conffile(self,filename):
return "%s/%s"%(self.confdir(),filename)
- def confsubdir(self,dirname,clean):
+ def confsubdir(self,dirname,clean,dry_run=False):
subdirname="%s/%s"%(self.confdir(),dirname)
if clean:
utils.system("rm -rf %s"%subdirname)
if not os.path.isdir(subdirname):
utils.system("mkdir -p %s"%subdirname)
- if not os.path.isdir(subdirname):
+ if not dry_run and not os.path.isdir(subdirname):
raise "Cannot create config subdir %s for plc %s"%(dirname,self.name())
return subdirname
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_URL',
'SFA_PLC_USER',
'SFA_PLC_PASSWORD',
- 'SFA_PLC_DB_HOST',
- 'SFA_PLC_DB_USER',
- 'SFA_PLC_DB_PASSWORD',
- 'SFA_PLC_URL',
+ 'SFA_DB_HOST',
+ 'SFA_DB_USER',
+ '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))
return True
def aggregate_xml_line(self):
- return '<aggregate addr="%s" hrn="%s" port="12347"/>' % \
- (self.vserverip,self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'])
+ port=self.plc_spec['sfa']['neighbours-port']
+ return '<aggregate addr="%s" hrn="%s" port="%r"/>' % \
+ (self.vserverip,self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'],port)
def registry_xml_line(self):
return '<registry addr="%s" hrn="%s" port="12345"/>' % \
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))
return self.run_in_guest('service sfa start')==0
def sfi_configure(self):
- "Create /root/.sfi on the plc side"
+ "Create /root/sfi on the plc side for sfi client configuration"
+ if self.options.dry_run:
+ utils.header("DRY RUN - skipping step")
+ return True
sfa_spec=self.plc_spec['sfa']
- "sfi client configuration"
- dir_name=self.confsubdir("dot-sfi",clean=True)
- file_name=dir_name + os.sep + sfa_spec['piuser'] + '.pkey'
- fileconf=open(file_name,'w')
- fileconf.write (self.plc_spec['keys'][0]['private'])
- fileconf.close()
- utils.header ("(Over)wrote %s"%file_name)
-
- file_name=dir_name + os.sep + 'sfi_config'
- fileconf=open(file_name,'w')
- SFI_AUTH="%s.%s"%(sfa_spec['SFA_REGISTRY_ROOT_AUTH'],sfa_spec['login_base'])
- fileconf.write ("SFI_AUTH='%s'"%SFI_AUTH)
- fileconf.write('\n')
- SFI_USER=SFI_AUTH + '.' + sfa_spec['piuser']
- fileconf.write ("SFI_USER='%s'"%SFI_USER)
- fileconf.write('\n')
- SFI_REGISTRY='http://' + sfa_spec['SFA_PLC_DB_HOST'] + ':12345/'
- fileconf.write ("SFI_REGISTRY='%s'"%SFI_REGISTRY)
- fileconf.write('\n')
- SFI_SM='http://' + sfa_spec['SFA_PLC_DB_HOST'] + ':12347/'
- fileconf.write ("SFI_SM='%s'"%SFI_SM)
- fileconf.write('\n')
- fileconf.close()
- utils.header ("(Over)wrote %s"%file_name)
-
- file_name=dir_name + os.sep + 'person.xml'
- fileconf=open(file_name,'w')
- for record in sfa_spec['sfa_person_xml']:
- person_record=record
- fileconf.write(person_record)
- fileconf.write('\n')
- fileconf.close()
- utils.header ("(Over)wrote %s"%file_name)
-
- file_name=dir_name + os.sep + 'slice.xml'
- fileconf=open(file_name,'w')
- for record in sfa_spec['sfa_slice_xml']:
- slice_record=record
- #slice_record=sfa_spec['sfa_slice_xml']
- fileconf.write(slice_record)
- fileconf.write('\n')
- utils.header ("(Over)wrote %s"%file_name)
- fileconf.close()
-
- file_name=dir_name + os.sep + 'slice.rspec'
- fileconf=open(file_name,'w')
- slice_rspec=''
- for (key, value) in sfa_spec['sfa_slice_rspec'].items():
- slice_rspec +=value
- fileconf.write(slice_rspec)
- fileconf.write('\n')
- fileconf.close()
- utils.header ("(Over)wrote %s"%file_name)
-
- # push to the remote root's .sfi
- location = "root/.sfi"
- remote="/vservers/%s/%s"%(self.vservername,location)
- self.test_ssh.copy_abs(dir_name, remote, recursive=True)
+ # cannot use sfa_slice_mapper to pass dir_name
+ for slice_spec in self.plc_spec['sfa']['sfa_slice_specs']:
+ site_spec = self.locate_site (slice_spec['sitename'])
+ test_site = TestSite(self,site_spec)
+ test_slice=TestSliceSfa(self,test_site,slice_spec)
+ dir_name=self.confsubdir("dot-sfi/%s"%slice_spec['slicename'],clean=True,dry_run=self.options.dry_run)
+ test_slice.sfi_config(dir_name)
+ # push into the remote /root/sfi area
+ location = test_slice.sfi_path()
+ 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)
return True
def sfi_clean (self):
- "clean up /root/.sfi on the plc side"
- self.run_in_guest("rm -rf /root/.sfi")
+ "clean up /root/sfi on the plc side"
+ self.run_in_guest("rm -rf /root/sfi")
return True
+ @slice_sfa_mapper
def sfa_add_user(self):
- "run sfi.py add using person.xml"
- return TestUserSfa(self).add_user()
+ "run sfi.py add"
+ pass
+ @slice_sfa_mapper
def sfa_update_user(self):
- "run sfi.py update using person.xml"
- return TestUserSfa(self).update_user()
+ "run sfi.py update"
@slice_sfa_mapper
def sfa_add_slice(self):
"run sfi.py create (on SM) on existing object"
pass
+ @slice_sfa_mapper
def sfa_view(self):
- "run sfi.py list and sfi.py show (both on Registry) and sfi.py slices and sfi.py resources (both on SM)"
- sfa_spec=self.plc_spec['sfa']
- auth=sfa_spec['SFA_REGISTRY_ROOT_AUTH']
- return \
- self.run_in_guest("sfi.py -d /root/.sfi/ list %s.%s"%(auth,sfa_spec['login_base']))==0 and \
- self.run_in_guest("sfi.py -d /root/.sfi/ show %s.%s"%(auth,sfa_spec['login_base']))==0 and \
- self.run_in_guest("sfi.py -d /root/.sfi/ slices")==0 and \
- self.run_in_guest("sfi.py -d /root/.sfi/ resources -o resources")==0
+ "various registry-related calls"
+ pass
@slice_sfa_mapper
def ssh_slice_sfa(self):
"tries to ssh-enter the SFA slice"
pass
+ @slice_sfa_mapper
def sfa_delete_user(self):
- "run sfi.py delete (on SM) for user"
- test_user_sfa=TestUserSfa(self)
- return test_user_sfa.delete_user()
+ "run sfi.py delete"
+ pass
@slice_sfa_mapper
def sfa_delete_slice(self):
"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"
utils.header('Database restored from ' + dump)
+ def standby_1_through_20(self):
+ """convenience function to wait for a specified number of minutes"""
+ pass
@standby_generic
def standby_1(): pass
@standby_generic
git://git.onelab.eu / tests.git / blobdiff