X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=ddf85783f536d5973391586bd96a1bfa95d3eb6a;hb=d30485ea9499738882660885ffa2ac641c2f3321;hp=508f8802bdb9cde1dd69d956ee6ef8087ececcd3;hpb=daa6101bf7c504d89de2eb6bbd06821e2f550539;p=tests.git

diff --git a/system/config_default.py b/system/config_default.py
index 508f880..ddf8578 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -519,12 +519,14 @@ def plc (options,index) :
         'ssh_node_debug_timers': (10,8),
     }
 
-# NOTE: SFA currently has SFA_AGGREGATE_API_VERSION=2 baked into the code
 def sfa (options,index) :
     return { 
-        # the default is to use AMs in the various aggregates.xml
+        # the port used to generate the various aggregates.xml
         # stack config_sfamesh to point to SMs instead
         'neighbours-port':12346,
+        # the port that sfi connects to - used to be 12347 when the SM was still running
+        # but now the SM is just turned off for these tests
+        'sfi-connects-to-port' : 12346,
         ## global sfa-config-tty stuff
         'settings': {
             'SFA_REGISTRY_ROOT_AUTH' : sfa_root(index),
@@ -532,6 +534,8 @@ def sfa (options,index) :
             'SFA_REGISTRY_HOST' : 'deferred-myplc-hostname',
             'SFA_AGGREGATE_HOST': 'deferred-myplc-hostname',
             'SFA_SM_HOST': 'deferred-myplc-hostname',
+# turning off SM and using only AM; be explicit on this as the default has changed in the code
+            'SFA_SM_ENABLED' : 'false',
             'SFA_PLC_URL' : 'deferred-myplc-api-url',
             'SFA_PLC_USER' : 'root@test.onelab.eu',
             'SFA_PLC_PASSWORD' : 'test++',