X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2Fiotlabimporter.py;h=74fe76edfea15632760e58c72f8a36b2a75abcea;hb=79e790a945023b5a8167ca28671cdf8d3b6e4a1a;hp=86874375a9ce8144d405a588af4799b35fbae84a;hpb=b66385581e40464404bb642d69a737f9d27e414a;p=sfa.git

diff --git a/sfa/importer/iotlabimporter.py b/sfa/importer/iotlabimporter.py
index 86874375..74fe76ed 100644
--- a/sfa/importer/iotlabimporter.py
+++ b/sfa/importer/iotlabimporter.py
@@ -181,7 +181,7 @@ class IotlabImporter:
                         - ignored" % (node_id))
                 continue
             escaped_hrn =  \
-                self.hostname_to_hrn_escaped(iotlabdriver.iotlab_api.root_auth,
+                self.hostname_to_hrn_escaped(iotlabdriver.testbed_shell.root_auth,
                                              node['hostname'])
             self.logger.info("IOTLABIMPORTER node %s " % (node))
             hrn = node['hrn']
@@ -238,8 +238,8 @@ class IotlabImporter:
         :type iotlabdriver: IotlabDriver
         """
 
-        sites_listdict = iotlabdriver.iotlab_api.GetSites()
-        nodes_listdict = iotlabdriver.iotlab_api.GetNodes()
+        sites_listdict = iotlabdriver.testbed_shell.GetSites()
+        nodes_listdict = iotlabdriver.testbed_shell.GetNodes()
         nodes_by_id = dict([(node['node_id'], node) for node in nodes_listdict])
         for site in sites_listdict:
             site_hrn = site['name']
@@ -332,7 +332,7 @@ class IotlabImporter:
             iotlabdriver attributes.
         :type iotlabdriver: IotlabDriver
         """
-        ldap_person_listdict = iotlabdriver.iotlab_api.GetPersons()
+        ldap_person_listdict = iotlabdriver.testbed_shell.GetPersons()
         self.logger.info("IOTLABIMPORT \t ldap_person_listdict %s \r\n"
                          % (ldap_person_listdict))
 
@@ -529,7 +529,7 @@ class IotlabImporter:
 
          ### remove stale records
         # special records must be preserved
-        system_hrns = [iotlabdriver.hrn, iotlabdriver.iotlab_api.root_auth,
+        system_hrns = [iotlabdriver.hrn, iotlabdriver.testbed_shell.root_auth,
                        iotlabdriver.hrn + '.slicemanager']
         for record in self.all_records:
             if record.hrn in system_hrns: