def auth_sfa_mapper (method):
def actual(self):
overall=True
- slice_method = TestAuthSfa.__dict__[method.__name__]
- for slice_spec in self.plc_spec['sfa']['auth_sfa_specs']:
- test_slice=TestAuthSfa(self,slice_spec)
- if not slice_method(test_slice,self.options): overall=False
+ auth_method = TestAuthSfa.__dict__[method.__name__]
+ for auth_spec in self.plc_spec['sfa']['auth_sfa_specs']:
+ test_auth=TestAuthSfa(self,auth_spec)
+ if not auth_method(test_auth,self.options): overall=False
return overall
# restore the doc text
actual.__doc__=TestAuthSfa.__dict__[method.__name__].__doc__
'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_discover@1', SEPSFA,
- 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@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,
# 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,
'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_system_slice', SEP,
+ 'cross_check_tcp@1', 'check_system_slice', SEP,
'empty_slices', 'ssh_slice_off', 'fill_slices', SEP,
'force_gather_logs', SEP,
]
'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,
'plc_db_dump' , 'plc_db_restore', SEP,
'check_netflow','check_drl', SEP,
+ 'debug_nodemanager', SEP,
'standby_1_through_20',SEP,
]
'postinstall_cmd':'service nm restart',})
return True
+ def debug_nodemanager (self):
+ "sets verbose mode for nodemanager, and speeds up cycle even more (needs speed_up_slices first)"
+ template="%s.nodemanager"%self.name()
+ template_file = open (template,"w")
+ template_file.write('OPTIONS="-p 10 -r 6 -v -d"\n')
+ template_file.close()
+ in_vm="/var/www/html/PlanetLabConf/nodemanager"
+ remote="%s/%s"%(self.vm_root_in_host(),in_vm)
+ self.test_ssh.copy_abs(template,remote)
+ return True
+
@node_mapper
def qemu_start (self) : pass
@node_mapper
def timestamp_qemu (self) : pass
- def check_tcp (self):
+ # when a spec refers to a node possibly on another plc
+ def locate_sliver_obj_cross (self, nodename, slicename, other_plcs):
+ for plc in [ self ] + other_plcs:
+ try:
+ return plc.locate_sliver_obj (nodename, slicename)
+ except:
+ pass
+ raise Exception, "Cannot locate sliver %s@%s among all PLCs"%(nodename,slicename)
+
+ # implement this one as a cross step so that we can take advantage of different nodes
+ # in multi-plcs mode
+ def cross_check_tcp (self, other_plcs):
"check TCP connectivity between 2 slices (or in loopback if only one is defined)"
- specs = self.plc_spec['tcp_test']
+ if 'tcp_specs' not in self.plc_spec or not self.plc_spec['tcp_specs']:
+ utils.header ("check_tcp: no/empty config found")
+ return True
+ specs = self.plc_spec['tcp_specs']
overall=True
for spec in specs:
port = spec['port']
# server side
- s_test_sliver = self.locate_sliver_obj (spec['server_node'],spec['server_slice'])
+ s_test_sliver = self.locate_sliver_obj_cross (spec['server_node'],spec['server_slice'],other_plcs)
if not s_test_sliver.run_tcp_server(port,timeout=10):
overall=False
break
# idem for the client side
- c_test_sliver = self.locate_sliver_obj(spec['server_node'],spec['server_slice'])
+ c_test_sliver = self.locate_sliver_obj_cross (spec['server_node'],spec['client_slice'],other_plcs)
if not c_test_sliver.run_tcp_client(s_test_sliver.test_node.name(),port):
overall=False
return overall
# netflow currently not working in the lxc distro
# drl not built at all in the wtx distro
# if we find either of them we're happy
- return self.check_netflow() or self.check_drl_ ('drl')
+ return self.check_netflow() or self.check_drl()
# expose these
def check_netflow (self): return self._check_system_slice ('netflow')
@auth_sfa_mapper
def sfa_add_slice(self): pass
@auth_sfa_mapper
+ def sfa_renew_slice(self): pass
+ @auth_sfa_mapper
def sfa_discover(self): pass
@auth_sfa_mapper
def sfa_create_slice(self): pass