X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=fc0e13f368ce6132d353e448f5688f4ecc4ce3c1;hb=ec51ae862e4a7e5219b11a23ef0bd9945a957d37;hp=11fe6977db84911659d016ac3fe77d6f760bae95;hpb=93b57f5a05dc3eafa1a5c2c4ac54e852f508d10d;p=tests.git

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 11fe697..fc0e13f 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -162,13 +162,15 @@ class TestPlc:
         'check_vsys_defaults_ignore', SEP,
 # run this first off so it's easier to re-run on another qemu box        
         'qemu_kill_mine', 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP,
-        'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 'qemu_nodefamily', SEP,
+        'qemu_clean_mine', 'qemu_export', 'qemu_cleanlog', SEP,
+        'qemu_start', 'qemu_timestamp', 'qemu_nodefamily', SEP,
         'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA,
         'sfi_configure@1', 'sfa_register_site@1','sfa_register_pi@1', SEPSFA,
         '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_rspec@1', 'sfa_allocate@1', 'sfa_provision@1', SEPSFA,
+        'sfa_discover@1', 'sfa_rspec@1', SEPSFA,
+        'sfa_allocate@1', 'sfa_provision@1', 'sfa_describe@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
@@ -183,6 +185,7 @@ class TestPlc:
         # for inspecting the slice while it runs the first time
         #'fail',
         # check slices are turned off properly
+        'debug_nodemanager',
         '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', SEP,
@@ -196,15 +199,15 @@ class TestPlc:
         'delete_leases', 'list_leases', SEP,
         'populate', SEP,
         'nodestate_show','nodestate_safeboot','nodestate_boot', 'nodestate_upgrade', SEP,
-        'nodeflavour_show','nodedistro_f14','nodedistro_f18', 'nodedistro_f20', 'nodedistro_f21', SEP,
-        'nodeplain_on','nodeplain_off','nodeplain_show', SEP,
+        'nodedistro_show','nodedistro_f14','nodedistro_f18', SEP,
+        'nodedistro_f20', 'nodedistro_f21','nodedistro_f22', SEP,
         '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,
+        'slice_fs_present', SEP,
         'standby_1_through_20','yes','no',SEP,
         'install_syslinux6', 'bonding_builds', 'bonding_nodes', SEP,
         ]
@@ -709,7 +712,7 @@ class TestPlc:
     ### install_rpm 
     def plc_install(self):
         """
-        yum install myplc, noderepo + plain bootstrapfs as well
+        yum install myplc, noderepo
         """
 
         # compute nodefamily
@@ -725,7 +728,6 @@ class TestPlc:
         pkgs_list.append("slicerepo-{}".format(nodefamily))
         pkgs_list.append("myplc")
         pkgs_list.append("noderepo-{}".format(nodefamily))
-        pkgs_list.append("nodeimage-{}-plain".format(nodefamily))
         pkgs_string=" ".join(pkgs_list)
         return self.yum_install(pkgs_list)
 
@@ -1126,7 +1128,7 @@ class TestPlc:
         return True
 
     # probing nodes
-    def check_nodes_ping(self, timeout_seconds=30, period_seconds=10):
+    def check_nodes_ping(self, timeout_seconds=60, period_seconds=10):
         class CompleterTaskPingNode(CompleterTask):
             def __init__(self, hostname):
                 self.hostname = hostname
@@ -1193,6 +1195,8 @@ class TestPlc:
     @node_mapper
     def qemu_export(self): pass
     @node_mapper
+    def qemu_cleanlog(self): pass
+    @node_mapper
     def nodestate_reinstall(self): pass
     @node_mapper
     def nodestate_upgrade(self): pass
@@ -1211,13 +1215,9 @@ class TestPlc:
     @node_mapper
     def nodedistro_f21(self): pass
     @node_mapper
-    def nodeflavour_show(self): pass
-    @node_mapper
-    def nodeplain_on(self): pass
+    def nodedistro_f22(self): pass
     @node_mapper
-    def nodeplain_off(self): pass
-    @node_mapper
-    def nodeplain_show(self): pass
+    def nodedistro_show(self): pass
         
     ### check hooks : invoke scripts from hooks/{node,slice}
     def check_hooks_node(self): 
@@ -1770,6 +1770,8 @@ class TestPlc:
     @auth_sfa_mapper
     def sfa_provision_empty(self): pass
     @auth_sfa_mapper
+    def sfa_describe(self): pass
+    @auth_sfa_mapper
     def sfa_check_slice_plc(self): pass
     @auth_sfa_mapper
     def sfa_check_slice_plc_empty(self): pass