From 0ecbbc54d1bef5ddc4b1bc0523fe1ed1b4b4bbf0 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 22 Nov 2011 16:13:42 +0100
Subject: [PATCH] new SFA settings names (sfa_plc vs sfa_db)
---
system/Substrate.py | 2 +-
system/TestPlc.py | 10 ++++++----
system/TestSliceSfa.py | 4 ++--
system/config_default.py | 11 +++++++----
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/system/Substrate.py b/system/Substrate.py
index 9387579..1d42cb7 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -1058,7 +1058,7 @@ class Substrate:
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_PLC_DB_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/'
return plc
diff --git a/system/TestPlc.py b/system/TestPlc.py
index f857219..c3acc6c 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1232,12 +1232,14 @@ class TestPlc:
'SFA_REGISTRY_HOST',
'SFA_AGGREGATE_HOST',
'SFA_SM_HOST',
+ 'SFA_PLC_URL',
'SFA_PLC_USER',
'SFA_PLC_PASSWORD',
- 'SFA_PLC_DB_HOST',
- 'SFA_PLC_DB_USER',
- 'SFA_PLC_DB_PASSWORD',
- 'SFA_PLC_URL',
+ 'SFA_DB_HOST',
+ 'SFA_DB_USER',
+ 'SFA_DB_PASSWORD',
+ # should be tmp
+ 'SFA_DB_NAME',
]:
fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
# the way plc_config handles booleans just sucks..
diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 9900cd9..7f8c2f3 100644
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -86,10 +86,10 @@ class TestSliceSfa:
SFI_USER=SFI_AUTH + '.' + self.piuser
fileconf.write ("SFI_USER='%s'"%SFI_USER)
fileconf.write('\n')
- SFI_REGISTRY='http://' + sfa_spec['SFA_PLC_DB_HOST'] + ':12345/'
+ SFI_REGISTRY='http://' + sfa_spec['SFA_REGISTRY_HOST'] + ':12345/'
fileconf.write ("SFI_REGISTRY='%s'"%SFI_REGISTRY)
fileconf.write('\n')
- SFI_SM='http://' + sfa_spec['SFA_PLC_DB_HOST'] + ':12347/'
+ SFI_SM='http://' + sfa_spec['SFA_SM_HOST'] + ':12347/'
fileconf.write ("SFI_SM='%s'"%SFI_SM)
fileconf.write('\n')
fileconf.close()
diff --git a/system/config_default.py b/system/config_default.py
index 1f564fc..002dfa2 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -304,12 +304,15 @@ def sfa (options,index) :
'SFA_REGISTRY_HOST' : 'deferred-myplc-hostname',
'SFA_AGGREGATE_HOST': 'deferred-myplc-hostname',
'SFA_SM_HOST': 'deferred-myplc-hostname',
+ 'SFA_PLC_URL' : 'deferred-myplc-api-url',
'SFA_PLC_USER' : 'root@test.onelab.eu',
'SFA_PLC_PASSWORD' : 'test++',
- 'SFA_PLC_DB_HOST':'deferred-myplc-hostname',
- 'SFA_PLC_DB_USER' : 'pgsqluser',
- 'SFA_PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
- 'SFA_PLC_URL' : 'deferred-myplc-api-url',
+ 'SFA_DB_HOST':'deferred-myplc-hostname',
+ 'SFA_DB_USER' : 'pgsqluser',
+ 'SFA_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
+ # the default settings come with 'sfa' as the dbname
+ # temporary until we get the initscript to create that one
+ 'SFA_DB_NAME' : 'planetlab5',
'SFA_API_DEBUG': True,
# details of the slices to create
'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style)
--
2.47.0