X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fmacros.py;h=37c8e266258fe3df4da470cdc313aa8f4c023388;hb=8c1c60dd4caa5e583bdd3bee6727485ea928ccb6;hp=0900cfe0132cc9bbebe6c9dde6e9ced1998e3958;hpb=44bef249b6286f9df8269664787003bff0f670ca;p=tests.git

diff --git a/system/macros.py b/system/macros.py
index 0900cfe..37c8e26 100644
--- a/system/macros.py
+++ b/system/macros.py
@@ -3,13 +3,14 @@
 
 sequences={}
 
-"release local resources (stop vs, kill qemus, clean trackers)"
-sequences['free_all'] = [ 'vs_stop', 'qemu_kill_mine', ]
+"release local resources (stop vs, kill qemus)"
+sequences['free_all'] = [ 'plcvm_stop', 'qemu_kill_mine', ]
 
 sequences['sfa_restart'] = [
     'sfa_stop',
     'sfa_plcclean',
     'sfa_dbclean',
+    'sfa_fsclean',
     'sfa_configure',
     'sfa_start',
     'sfa_import',
@@ -24,6 +25,7 @@ sequences['sfa'] = [
     'sfa_add_pi',
     'sfa_add_user', 
     'sfa_add_slice',
+    'sfa_renew_slice',
     'sfa_discover', 
     'sfa_create_slice', 
     'sfa_check_slice_plc', 
@@ -42,6 +44,7 @@ sequences['sfa_create'] = [
     'sfa_dbclean',
     'sfa_start',
     'sfa_import', 
+    'sfi_clean',
     'sfi_configure', 
     'sfa_add_site',
     'sfa_add_pi',
@@ -49,15 +52,22 @@ sequences['sfa_create'] = [
     'sfa_add_slice',
 ]
 
+sequences['sfa_provision'] = [ 
+    'sfa-discover',
+    'sfa-create_slice',
+    'sfa_check_slice_plc',
+    'sfi_view_all',
+]
+
 # run the whole SFA stuff but from scratch, new vs all reinstalled and all
 sequences['sfa_scratch'] = [
     'show',
-    'vs_delete','timestamp_vs','vs_create', 
+    'plcvm_delete','plcvm_timestamp','plcvm_create', 
     'plc_install', 'plc_configure', 'plc_start', 
     'keys_fetch', 'keys_store', 'keys_clear_known_hosts', 
     'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', 
     'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', 
-    'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', 
+    'qemu_export', 'qemu_kill_mine', 'qemu_start', 'qemu_timestamp', 
     'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', 
     'sfi_configure', 'sfa_add_user', 'sfa_add_slice', 'sfa_discover', 
     'sfa_create_slice', 'sfa_check_slice_plc', 
@@ -66,8 +76,8 @@ sequences['sfa_scratch'] = [
 
 sequences['sfi_view_all'] = [
     'sfi_list',
-    'sfi_show',
-    'sfi_slices',
+    'sfi_show_site',
+    'sfi_show_slice',
 ]
 
 # macro to exercice the registry only
@@ -78,9 +88,9 @@ sequences['sfi_view_all'] = [
 # clearly there is a lot more to check here in terms of consistency
 sequences['sfa_standalone'] = [
     'show',
-    'vs_delete',
-    'timestamp_vs',
-    'vs_create',
+    'plcvm_delete',
+    'plcvm_timestamp',
+    'plcvm_create',
     'sfa_install_client',
     'sfa_install_core',
     'sfa_configure',
@@ -92,10 +102,41 @@ sequences['sfa_standalone'] = [
     'sfa_add_pi',
     'sfa_add_user',
     'sfa_add_slice',
-    'sfi_view_all',
+    'sfi_list',
+    'sfi_show_site',
+    'sfi_show_slice',
     'sfa_delete_slice',
     'sfa_delete_user',
-    'sfi_view_all',
+    'sfi_list',
+    'sfi_show_site',
+#    'sfi_show_slice',
 ]
 
+# re-run a qemu node when things go wrong
+# we need a scheme where we can select another qemu box
+# this is based on a 2-step mechanism
+#
+# run qemu_again1
+# rm arg-ips-bnode (or echo anotherbox > arg-ips-bnode)
+# run qemu-again2
 
+sequences['qemu_again1'] = [
+    'qemu-kill-mine',
+]
+
+sequences['qemu_again2']=[
+    'qemu-clean-mine',
+    'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', 
+    'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 
+    'ping_node', 'ssh_node_debug',
+    'ssh_node_boot', 'node_bmlogs', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts',
+]
+
+# same but only up to ping 
+sequences['qemu_again2_ping']=[
+    'qemu-clean-mine',
+    'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', 
+    'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 
+    'ping_node',
+]
+