renamed sfa_* into sfi_* for steps list/show/slices

[tests.git] / system / macros.py

diff --git a/system/macros.py b/system/macros.py
index 78d8cb0..6d4ceaa 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -7,9 +7,9 @@ sequences={}
 sequences['free_all'] = [ 'vs_stop', 'qemu_kill_mine', ]
 
 sequences['sfa_restart'] = [
+    'sfa_stop',
     'sfa_plcclean',
     'sfa_dbclean',
-    'sfa_stop',
     'sfa_configure',
     'sfa_start',
     'sfa_import',
@@ -20,6 +20,8 @@ sequences['sfa_restart'] = [
 "re-run a complete sfa cycle from a nightly test"
 sequences['sfa'] = [ 
     'sfa_restart',
+    'sfa_add_site',
+    'sfa_add_pi',
     'sfa_add_user', 
     'sfa_add_slice',
     'sfa_discover', 
@@ -27,7 +29,7 @@ sequences['sfa'] = [
     'sfa_check_slice_plc', 
     'sfa_update_user',
     'sfa_update_slice', 
-    'sfa_view', 
+    'sfi_view_all', 
     'sfa_utest', 
     'sfa_delete_slice', 
     'sfa_delete_user',
@@ -54,7 +56,13 @@ sequences['sfa_scratch'] = [
     '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', 
-    'sfa_update_user', 'sfa_update_slice', 'sfa_view', 'sfa_utest',
+    'sfa_update_user', 'sfa_update_slice', 'sfi_view_all', 'sfa_utest',
+]
+
+sequences['sfi_view_all'] = [
+    'sfi_list',
+    'sfi_show',
+    'sfi_slices',
 ]
 
 # something that can given to the nightly to prepare a standalone sfa setup
@@ -64,11 +72,20 @@ sequences['sfa_standalone'] = [
     'vs_delete',
     'timestamp_vs',
     'vs_create',
-    'sfa_install_core',
     'sfa_install_client',
+    'sfa_install_core',
     'sfa_configure',
     'cross_sfa_configure',
     'sfa_start',
     'sfi_configure',
+    'sfa_add_site',
+    'sfa_add_pi',
+    'sfa_add_user',
+    'sfa_add_slice',
+    'sfi_view_all',
+    'sfa_delete_slice',
+    'sfa_delete_user',
+    'sfi_view_all',
 ]
 
+