fix old bug about doc strings for mapped methods

[tests.git] / system / macros.py

diff --git a/system/macros.py b/system/macros.py
index 47ecd0d..b6511fc 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -6,12 +6,22 @@ sequences={}
 "release local resources (stop vs, kill qemus, clean trackers)"
 sequences['free_all'] = [ 'vs_stop', 'qemu_kill_mine', ]
 
+sequences['sfa_restart'] = [
+    'sfa_stop',
+    'sfa_plcclean',
+    'sfa_dbclean',
+    'sfa_configure',
+    'sfa_start',
+    'sfa_import',
+    'sfi_clean',
+    'sfi_configure',
+    ]
+
 "re-run a complete sfa cycle from a nightly test"
 sequences['sfa'] = [ 
-    'sfa_plcclean', 
-    'sfa_dbclean',
-    'sfa_import', 
-    'sfi_configure', 
+    'sfa_restart',
+    'sfa_add_site',
+    'sfa_add_pi',
     'sfa_add_user', 
     'sfa_add_slice',
     'sfa_discover', 
@@ -25,16 +35,14 @@ sequences['sfa'] = [
     'sfa_delete_user',
     ]
 
-sequences['sfa_restart'] = [
-    'sfa_plcclean',
+sequences['sfa_create'] = [
+    'sfa_plcclean', 
     'sfa_dbclean',
-    'sfa_stop',
-    'sfi_clean',
-    'sfa_configure',
-    'sfa_import',
-    'sfa_start',
-    'sfi_configure',
-    ]
+    'sfa_import', 
+    'sfi_configure', 
+    'sfa_add_user', 
+    'sfa_add_slice',
+]
 
 # run the whole SFA stuff but from scratch, new vs all reinstalled and all
 sequences['sfa_scratch'] = [
@@ -51,6 +59,12 @@ sequences['sfa_scratch'] = [
     'sfa_update_user', 'sfa_update_slice', 'sfa_view', 'sfa_utest',
 ]
 
+sequences['sfa_view'] = [
+    'sfa-list',
+    'sfa-show',
+    'sfa-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
 sequences['sfa_standalone'] = [
@@ -58,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',
+    'sfa-view',
+    'sfa-delete-slice',
+    'sfa-delete-user',
+    'sfa-view',
 ]
 
+