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)
default_steps = [
'show', SEP,
- 'vs_delete','vs_create','timestamp_vs', 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', SEP,
- 'qemu_export', 'qemu_kill_all', 'qemu_start', 'timestamp_qemu', SEP,
+ 'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', SEP,
'sfa_install', 'sfa_configure', 'cross_sfa_configure', 'sfa_import', 'sfa_start', 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', SEP,
- 'force_gather_logs', 'force_local_post', SEP,
+ 'force_gather_logs', SEP,
]
other_steps = [
'check_hooks',
'delete_leases', 'list_leases', SEP,
'populate' , SEP,
'nodestate_show','nodestate_safeboot','nodestate_boot', SEP,
- 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_mine', SEP,
+ 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP,
'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEP,
'plc_db_dump' , 'plc_db_restore', SEP,
'standby_1 through 20',SEP,
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)
+ self.test_ssh=TestSsh(self.plc_spec['host_box'],self.options.buildname)
try:
self.vserverip=plc_spec['vserverip']
self.vservername=plc_spec['vservername']
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()
@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'])
+ 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']
- # write a timestamp in /vservers/<>/
+ # 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())
- utils.system(self.test_ssh.actual_command("mkdir -p /vservers/%s"%self.vservername))
- return utils.system(self.test_ssh.actual_command("echo %d > /vservers/%s/timestamp"%(now,self.vservername)))==0
+ return utils.system(self.test_ssh.actual_command("echo %d > /vservers/%s.timestamp"%(now,self.vservername)))==0
def local_pre (self):
"run site-dependant pre-test script as defined in LocalTestResources"
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
### install
# 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
return self.run_in_guest('service sfa start')==0
def sfi_configure(self):
- "Create /root/.sfi on the plc side for sfi client configuration"
+ "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']
- dir_name=self.confsubdir("dot-sfi",clean=True,dry_run=self.options.dry_run)
- if self.options.dry_run: return 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="/vservers/%s/%s"%(self.vservername,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):
git://git.onelab.eu / tests.git / blobdiff