From bc7c1fdb64eb03ba1324232c5d28119912fa17cd Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 1 Oct 2010 11:54:17 +0200 Subject: [PATCH] fix --- system/TestPlc.py | 6 +++--- system/TestSliceSfa.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/TestPlc.py b/system/TestPlc.py index 6662d3b..a00a9e5 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -92,12 +92,12 @@ class TestPlc: 'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP, 'reinstall_node', 'init_node','bootcd', 'configure_qemu', 'export_qemu', 'kill_all_qemus', 'start_node', SEP, 'install_sfa', 'configure_sfa', 'cross_configure_sfa', 'import_sfa', 'start_sfa', SEPSFA, - 'configure_sfi@1', 'add_sfa_user@1', 'add_sfa@1', 'create_sfa@1', SEPSFA, + 'configure_sfi@1', 'add_user_sfa@1', 'add_sfa@1', 'create_sfa@1', SEPSFA, 'update_sfa_user@1', 'update_sfa@1', 'view_sfa@1', SEPSFA, # better use of time: do this now that the nodes are taking off 'plcsh_stress_test', SEP, 'nodes_ssh_debug', 'nodes_ssh_boot', 'check_slice', 'check_initscripts', SEPSFA, - 'check_slice_sfa@1', 'delete_sfa_user@1', 'delete_sfa_slices@1', SEPSFA, + 'check_slice_sfa@1', 'delete_sfa_user@1', 'delete_slice_sfa@1', SEPSFA, 'check_tcp', 'check_hooks', SEP, 'force_gather_logs', 'force_resources_post', SEP, ] @@ -1259,7 +1259,7 @@ class TestPlc: self.run_in_guest("rm -rf /root/.sfi") return True - def add_sfa_user(self): + def add_user_sfa(self): return TestUserSfa(self).add_user() @slice_sfa_mapper diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py index 45362f2..baa1e2a 100644 --- a/system/TestSliceSfa.py +++ b/system/TestSliceSfa.py @@ -61,7 +61,7 @@ class TestSliceSfa: "sfiAddSliver.py -i /root/.sfi/resources_in.rspec -n /root/.sfi/all_nodes.txt -o /root/.sfi/resources_out.rspec") return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ create %s.%s.%s resources_out.rspec"%(auth,self.login_base,self.slicename))==0 - def delete_slice(self,options): + def delete_slice_sfa(self,options): auth=self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'] self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ delete %s.%s.%s"%(auth,self.login_base,self.slicename)) return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t slice %s.%s.%s"%(auth,self.login_base,self.slicename))==0 -- 2.43.0