From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Tue, 28 May 2013 10:18:32 +0000 (+0200)
Subject: Plug v2_to_v3_adapter into existing v2 drivers
X-Git-Tag: sfa-3.0-1~48
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=69f800d39a4cf6193b0692fba9303ff033f273f3;p=sfa.git

Plug v2_to_v3_adapter into existing v2 drivers
---

diff --git a/sfa/generic/dummy.py b/sfa/generic/dummy.py
index 63fa25ee..7dd53507 100644
--- a/sfa/generic/dummy.py
+++ b/sfa/generic/dummy.py
@@ -25,7 +25,6 @@ class dummy (Generic):
 
     # driver class for server-side services, talk to the whole testbed
     def driver_class (self):
-        import sfa.dummy.dummydriver
-        return sfa.dummy.dummydriver.DummyDriver
-
+        import sfa.managers.v2_to_v3_adapter
+        return sfa.managers.v2_to_v3_adapter.V2ToV3Adapter
 
diff --git a/sfa/generic/fd.py b/sfa/generic/fd.py
index 1001d5bc..f18b7359 100644
--- a/sfa/generic/fd.py
+++ b/sfa/generic/fd.py
@@ -9,4 +9,5 @@ import sfa.federica.fddriver
 class fd (pl):
 
     def driver_class (self) :
-        return sfa.federica.fddriver.FdDriver
+        import sfa.managers.v2_to_v3_adapter
+        return sfa.managers.v2_to_v3_adapter.V2ToV3Adapter
diff --git a/sfa/generic/nitos.py b/sfa/generic/nitos.py
index e85817bc..5bad942f 100644
--- a/sfa/generic/nitos.py
+++ b/sfa/generic/nitos.py
@@ -25,8 +25,8 @@ class nitos (Generic):
 
     # driver class for server-side services, talk to the whole testbed
     def driver_class (self):
-        import sfa.nitos.nitosdriver
-        return sfa.nitos.nitosdriver.NitosDriver
+        import sfa.managers.v2_to_v3_adapter
+        return sfa.managers.v2_to_v3_adapter.V2ToV3Adapter
 
     # for the component mode, to be run on board planetlab nodes
     # manager class
diff --git a/sfa/generic/slab.py b/sfa/generic/slab.py
index 7923af08..e4a474be 100644
--- a/sfa/generic/slab.py
+++ b/sfa/generic/slab.py
@@ -30,8 +30,8 @@ class slab (Generic):
 
     # driver class for server-side services, talk to the whole testbed
     def driver_class (self):
-        import sfa.senslab.slabdriver
-        return sfa.senslab.slabdriver.SlabDriver
+        import sfa.managers.v2_to_v3_adapter
+        return sfa.managers.v2_to_v3_adapter.V2ToV3Adapter
 
     # slab does not have a component manager yet
     # manager class