X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=system%2FSubstrate.py;h=0f849c26cbaa92cd575543e8abacc93205786c42;hb=daa6101bf7c504d89de2eb6bbd06821e2f550539;hp=4b2ad5885b6ff9f9ed7f8ef3e3511d8bd9e7ff6f;hpb=40ab0cf39e29752c4abf2217bbc8fc382e438d11;p=tests.git

diff --git a/system/Substrate.py b/system/Substrate.py
index 4b2ad58..0f849c2 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -1072,12 +1072,14 @@ class Substrate:
                                    'name': plc_name,
                                    'vservername':vservername,
                                    'vserverip':vplc_ip,
+#                                   'settings': {
                                    'PLC_DB_HOST':vplc_hostname,
                                    'PLC_API_HOST':vplc_hostname,
                                    'PLC_BOOT_HOST':vplc_hostname,
                                    'PLC_WWW_HOST':vplc_hostname,
                                    'PLC_NET_DNS1' : self.network_settings() [ 'interface_fields:dns1' ],
                                    'PLC_NET_DNS2' : self.network_settings() [ 'interface_fields:dns2' ],
+#                                      }
                                    } ) ]
                   }
 
@@ -1166,11 +1168,11 @@ class Substrate:
 
     def localize_sfa_rspec (self,plc,options):
        
-        plc['sfa']['SFA_REGISTRY_HOST'] = plc['PLC_DB_HOST']
-        plc['sfa']['SFA_AGGREGATE_HOST'] = plc['PLC_DB_HOST']
-        plc['sfa']['SFA_SM_HOST'] = plc['PLC_DB_HOST']
-        plc['sfa']['SFA_DB_HOST'] = plc['PLC_DB_HOST']
-        plc['sfa']['SFA_PLC_URL'] = 'https://' + plc['PLC_API_HOST'] + ':443/PLCAPI/' 
+        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://%s:443/PLCAPI/' % plc['settings']['PLC_API_HOST']
 	return plc
 
     #################### release: