X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fmacros.py;h=3fc7dc83ed71bdfbf2f356381bc2a365ab3498c8;hb=87f953c20a5a10273673e0fab3a6ded79475ad4c;hp=dbedc706d8ce6f58ff2c69ed42636e109f533e79;hpb=802f433f6d3e659dca50ddccd52503fd88b5da5c;p=tests.git

diff --git a/system/macros.py b/system/macros.py
index dbedc70..3fc7dc8 100644
--- a/system/macros.py
+++ b/system/macros.py
@@ -10,6 +10,7 @@ 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', 
@@ -37,13 +39,26 @@ sequences['sfa'] = [
 
 sequences['sfa_create'] = [
     'sfa_plcclean', 
+    # nuke sometimes requires the service to be stopped b/c of db locks apparently
+    'sfa_stop',
     'sfa_dbclean',
+    'sfa_start',
     'sfa_import', 
+    'sfi_clean',
     'sfi_configure', 
+    'sfa_add_site',
+    'sfa_add_pi',
     'sfa_add_user', 
     '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',
@@ -62,7 +77,6 @@ sequences['sfa_scratch'] = [
 sequences['sfi_view_all'] = [
     'sfi_list',
     'sfi_show',
-    'sfi_slices',
 ]
 
 # macro to exercice the registry only
@@ -87,10 +101,10 @@ sequences['sfa_standalone'] = [
     'sfa_add_pi',
     'sfa_add_user',
     'sfa_add_slice',
-    'sfi_view_all',
+    'sfi_list',
+    'sfi_show',
     'sfa_delete_slice',
     'sfa_delete_user',
-    'sfi_view_all',
+    'sfi_list',
+    'sfi_show',
 ]
-
-