From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Fri, 15 Nov 2013 15:23:48 +0000 (+0100)
Subject: update v2_to_v3_adapter constructor
X-Git-Tag: sfa-3.1-1~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0584e7e3df0afdaea532d22bda7d0e3f10c9844a;p=sfa.git

update v2_to_v3_adapter constructor
---

diff --git a/sfa/managers/v2_to_v3_adapter.py b/sfa/managers/v2_to_v3_adapter.py
index 069ef69e..e29b4cde 100644
--- a/sfa/managers/v2_to_v3_adapter.py
+++ b/sfa/managers/v2_to_v3_adapter.py
@@ -12,23 +12,21 @@ from sfa.storage.alchemy import dbsession
 
 class V2ToV3Adapter:
 
-    def __init__ (self, config):
+    def __init__ (self, api):
+        config = api.config
         flavour = config.SFA_GENERIC_FLAVOUR
         # to be cleaned
         if flavour == "nitos":
             from sfa.nitos.nitosdriver import NitosDriver
-            self.driver = NitosDriver(config)
+            self.driver = NitosDriver(api)
         elif flavour == "fd":
             from sfa.federica.fddriver import FdDriver
-            self.driver = FdDriver(config)
-        elif flavour == "dummy":
-            from sfa.dummy.dummydriver import DummyDriver
-            self.driver = DummyDriver(config)
-        elif flavour == "slab":
-            from sfa.senslab.slabdriver import SlabDriver
-            self.driver = SlabDriver(config)
+            self.driver = FdDriver(api)
+        elif flavour == "iotlab":
+            from sfa.iotlab.iotlabdriver import IotlabDriver
+            self.driver = IotlabDriver(api)
         else:
-          logger.info("DriverV2Adapter unknown flavour !!!\n supported flavours: pl, nitos, fd, dummy, slab")
+          logger.info("DriverV2Adapter unknown flavour !!!\n supported flavours: pl, nitos, fd, iotlab")
          
         # Caching 
         if config.SFA_AGGREGATE_CACHING: