'plc_install', 'plc_configure', 'plc_start', SEP,
'keys_fetch', 'keys_store', 'keys_clear_known_hosts', '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,
'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_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,
self.vservername=plc_spec['vservername']
self.url="https://%s:443/PLCAPI/"%plc_spec['vserverip']
self.apiserver=TestApiserver(self.url,options.dry_run)
+ (self.ssh_node_boot_timeout,self.ssh_node_boot_silent)=plc_spec['ssh_node_boot_timers']
+ (self.ssh_node_debug_timeout,self.ssh_node_debug_silent)=plc_spec['ssh_node_debug_timers']
def has_addresses_api (self):
return self.apiserver.has_method('AddIpAddress')
# guess local domain from hostname
if TestPlc.exported_id>1:
print "export GUESTHOSTNAME%d=%s"%(TestPlc.exported_id,self.plc_spec['vservername'])
- return
+ return True
TestPlc.exported_id+=1
domain=socket.gethostname().split('.',1)[1]
fqdn="%s.%s"%(self.plc_spec['host_box'],domain)
'PLC_RESERVATION_GRANULARITY',
'PLC_OMF_ENABLED',
'PLC_OMF_XMPP_SERVER',
+ 'PLC_VSYS_DEFAULTS',
]:
fileconf.write ('e %s\n%s\n'%(var,self.plc_spec[var]))
fileconf.write('w\n')
def delete_all_sites (self):
"Delete all sites in PLC, and related objects"
print 'auth_root',self.auth_root()
- sites = self.apiserver.GetSites(self.auth_root(), {}, ['site_id'])
+ sites = self.apiserver.GetSites(self.auth_root(), {}, ['site_id','login_base'])
for site in sites:
# keep automatic site - otherwise we shoot in our own foot, root_auth is not valid anymore
if site['login_base']==self.plc_spec['PLC_SLICE_PREFIX']: continue
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=8)
+ return self.check_nodes_ssh(debug=True,
+ timeout_minutes=self.ssh_node_debug_timeout,
+ silent_minutes=self.ssh_node_debug_silent)
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=38)
+ return self.check_nodes_ssh(debug=False,
+ timeout_minutes=self.ssh_node_boot_timeout,
+ silent_minutes=self.ssh_node_boot_silent)
@node_mapper
def qemu_local_init (self): pass
@slice_mapper
def ssh_slice_off (self): pass
+ @slice_mapper
+ def check_vsys_defaults(self): pass
+
@node_mapper
def keys_clear_known_hosts (self): pass
self.run_in_guest("sfa-nuke.py")==0 or \
self.run_in_guest("sfa-nuke-plc.py")==0
+ def sfa_fsclean(self):
+ "cleanup /etc/sfa/trusted_roots and /var/lib/sfa"
+ self.run_in_guest("rm -rf /etc/sfa/trusted_roots /var/lib/sfa/authorities")
+ return True
+
def sfa_plcclean(self):
"cleans the PLC entries that were created as a side effect of running the script"
# ignore result
if not os.path.isdir(dirname):
utils.system("mkdir -p %s"%dirname)
if not os.path.isdir(dirname):
- raise "Cannot create config dir for plc %s"%self.name()
+ raise Exception,"Cannot create config dir for plc %s"%self.name()
return dirname
def conffile(self,filename):
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"
+ "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
@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