From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 13 Jan 2014 14:12:04 +0000 (+0100)
Subject: Fixing small mistakes in code / commentary.
X-Git-Tag: sfa-3.1-2~32^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cb89751419b4bf82616fecfa1034282d8ac7cc9a;p=sfa.git

Fixing small mistakes in code / commentary.
---

diff --git a/sfa/cortexlab/cortexlabdriver.py b/sfa/cortexlab/cortexlabdriver.py
index cd027655..bc674f76 100644
--- a/sfa/cortexlab/cortexlabdriver.py
+++ b/sfa/cortexlab/cortexlabdriver.py
@@ -14,8 +14,7 @@ from sfa.managers.driver import Driver
 from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 
-from sfa.cortexlab.cortexlabaggregate import CortexlabAggregate, \
-            cortexlab_xrn_to_hostname
+from sfa.cortexlab.cortexlabaggregate import CortexlabAggregate
 
 from sfa.cortexlab.cortexlabslices import CortexlabSlices
 from sfa.cortexlab.cortexlabshell import CortexlabShell
@@ -1011,7 +1010,7 @@ class CortexlabDriver(Driver):
                 if get_authority(lease['component_id']) == \
                         self.testbed_shell.root_auth:
                     single_requested_lease['hostname'] = \
-                        cortexlab_xrn_to_hostname(\
+                        xrn_to_hostname(\
                             lease.get('component_id').strip())
                     single_requested_lease['start_time'] = \
                         lease.get('start_time')
diff --git a/sfa/cortexlab/cortexlabshell.py b/sfa/cortexlab/cortexlabshell.py
index 8c19ed6a..1321484a 100644
--- a/sfa/cortexlab/cortexlabshell.py
+++ b/sfa/cortexlab/cortexlabshell.py
@@ -31,7 +31,7 @@ class CortexlabShell():
         :param config: configuration object from sfa.util.config
         :type config: Config object
         """
-        self.leases_db = TestbedAdditionalSfaDB(config)
+
         self.query_sites = CortexlabQueryNodes()
         self.ldap = LDAPapi()
         self.time_format = "%Y-%m-%d %H:%M:%S"
diff --git a/sfa/importer/iotlabimporter.py b/sfa/importer/iotlabimporter.py
index 85e74732..3528db47 100644
--- a/sfa/importer/iotlabimporter.py
+++ b/sfa/importer/iotlabimporter.py
@@ -1,6 +1,6 @@
 """ File defining the importer class and all the methods needed to import
 the nodes, users and slices from OAR and LDAP to the SFA database.
-Also creates the iotlab specific databse and table to keep track
+Also creates the iotlab specific  table to keep track
 of which slice hrn contains which job.
 """
 from sfa.util.config import Config