rename sfi_show as sfi_show_site and add a new sfa_show_slice

[tests.git] / system / macros.py

diff --git a/system/macros.py b/system/macros.py
index 9069449..37c8e26 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -76,7 +76,8 @@ sequences['sfa_scratch'] = [
 
 sequences['sfi_view_all'] = [
     'sfi_list',
-    'sfi_show',
+    'sfi_show_site',
+    'sfi_show_slice',
 ]
 
 # macro to exercice the registry only
@@ -102,11 +103,13 @@ sequences['sfa_standalone'] = [
     'sfa_add_user',
     'sfa_add_slice',
     'sfi_list',
-    'sfi_show',
+    'sfi_show_site',
+    'sfi_show_slice',
     'sfa_delete_slice',
     'sfa_delete_user',
     'sfi_list',
-    'sfi_show',
+    'sfi_show_site',
+#    'sfi_show_slice',
 ]
 
 # re-run a qemu node when things go wrong
@@ -126,7 +129,7 @@ sequences['qemu_again2']=[
     '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_ignore',
+    'ssh_node_boot', 'node_bmlogs', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts',
 ]
 
 # same but only up to ping