X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2Fsfa-import-plc.py;h=723f473f3c20e84a4b4e1436d50abde18f8367ab;hb=8712d295c3a4b5f8debe59a1755c1f9b461ab49c;hp=dad723b67c9f35726cd767f65ddebd86d080b3fa;hpb=a772af7fc570de7a2c194f3b8ffe7d30350f950d;p=sfa.git diff --git a/sfa/importer/sfa-import-plc.py b/sfa/importer/sfa-import-plc.py index dad723b6..723f473f 100755 --- a/sfa/importer/sfa-import-plc.py +++ b/sfa/importer/sfa-import-plc.py @@ -18,13 +18,15 @@ import os import getopt import sys -from sfa.util.table import SfaTable -from sfa.util.xrn import get_leaf, get_authority -from sfa.util.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename from sfa.util.config import Config -from sfa.util.xrn import Xrn - -from sfa.importer.sfaImport import sfaImport +from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn +from sfa.util.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename +from sfa.storage.table import SfaTable +from sfa.storage.record import SfaRecord +from sfa.trust.gid import create_uuid +from sfa.trust.certificate import convert_public_key, Keypair +from sfa.importer.sfaImport import sfaImport, _cleanup_string +from sfa.plc.plshell import PlShell def process_options(): @@ -70,42 +72,17 @@ def main(): interface_hrn = config.SFA_INTERFACE_HRN keys_filename = config.config_path + os.sep + 'person_keys.py' sfaImporter = sfaImport() + sfaImporter.create_top_level_records() logger=sfaImporter.logger - if config.SFA_API_DEBUG: logger.setLevelDebug() - shell = sfaImporter.shell + logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL) + shell = PlShell (config) - # initialize registry db table - table = SfaTable() - if not table.exists(): - table.create() - - # create root authority - sfaImporter.create_top_level_auth_records(interface_hrn) - - # create s user record for the slice manager - sfaImporter.create_sm_client_record() - - # create interface records - logger.info("Import: creating interface records") - sfaImporter.create_interface_records() - - # add local root authority's cert to trusted list - logger.info("Import: adding " + interface_hrn + " to trusted list") - authority = sfaImporter.AuthHierarchy.get_auth_info(interface_hrn) - sfaImporter.TrustedRoots.add_gid(authority.get_gid_object()) - - # special case for vini - if ".vini" in interface_hrn and interface_hrn.endswith('vini'): - # create a fake internet2 site first - i2site = {'name': 'Internet2', 'abbreviated_name': 'I2', - 'login_base': 'internet2', 'site_id': -1} - sfaImporter.import_site(interface_hrn, i2site) - # create dict of all existing sfa records existing_records = {} existing_hrns = [] key_ids = [] person_keys = {} + table = SfaTable() results = table.find() for result in results: existing_records[(result['hrn'], result['type'])] = result @@ -150,6 +127,28 @@ def main(): slices_dict = {} for slice in slices: slices_dict[slice['slice_id']] = slice + + # special case for vini + if ".vini" in interface_hrn and interface_hrn.endswith('vini'): + # create a fake internet2 site first + i2site = {'name': 'Internet2', 'abbreviated_name': 'I2', + 'login_base': 'internet2', 'site_id': -1} + site_hrn = _get_site_hrn(interface_hrn, i2site) + logger.info("Importing site: %s" % site_hrn) + # import if hrn is not in list of existing hrns or if the hrn exists + # but its not a site record + if site_hrn not in existing_hrns or \ + (site_hrn, 'authority') not in existing_records: + logger.info("Import: site %s " % site_hrn) + urn = hrn_to_urn(site_hrn, 'authority') + if not sfaImporter.AuthHierarchy.auth_exists(urn): + sfaImporter.AuthHierarchy.create_auth(urn) + auth_info = sfaImporter.AuthHierarchy.get_auth_info(urn) + auth_record = SfaRecord(hrn=site_hrn, gid=auth_info.get_gid_object(), \ + type="authority", pointer=site['site_id'], + authority=get_authority(site_hrn)) + auth_record.sync(verbose=True) + # start importing for site in sites: site_hrn = _get_site_hrn(interface_hrn, site) @@ -159,7 +158,22 @@ def main(): # but its not a site record if site_hrn not in existing_hrns or \ (site_hrn, 'authority') not in existing_records: - sfaImporter.import_site(site_hrn, site) + try: + logger.info("Import: site %s " % site_hrn) + urn = hrn_to_urn(site_hrn, 'authority') + if not sfaImporter.AuthHierarchy.auth_exists(urn): + sfaImporter.AuthHierarchy.create_auth(urn) + auth_info = sfaImporter.AuthHierarchy.get_auth_info(urn) + auth_record = SfaRecord(hrn=site_hrn, gid=auth_info.get_gid_object(), \ + type="authority", pointer=site['site_id'], + authority=get_authority(site_hrn)) + logger.info("Import: importing site: %s" % auth_record.summary_string()) + auth_record.sync() + except: + # 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. + logger.log_exc("Import: failed to import site. Skipping child records") + continue # import node records for node_id in site['node_ids']: @@ -169,9 +183,20 @@ def main(): site_auth = get_authority(site_hrn) site_name = get_leaf(site_hrn) hrn = hostname_to_hrn(site_auth, site_name, node['hostname']) + if len(hrn) > 64: + hrn = hrn[:64] if hrn not in existing_hrns or \ (hrn, 'node') not in existing_records: - sfaImporter.import_node(hrn, node) + try: + pkey = Keypair(create=True) + urn = hrn_to_urn(hrn, 'node') + node_gid = sfaImporter.AuthHierarchy.create_gid(urn, create_uuid(), pkey) + node_record = SfaRecord(hrn=hrn, gid=node_gid, type="node", pointer=node['node_id'], authority=get_authority(hrn)) + logger.info("Import: importing node: %s" % node_record.summary_string()) + node_record.sync() + except: + logger.log_exc("Import: failed to import node") + # import slices for slice_id in site['slice_ids']: @@ -179,9 +204,20 @@ def main(): continue slice = slices_dict[slice_id] hrn = slicename_to_hrn(interface_hrn, slice['name']) + #slicename = slice['name'].split("_",1)[-1] + #slicename = _cleanup_string(slicename) if hrn not in existing_hrns or \ (hrn, 'slice') not in existing_records: - sfaImporter.import_slice(site_hrn, slice) + try: + pkey = Keypair(create=True) + urn = hrn_to_urn(hrn, 'slice') + slice_gid = sfaImporter.AuthHierarchy.create_gid(urn, create_uuid(), pkey) + slice_record = SfaRecord(hrn=hrn, gid=slice_gid, type="slice", pointer=slice['slice_id'], + authority=get_authority(hrn)) + logger.info("Import: importing slice: %s" % slice_record.summary_string()) + slice_record.sync() + except: + logger.log_exc("Import: failed to import slice") # import persons for person_id in site['person_ids']: @@ -189,6 +225,11 @@ def main(): continue person = persons_dict[person_id] hrn = email_to_hrn(site_hrn, person['email']) + if len(hrn) > 64: + hrn = hrn[:64] + + # if user's primary key has chnaged then we need to update the + # users gid by forcing a update here old_keys = [] new_keys = [] if person_id in old_person_keys: @@ -202,8 +243,26 @@ def main(): if hrn not in existing_hrns or \ (hrn, 'user') not in existing_records or update_record: - sfaImporter.import_person(site_hrn, person) - + try: + if 'key_ids' in person and person['key_ids']: + key = new_keys[0] + try: + pkey = convert_public_key(key) + except: + logger.warn('unable to convert public key for %s' % hrn) + pkey = Keypair(create=True) + else: + # the user has no keys. Creating a random keypair for the user's gid + logger.warn("Import: person %s does not have a PL public key"%hrn) + pkey = Keypair(create=True) + urn = hrn_to_urn(hrn, 'user') + person_gid = sfaImporter.AuthHierarchy.create_gid(urn, create_uuid(), pkey) + person_record = SfaRecord(hrn=hrn, gid=person_gid, type="user", \ + pointer=person['person_id'], authority=get_authority(hrn)) + logger.info("Import: importing person: %s" % person_record.summary_string()) + person_record.sync() + except: + logger.log_exc("Import: failed to import person.") # remove stale records system_records = [interface_hrn, root_auth, interface_hrn + '.slicemanager'] @@ -268,9 +327,13 @@ def main(): continue if not found: - record_object = existing_records[(record_hrn, type)] - sfaImporter.delete_record(record_hrn, type) - + try: + record_object = existing_records[(record_hrn, type)] + record = SfaRecord(dict=record_object) + logger.info("Import: deleting record: %s" % record.summary_string()) + record.delete() + except: + logger.log_exc("Import: failded to delete record") # save pub keys logger.info('Import: saving current pub keys') save_keys(keys_filename, person_keys)