the 'sfa' macro step involves reconfiguring/restarting sfa

diff --git a/system/config_apiv2.py b/system/config_apiv2.py
index 7e3d70a..91c9281 100644 (file)
--- a/system/config_apiv2.py
+++ b/system/config_apiv2.py
@@ -1,4 +1,3 @@
-
 def config (plc_specs, options):
     for plc_spec in plc_specs:
         plc_spec['sfa']['SFA_AGGREGATE_API_VERSION']=2

diff --git a/system/macros.py b/system/macros.py
index 56d77af..78d8cb0 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -6,12 +6,20 @@ sequences={}
 "release local resources (stop vs, kill qemus, clean trackers)"
 sequences['free_all'] = [ 'vs_stop', 'qemu_kill_mine', ]
 
+sequences['sfa_restart'] = [
+    'sfa_plcclean',
+    'sfa_dbclean',
+    'sfa_stop',
+    '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_user', 
     'sfa_add_slice',
     'sfa_discover', 
@@ -34,17 +42,6 @@ sequences['sfa_create'] = [
     'sfa_add_slice',
 ]
 
-sequences['sfa_restart'] = [
-    'sfa_plcclean',
-    'sfa_dbclean',
-    'sfa_stop',
-    'sfi_clean',
-    'sfa_configure',
-    'sfa_import',
-    'sfa_start',
-    'sfi_configure',
-    ]
-
 # run the whole SFA stuff but from scratch, new vs all reinstalled and all
 sequences['sfa_scratch'] = [
     'show',