user creation is done with new sfi options instead of xml-based

[tests.git] / system / macros.py

diff --git a/system/macros.py b/system/macros.py
index 9f6cebd..0900cfe 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',
@@ -29,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',
@@ -37,9 +37,14 @@ 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_configure', 
+    'sfa_add_site',
+    'sfa_add_pi',
     'sfa_add_user', 
     'sfa_add_slice',
 ]
@@ -56,21 +61,41 @@ 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
-# 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',
     'timestamp_vs',
     'vs_create',
-    'sfa_install_core',
     'sfa_install_client',
+    'sfa_install_core',
     'sfa_configure',
     'cross_sfa_configure',
     'sfa_start',
+    'sfa_import',
     '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',
 ]
 
+