kvm64-{4,5} often end up with nodes spending more than 20 minutes

[tests.git] / system / macros.py

diff --git a/system/macros.py b/system/macros.py
index b4a4815..f812c64 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -37,13 +37,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',
@@ -65,8 +78,12 @@ sequences['sfi_view_all'] = [
     'sfi_slices',
 ]
 
-# something that can given to the nightly to prepare a standalone sfa setup
-# after what you'll want to tweak the config to point to a myplc some place else
+# macro to exercice the registry only
+# this requires the sfavoid config
+# so that flavour=void and thus sfa-plc is not required
+# xxx todo
+# this initially was just a convenience to setup a reduced depl.
+# clearly there is a lot more to check here in terms of consistency
 sequences['sfa_standalone'] = [
     'show',
     'vs_delete',
@@ -86,7 +103,8 @@ sequences['sfa_standalone'] = [
     'sfi_view_all',
     'sfa_delete_slice',
     'sfa_delete_user',
-    'sfi_view_all',
+    'sfi_list',
+    'sfi_show',
 ]