'sfa_register_user@1', 'sfa_update_user@1', 'sfa_register_slice@1', 'sfa_renew_slice@1', SEPSFA,
'sfa_remove_user_from_slice@1','sfi_show_slice_researchers@1',
'sfa_insert_user_in_slice@1','sfi_show_slice_researchers@1', SEPSFA,
- 'sfa_discover@1', 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
+ 'sfa_discover@1', 'sfa_rspec@1', 'sfa_allocate@1', 'sfa_provision@1', SEPSFA,
+ 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
'sfi_list@1', 'sfi_show_site@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..
# check slices are turned off properly
'empty_slices', 'ssh_slice_off', 'slice_fs_deleted_ignore', SEP,
# check they are properly re-created with the same name
- 'fill_slices', 'ssh_slice_again_ignore', SEP,
+ 'fill_slices', 'ssh_slice_again', SEP,
'gather_logs_force', SEP,
]
other_steps = [
'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP,
'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA,
'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,
+ 'sfa_get_expires', SEPSFA,
'plc_db_dump' , 'plc_db_restore', SEP,
'check_netflow','check_drl', SEP,
'debug_nodemanager', 'slice_fs_present', SEP,
# see e.g. plc_start esp. the version for f14
#command gets run in the plc's vm
def host_to_guest(self,command):
+ vservername=self.vservername
+ personality=self.options.personality
+ raw="%(personality)s virsh -c lxc:/// lxc-enter-namespace %(vservername)s"%locals()
# f14 still needs some extra help
if self.options.fcdistro == 'f14':
- raw="virsh -c lxc:/// lxc-enter-namespace %s -- /usr/bin/env PATH=/bin:/sbin:/usr/bin:/usr/sbin %s" %(self.vservername,command)
+ raw +=" -- /usr/bin/env PATH=/bin:/sbin:/usr/bin:/usr/sbin %(command)s" %locals()
else:
- raw="virsh -c lxc:/// lxc-enter-namespace %s -- /usr/bin/env %s" %(self.vservername,command)
+ raw +=" -- /usr/bin/env %(command)s"%locals()
return raw
# this /vservers thing is legacy...
@auth_sfa_mapper
def sfa_renew_slice(self): pass
@auth_sfa_mapper
+ def sfa_get_expires(self): pass
+ @auth_sfa_mapper
def sfa_discover(self): pass
@auth_sfa_mapper
- def sfa_create_slice(self): pass
+ def sfa_rspec(self): pass
+ @auth_sfa_mapper
+ def sfa_allocate(self): pass
+ @auth_sfa_mapper
+ def sfa_provision(self): pass
@auth_sfa_mapper
def sfa_check_slice_plc(self): pass
@auth_sfa_mapper