use new names for initvm creation scripts

[tests.git] / system / TestPlc.py

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 365add9..4cbc558 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -128,7 +128,7 @@ class TestPlc:
         '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_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,
+        'sfi_list@1', 'sfi_show@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,
@@ -618,15 +618,15 @@ class TestPlc:
         repo_url = self.options.arch_rpms_url
         for level in [ 'arch' ]:
            repo_url = os.path.dirname(repo_url)
-        # pass the vbuild-nightly options to vtest-init-vserver
+        # pass the vbuild-nightly options to [lv]test-initvm
         test_env_options=""
         test_env_options += " -p %s"%self.options.personality
         test_env_options += " -d %s"%self.options.pldistro
         test_env_options += " -f %s"%self.options.fcdistro
         if self.options.plcs_use_lxc:
-            script="vtest-init-lxc.sh"
+            script="ltest-initvm.sh"
         else:
-            script="vtest-init-vserver.sh"
+            script="vtest-initvm.sh"
         vserver_name = self.vservername
         vserver_options="--netdev eth0 --interface %s"%self.vserverip
         try:
@@ -1560,8 +1560,6 @@ class TestPlc:
     @auth_sfa_mapper
     def sfi_show(self): pass
     @auth_sfa_mapper
-    def sfi_slices(self): pass
-    @auth_sfa_mapper
     def ssh_slice_sfa(self): pass
     @auth_sfa_mapper
     def sfa_delete_user(self): pass