X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=a9ebd96b261551d1ffcabf577d90628b0b035d5a;hb=d5381e90de0d772a5b8867f03f26d40db8f33fba;hp=42959f400e4aa5523547ae4eb0320e0ce87c3469;hpb=06a87c3c34d36bb00e09922d5a1a83a1b3a04498;p=tests.git

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 42959f4..a9ebd96 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -168,7 +168,8 @@ class TestPlc:
         '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
@@ -195,7 +196,9 @@ class TestPlc:
         'delete_sites', 'delete_nodes', 'delete_slices', 'keys_clean', SEP,
         'delete_leases', 'list_leases', SEP,
         'populate', SEP,
-        'nodestate_show','nodestate_safeboot','nodestate_boot', 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,
         '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,
@@ -707,8 +710,7 @@ class TestPlc:
     ### install_rpm 
     def plc_install(self):
         """
-        yum install myplc, noderepo
-        plain bootstrapfs is not installed anymore
+        yum install myplc, noderepo + plain bootstrapfs as well
         """
 
         # compute nodefamily
@@ -724,6 +726,7 @@ 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)
 
@@ -1124,7 +1127,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
@@ -1189,15 +1192,33 @@ class TestPlc:
     @node_mapper
     def qemu_local_config(self): pass
     @node_mapper
+    def qemu_export(self): pass
+    @node_mapper
     def nodestate_reinstall(self): pass
     @node_mapper
+    def nodestate_upgrade(self): pass
+    @node_mapper
     def nodestate_safeboot(self): pass
     @node_mapper
     def nodestate_boot(self): pass
     @node_mapper
     def nodestate_show(self): pass
     @node_mapper
-    def qemu_export(self): pass
+    def nodedistro_f14(self): pass
+    @node_mapper
+    def nodedistro_f18(self): pass
+    @node_mapper
+    def nodedistro_f20(self): pass
+    @node_mapper
+    def nodedistro_f21(self): pass
+    @node_mapper
+    def nodeflavour_show(self): pass
+    @node_mapper
+    def nodeplain_on(self): pass
+    @node_mapper
+    def nodeplain_off(self): pass
+    @node_mapper
+    def nodeplain_show(self): pass
         
     ### check hooks : invoke scripts from hooks/{node,slice}
     def check_hooks_node(self): 
@@ -1750,6 +1771,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