'ssh_node_debug', 'plcsh_stress_test@1', SEP,
'ssh_node_boot', 'ssh_slice', 'check_initscripts', SEP,
'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA,
- 'check_tcp', 'check_hooks@1', SEP,
+ 'check_tcp', SEP,
'force_gather_logs', 'force_local_post', SEP,
]
other_steps = [
+ 'check_hooks',
'free_all',
'show_boxes', 'local_list','local_rel','local_rel_plc','local_rel_qemu',SEP,
'plc_stop', 'vs_start', 'vs_stop', SEP,
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
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"/>' % \
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"
sfa_spec=self.plc_spec['sfa']
- "sfi client configuration"
- dir_name=self.confsubdir("dot-sfi",clean=True)
+ 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'])