From f42630a5eb66281b1a72cd9ddef976302e53b057 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Tue, 26 Nov 2013 16:10:07 +0100 Subject: [PATCH] Bug fix : IotlabShell does not take an api object as a paremater but a config object. --- sfa/iotlab/iotlabdriver.py | 2 +- sfa/iotlab/iotlabshell.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sfa/iotlab/iotlabdriver.py b/sfa/iotlab/iotlabdriver.py index 3117d9a1..6aea1ce2 100644 --- 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 - self.testbed_shell = IotlabShell(api) + self.testbed_shell = IotlabShell(config) 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 06a8ea66..453852ea 100644 --- 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 - 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 @@ -36,8 +36,8 @@ class IotlabShell(): :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() -- 2.45.2