new config -c apiv2 is available

diff --git a/system/config_apiv2.py b/system/config_apiv2.py
new file mode 100644 (file)
index 0000000..a7ce407
--- /dev/null
+++ b/system/config_apiv2.py
@@ -0,0 +1,4 @@
+
+def config (plc_specs, options):
+    for plc_spec in plc_specs:
+        plc_spec['sfa']['SFA_AGGREGATE_API_VERSION']=2

diff --git a/system/config_default.py b/system/config_default.py
index 04fd524..248af7c 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -307,12 +307,8 @@ def sfa (options,index) :
        'SFA_PLC_URL' : 'deferred-myplc-api-url',
         'SFA_PLC_USER' : 'root@test.onelab.eu',
         'SFA_PLC_PASSWORD' : 'test++',
-#        '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' : 'sfa',
+# use -c apiv2 to override this one
+        'SFA_AGGREGATE_API_VERSION' : 1,
         'SFA_API_DEBUG': True,
         # details of the slices to create
         'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style)