From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 15 Nov 2013 13:44:30 +0000 (+0100)
Subject: build drivers from an api instance, not a config anymore
X-Git-Tag: sfa-3.1-1~34
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c6f8288bc13c54c464504e041eb3609781e7dbde;hp=4d930649b5802ac17edfeed19c666e36af38654a;p=sfa.git

build drivers from an api instance, not a config anymore
---

diff --git a/sfa/iotlab/iotlabdriver.py b/sfa/iotlab/iotlabdriver.py
index a5703d4b..910804e2 100644
--- a/sfa/iotlab/iotlabdriver.py
+++ b/sfa/iotlab/iotlabdriver.py
@@ -28,7 +28,7 @@ class IotlabDriver(Driver):
     .. seealso::: Driver class
 
     """
-    def __init__(self, config):
+    def __init__(self, api):
         """
 
         Sets the iotlab SFA config parameters,
@@ -38,9 +38,10 @@ class IotlabDriver(Driver):
         :type config: Config object
 
         """
-        Driver.__init__(self, config)
-        self.config = config
-        self.testbed_shell = IotlabShell(config)
+        Driver.__init__(self, api)
+        self.api=api
+        config = api.config
+        self.testbed_shell = IotlabShell(api)
         self.cache = None
 
     def augment_records_with_testbed_info(self, record_list):
diff --git a/sfa/iotlab/iotlabshell.py b/sfa/iotlab/iotlabshell.py
index f1efa73f..081eb4ee 100644
--- a/sfa/iotlab/iotlabshell.py
+++ b/sfa/iotlab/iotlabshell.py
@@ -28,7 +28,7 @@ class IotlabShell():
 
     _MINIMUM_DURATION = 10  # 10 units of granularity 60 s, 10 mins
 
-    def __init__(self, config):
+    def __init__(self, api):
         """Creates an instance of OARrestapi and LDAPapi which will be used to
         issue calls to OAR or LDAP methods.
         Set the time format  and the testbed granularity used for OAR
@@ -37,6 +37,8 @@ class IotlabShell():
         :param config: configuration object from sfa.util.config
         :type config: Config object
         """
+        self.api=api
+        config=api.config
         self.leases_db = TestbedAdditionalSfaDB(config)
         self.oar = OARrestapi()
         self.ldap = LDAPapi()