From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 29 May 2018 12:45:13 +0000 (+0200)
Subject: tweaks for removal of slice manager
X-Git-Tag: tests-6.0-5~14
X-Git-Url: http://git.onelab.eu/?p=tests.git;a=commitdiff_plain;h=ae4bbca7124dcbd74896aacf6f5fc8b6e19d0ca3

tweaks for removal of slice manager
---

diff --git a/system/Substrate.py b/system/Substrate.py
index a5f06bb..f31bea6 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -1300,7 +1300,6 @@ class Substrate:
        
         plc['sfa']['settings']['SFA_REGISTRY_HOST'] = plc['settings']['PLC_DB_HOST']
         plc['sfa']['settings']['SFA_AGGREGATE_HOST'] = plc['settings']['PLC_DB_HOST']
-        plc['sfa']['settings']['SFA_SM_HOST'] = plc['settings']['PLC_DB_HOST']
         plc['sfa']['settings']['SFA_DB_HOST'] = plc['settings']['PLC_DB_HOST']
         plc['sfa']['settings']['SFA_PLC_URL'] = 'https://{}:443/PLCAPI/'.format(plc['settings']['PLC_API_HOST'])
         return plc
diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py
index 771cf2c..9b2a686 100644
--- a/system/TestAuthSfa.py
+++ b/system/TestAuthSfa.py
@@ -101,7 +101,7 @@ class TestAuthSfa:
         SFI_REGISTRY='http://{}:{}/'.format(sfa_spec['settings']['SFA_REGISTRY_HOST'], 12345)
         fileconf.write("SFI_REGISTRY='{}'".format(SFI_REGISTRY))
         fileconf.write('\n')
-        SFI_SM='http://{}:{}/'.format(sfa_spec['settings']['SFA_SM_HOST'], sfa_spec['sfi-connects-to-port'])
+        SFI_SM='http://{}:{}/'.format(sfa_spec['settings']['SFA_AM_HOST'], sfa_spec['sfi-connects-to-port'])
         fileconf.write("SFI_SM='{}'".format(SFI_SM))
         fileconf.write('\n')
         fileconf.close()
diff --git a/system/config_default.py b/system/config_default.py
index c473670..4deba9a 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -546,9 +546,6 @@ def sfa (options, index) :
             'SFA_INTERFACE_HRN' : sfa_root(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++',