# 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)
def sfa_dbclean(self):
"thoroughly wipes off the SFA database"
- return self.run_in_guest("sfaadmin registry nuke")==0 or \
+ return self.run_in_guest("sfaadmin reg nuke")==0 or \
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')==0
+ 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))