X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2Fiotlabimporter.py;h=0817dad8f96f15bd504b5ab9b7c312f58ed9d857;hb=a18ad5b1dbc2a1dd346784105c89a0714086ebc4;hp=f97cd3aca287f0a240077b7e99d57fd87afa1879;hpb=b0995f45712c5ea9dd26fdf0c4347ccba2d77fce;p=sfa.git diff --git a/sfa/importer/iotlabimporter.py b/sfa/importer/iotlabimporter.py index f97cd3ac..0817dad8 100644 --- a/sfa/importer/iotlabimporter.py +++ b/sfa/importer/iotlabimporter.py @@ -2,7 +2,7 @@ from sfa.util.config import Config from sfa.util.xrn import Xrn, get_authority, hrn_to_urn from sfa.iotlab.iotlabdriver import IotlabDriver - +from sfa.iotlab.iotlabpostgres import IotlabDB, Iotlab_xp from sfa.trust.certificate import Keypair, convert_public_key from sfa.trust.gid import create_uuid @@ -362,7 +362,7 @@ class IotlabImporter: self.auth_hierarchy.create_gid(person_urn, \ create_uuid(), pkey) if person['email']: - self.logger.debug( "SLAB IMPORTER \ + self.logger.debug( "IOTLAB IMPORTER \ PERSON EMAIL OK email %s " %(person['email'])) person_gid.set_email(person['email']) user_record = RegUser(hrn=person_hrn, \ @@ -495,11 +495,11 @@ class IotlabImporter: config = Config() iotlabdriver = IotlabDriver(config) - + iotlab_db = IotlabDB(config) #Create special slice table for iotlab - if not iotlabdriver.db.exists('iotlab_xp'): - iotlabdriver.db.createtable() + if not iotlab_db.exists('iotlab_xp'): + iotlab_db.createtable() self.logger.info ("IotlabImporter.run: iotlab_xp table created ")