X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2Fslabimporter.py;h=d38f454dfd91e5f87a126e64d3cd90a9ce922e0b;hb=1ca62657b0e80664a840e4856618dc5103fb1252;hp=325e526b3aa7ce31188085c4ca3f19e9e7d0bffa;hpb=97d09a321eff49c73c09f44a10d1ae0d7767d250;p=sfa.git diff --git a/sfa/importer/slabimporter.py b/sfa/importer/slabimporter.py index 325e526b..d38f454d 100644 --- a/sfa/importer/slabimporter.py +++ b/sfa/importer/slabimporter.py @@ -12,7 +12,7 @@ from sfa.trust.gid import create_uuid from sfa.storage.alchemy import dbsession from sfa.storage.model import RegRecord, RegAuthority, RegSlice, RegNode, \ RegUser, RegKey - +from sfa.util.sfalogging import logger from sqlalchemy.exc import SQLAlchemyError @@ -23,9 +23,10 @@ def _get_site_hrn(site): class SlabImporter: - def __init__ (self, auth_hierarchy, logger): + def __init__ (self, auth_hierarchy, loc_logger): self.auth_hierarchy = auth_hierarchy - self.logger=logger + self.logger = loc_logger + self.logger.setLevelDebug() def hostname_to_hrn_escaped(self, root_auth, hostname): return '.'.join( [root_auth,Xrn.escape(hostname)] ) @@ -144,9 +145,12 @@ class SlabImporter: pkey = Keypair(create=True) urn = hrn_to_urn(escaped_hrn, 'node') node_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey) + def slab_get_authority(hrn): + return hrn.split(".")[0] + node_record = RegNode (hrn=hrn, gid=node_gid, pointer = '-1', - authority=get_authority(hrn)) + authority=slab_get_authority(hrn)) node_record.just_created() dbsession.add(node_record) dbsession.commit() @@ -162,7 +166,8 @@ class SlabImporter: # import persons for person in ldap_person_listdict : - + if 'ssh-rsa' not in person['pkey']: + continue person_hrn = person['hrn'] slice_hrn = self.slicename_to_hrn(person['hrn']) @@ -170,24 +175,29 @@ class SlabImporter: if len(person_hrn) > 64: person_hrn = person_hrn[:64] person_urn = hrn_to_urn(person_hrn, 'user') - user_record = self.find_record_by_type_hrn( 'user', person_hrn) + user_record = self.find_record_by_type_hrn('user', person_hrn) slice_record = self.find_record_by_type_hrn ('slice', slice_hrn) # return a tuple pubkey (a plc key object) and pkey (a Keypair object) def init_person_key (person, slab_key): - pubkey=None + pubkey = None if person['pkey']: # randomly pick first key in set pubkey = slab_key + try: pkey = convert_public_key(pubkey) - except: - self.logger.warn('SlabImporter: unable to convert public key for %s' % person_hrn) + except TypeError: + #key not good. create another pkey + self.logger.warn('SlabImporter: \ + unable to convert public \ + key for %s' % person_hrn) pkey = Keypair(create=True) + else: # the user has no keys. Creating a random keypair for the user's gid self.logger.warn("SlabImporter: person %s does not have a PL public key"%person_hrn) - pkey = Keypair(create=True) + pkey = Keypair(create=True) return (pubkey, pkey) @@ -196,29 +206,30 @@ class SlabImporter: # new person if not user_record: (pubkey,pkey) = init_person_key (person, slab_key ) - person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey) - if person['email']: - print>>sys.stderr, "\r\n \r\n SLAB IMPORTER PERSON EMAIL OK email %s " %(person['email']) - person_gid.set_email(person['email']) - user_record = RegUser (hrn=person_hrn, gid=person_gid, - pointer='-1', - authority=get_authority(person_hrn), - email=person['email']) - else: - user_record = RegUser (hrn=person_hrn, gid=person_gid, - pointer='-1', - authority=get_authority(person_hrn)) - - if pubkey: - user_record.reg_keys=[RegKey (pubkey)] - else: - self.logger.warning("No key found for user %s"%user_record) - user_record.just_created() - dbsession.add (user_record) - dbsession.commit() - self.logger.info("SlabImporter: imported person: %s" % user_record) - print>>sys.stderr, "\r\n \r\n SLAB IMPORTER PERSON IMPORT NOTuser_record %s " %(user_record) - self.update_just_added_records_dict( user_record ) + if pubkey is not None and pkey is not None : + person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey) + if person['email']: + print>>sys.stderr, "\r\n \r\n SLAB IMPORTER PERSON EMAIL OK email %s " %(person['email']) + person_gid.set_email(person['email']) + user_record = RegUser (hrn=person_hrn, gid=person_gid, + pointer='-1', + authority=get_authority(person_hrn), + email=person['email']) + else: + user_record = RegUser (hrn=person_hrn, gid=person_gid, + pointer='-1', + authority=get_authority(person_hrn)) + + if pubkey: + user_record.reg_keys = [RegKey (pubkey)] + else: + self.logger.warning("No key found for user %s"%user_record) + user_record.just_created() + dbsession.add (user_record) + dbsession.commit() + self.logger.info("SlabImporter: imported person: %s" % user_record) + print>>sys.stderr, "\r\n \r\n SLAB IMPORTER PERSON IMPORT NOTuser_record %s " %(user_record) + self.update_just_added_records_dict( user_record ) else: # update the record ? # if user's primary key has changed then we need to update the @@ -246,9 +257,9 @@ class SlabImporter: try: slice = slices_by_userid[user_record.record_id] except: - self.logger.warning ("SlabImporter: cannot locate slices_by_userid[user_record.record_id] %s - ignored"%user_record.record_id ) - if not slice_record: - + self.logger.warning ("SlabImporter: cannot locate slices_by_userid[user_record.record_id] %s - ignored"%user_record) + + if not slice_record : try: pkey = Keypair(create=True) urn = hrn_to_urn(slice_hrn, 'slice') @@ -271,6 +282,7 @@ class SlabImporter: slab_dbsession.commit() self.logger.info("SlabImporter: imported slice: %s" % slice_record) self.update_just_added_records_dict ( slice_record ) + except: self.logger.log_exc("SlabImporter: failed to import slice") @@ -281,6 +293,7 @@ class SlabImporter: pass # record current users affiliated with the slice + slice_record.reg_researchers = [user_record] dbsession.commit() slice_record.stale=False