Bug fix : IotlabShell does not take an api object as a paremater

but a config object.

diff --git a/sfa/iotlab/iotlabdriver.py b/sfa/iotlab/iotlabdriver.py
index 3117d9a..6aea1ce 100644 (file)
--- a/sfa/iotlab/iotlabdriver.py
+++ b/sfa/iotlab/iotlabdriver.py
@@ -41,7 +41,7 @@ class IotlabDriver(Driver):
         Driver.__init__(self, api)
         self.api = api
         config = api.config
         Driver.__init__(self, api)
         self.api = api
         config = api.config

-        self.testbed_shell = IotlabShell(api)
+        self.testbed_shell = IotlabShell(config)

         self.cache = None
 
     def augment_records_with_testbed_info(self, record_list):
         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 06a8ea6..453852e 100644 (file)
--- a/sfa/iotlab/iotlabshell.py
+++ b/sfa/iotlab/iotlabshell.py
@@ -27,7 +27,7 @@ class IotlabShell():
 
     _MINIMUM_DURATION = 10  # 10 units of granularity 60 s, 10 mins
 
 
     _MINIMUM_DURATION = 10  # 10 units of granularity 60 s, 10 mins
 

-    def __init__(self, api):
+    def __init__(self, config):

         """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
         """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


@@ -36,8 +36,8 @@ class IotlabShell():
         :param config: configuration object from sfa.util.config
         :type config: Config object
         """
         :param config: configuration object from sfa.util.config
         :type config: Config object
         """

-        self.api=api
-        config=api.config
+        # self.api=api
+        # config=api.config

         self.leases_db = TestbedAdditionalSfaDB(config)
         self.oar = OARrestapi()
         self.ldap = LDAPapi()
         self.leases_db = TestbedAdditionalSfaDB(config)
         self.oar = OARrestapi()
         self.ldap = LDAPapi()