X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2Fslabimporter.py;h=d38f454dfd91e5f87a126e64d3cd90a9ce922e0b;hb=6872209af2d5ec927820f2b333b8d3b112260957;hp=b0daf22fdda8c4b632b0ae833b31e635ed2908cf;hpb=cedf37c8661ec0b05349274962bf2db9cfa6a24d;p=sfa.git diff --git a/sfa/importer/slabimporter.py b/sfa/importer/slabimporter.py index b0daf22f..d38f454d 100644 --- a/sfa/importer/slabimporter.py +++ b/sfa/importer/slabimporter.py @@ -1,13 +1,8 @@ -import os import sys -import datetime -import time from sfa.util.config import Config -from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn -from sfa.util.plxrn import PlXrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename +from sfa.util.xrn import Xrn, get_authority, hrn_to_urn -from sfa.senslab.LDAPapi import LDAPapi from sfa.senslab.slabdriver import SlabDriver from sfa.senslab.slabpostgres import SliceSenslab, slab_dbsession @@ -15,9 +10,11 @@ from sfa.trust.certificate import Keypair,convert_public_key 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.storage.dbschema import DBSchema +from sfa.storage.model import RegRecord, RegAuthority, RegSlice, RegNode, \ + RegUser, RegKey +from sfa.util.sfalogging import logger +from sqlalchemy.exc import SQLAlchemyError def _get_site_hrn(site): @@ -26,13 +23,15 @@ 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)] ) + - - def hostname_to_hrn(self,root_auth,login_base,hostname): - return PlXrn(auth=root_auth,hostname = hostname).get_hrn() def slicename_to_hrn(self, person_hrn): return (person_hrn +'_slice') @@ -92,7 +91,7 @@ class SlabImporter: ldap_person_listdict = slabdriver.GetPersons() slices_listdict = slabdriver.GetSlices() try: - slices_by_userid = dict ( [ (slice.record_id_user, slice ) for slice in slices_listdict ] ) + slices_by_userid = dict ( [ (one_slice['record_id_user'], one_slice ) for one_slice in slices_listdict ] ) except TypeError: self.logger.log_exc("SlabImporter: failed to create list of slices by user id.") pass @@ -102,7 +101,7 @@ class SlabImporter: site_record = self.find_record_by_type_hrn ('authority', site_hrn) if not site_record: try: - urn = hrn_to_urn(site_hrn, 'authority') + urn = hrn_to_urn(site_hrn, 'authority') if not self.auth_hierarchy.auth_exists(urn): self.auth_hierarchy.create_auth(urn) auth_info = self.auth_hierarchy.get_auth_info(urn) @@ -114,7 +113,7 @@ class SlabImporter: dbsession.commit() self.logger.info("SlabImporter: imported authority (site) : %s" % site_record) self.update_just_added_records_dict(site_record) - except: + except SQLAlchemyError: # if the site import fails then there is no point in trying to import the # site's child records (node, slices, persons), so skip them. self.logger.log_exc("SlabImporter: failed to import site. Skipping child records") @@ -132,24 +131,30 @@ class SlabImporter: self.logger.warning ("SlabImporter: cannot find node_id %s - ignored"%node_id) continue site_auth = get_authority(site_hrn) - site_name = site['name'] - hrn = self.hostname_to_hrn(slabdriver.root_auth, site_name, node['hostname']) + site_name = site['name'] + escaped_hrn = self.hostname_to_hrn_escaped(slabdriver.root_auth, node['hostname']) + print>>sys.stderr, "\r\n \r\n SLABIMPORTER node %s " %(node) + hrn = node['hrn'] + + # xxx this sounds suspicious if len(hrn) > 64: hrn = hrn[:64] node_record = self.find_record_by_type_hrn( 'node', hrn ) if not node_record: try: pkey = Keypair(create=True) - urn = hrn_to_urn(hrn, 'node') + 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() - self.logger.info("SlabImporter: imported node: %s" % node_record) - print>>sys.stderr, "\r\n \t\t\t SLAB IMPORTER NODE IMPORT NOTnode_record %s " %(node_record) + self.logger.info("SlabImporter: imported node: %s" % node_record) self.update_just_added_records_dict(node_record) except: self.logger.log_exc("SlabImporter: failed to import node") @@ -161,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']) @@ -169,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) @@ -195,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 @@ -245,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') @@ -264,12 +276,13 @@ class SlabImporter: #Get it sl_rec = dbsession.query(RegSlice).filter(RegSlice.hrn.match(slice_hrn)).all() - slab_slice = SliceSenslab( slice_hrn = slice_hrn, record_id_slice=sl_rec[0].record_id, record_id_user= user_record.record_id) + slab_slice = SliceSenslab( slice_hrn = slice_hrn, record_id_slice=sl_rec[0].record_id, record_id_user= user_record.record_id) print>>sys.stderr, "\r\n \r\n SLAB IMPORTER SLICE IMPORT NOTslice_record %s \r\n slab_slice %s" %(sl_rec,slab_slice) slab_dbsession.add(slab_slice) 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") @@ -280,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