From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 13 Dec 2011 15:45:25 +0000 (+0100)
Subject: srop support for API v1
X-Git-Tag: tests-5.0-33~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=47f6437cdd23fcd435f7c23ea1fc5d684b489c23;p=tests.git

srop support for API v1
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index f35d195..dae829b 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1236,7 +1236,6 @@ class TestPlc:
 		     'SFA_PLC_URL',
                      'SFA_PLC_USER',
                      'SFA_PLC_PASSWORD',
-                     'SFA_AGGREGATE_API_VERSION',
                      'SFA_DB_HOST',
                      'SFA_DB_USER',
                      'SFA_DB_PASSWORD',
diff --git a/system/config_apiv2.py b/system/config_apiv2.py
deleted file mode 100644
index 91c9281..0000000
--- a/system/config_apiv2.py
+++ /dev/null
@@ -1,4 +0,0 @@
-def config (plc_specs, options):
-    for plc_spec in plc_specs:
-        plc_spec['sfa']['SFA_AGGREGATE_API_VERSION']=2
-    return plc_specs
diff --git a/system/config_default.py b/system/config_default.py
index 248af7c..0bab510 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -308,7 +308,7 @@ def sfa (options,index) :
         'SFA_PLC_USER' : 'root@test.onelab.eu',
         'SFA_PLC_PASSWORD' : 'test++',
 # use -c apiv2 to override this one
-        'SFA_AGGREGATE_API_VERSION' : 1,
+#        '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)