X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fsfa-import-plc.py;h=7b96c359b596e8230d03d659c19d011896cab5bb;hb=bfcea75fd4f7d91b186f4f0e479db0e6f0a231ae;hp=4732d2057d86b6ddf7955d22d0c8006dbd0e0b32;hpb=8e569f6e00e9c1a3026cd08dced1169d44319745;p=sfa.git diff --git a/sfa/plc/sfa-import-plc.py b/sfa/plc/sfa-import-plc.py index 4732d205..7b96c359 100755 --- a/sfa/plc/sfa-import-plc.py +++ b/sfa/plc/sfa-import-plc.py @@ -1,8 +1,5 @@ #!/usr/bin/python # -### $Id$ -### $URL$ -# ## # Import PLC records into the SFA database. It is indended that this tool be # run once to create SFA records that reflect the current state of the @@ -20,22 +17,21 @@ import getopt import sys import tempfile -import logging.handlers -import logging + from sfa.util.record import * from sfa.util.table import SfaTable -from sfa.util.namespace import * +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.trust.certificate import convert_public_key, Keypair from sfa.trust.trustedroot import * from sfa.trust.hierarchy import * +from sfa.util.xrn import Xrn from sfa.plc.api import * from sfa.trust.gid import create_uuid -from sfa.plc.sfaImport import * -from sfa.util.report import trace, error +from sfa.plc.sfaImport import sfaImport def process_options(): - global hrn (options, args) = getopt.getopt(sys.argv[1:], '', []) for opt in options: @@ -60,15 +56,7 @@ def save_keys(filename, keys): f.close() def main(): - # setup the logger - LOGFILE='/var/log/sfa_import_plc.log' - logging.basicConfig(level=logging.INFO, - format='%(asctime)s - %(message)s', - filename=LOGFILE) - rotate_handler = logging.handlers.RotatingFileHandler(LOGFILE, maxBytes=1000000, backupCount=5) - logger = logging.getLogger() - logger.addHandler(rotate_handler) - + process_options() config = Config() if not config.SFA_REGISTRY_ENABLED: @@ -76,24 +64,31 @@ def main(): root_auth = config.SFA_REGISTRY_ROOT_AUTH interface_hrn = config.SFA_INTERFACE_HRN keys_filename = config.config_path + os.sep + 'person_keys.py' - sfaImporter = sfaImport(logger) + sfaImporter = sfaImport() + if config.SFA_API_DEBUG: sfaImporter.logger.setLevelDebug() shell = sfaImporter.shell plc_auth = sfaImporter.plc_auth - AuthHierarchy = sfaImporter.AuthHierarchy - TrustedRoots = sfaImporter.TrustedRoots + + # initialize registry db table table = SfaTable() if not table.exists(): - table.create() + table.create() # create root authority sfaImporter.create_top_level_auth_records(root_auth) if not root_auth == interface_hrn: sfaImporter.create_top_level_auth_records(interface_hrn) - trace("Import: adding " + interface_hrn + " to trusted list", logger) - authority = AuthHierarchy.get_auth_info(interface_hrn) - TrustedRoots.add_gid(authority.get_gid_object()) + # create interface records + sfaImporter.logger.info("Import: creating interface records") + sfaImporter.create_interface_records() + + # add local root authority's cert to trusted list + sfaImporter.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', @@ -117,7 +112,7 @@ def main(): sites_dict[site['login_base']] = site # Get all plc users - persons = shell.GetPersons(plc_auth, {'peer_id': None}, ['person_id', 'email', 'key_ids', 'site_ids']) + persons = shell.GetPersons(plc_auth, {'peer_id': None, 'enabled': True}, ['person_id', 'email', 'key_ids', 'site_ids']) persons_dict = {} for person in persons: persons_dict[person['person_id']] = person @@ -148,10 +143,11 @@ def main(): slices_dict = {} for slice in slices: slices_dict[slice['slice_id']] = slice - # start importing for site in sites: site_hrn = interface_hrn + "." + site['login_base'] + sfa_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 \ @@ -166,7 +162,7 @@ def main(): hrn = hostname_to_hrn(interface_hrn, site['login_base'], node['hostname']) if hrn not in existing_hrns or \ (hrn, 'node') not in existing_records: - sfaImporter.import_node(site_hrn, node) + sfaImporter.import_node(hrn, node) # import slices for slice_id in site['slice_ids']: @@ -203,7 +199,9 @@ def main(): for (record_hrn, type) in existing_records.keys(): record = existing_records[(record_hrn, type)] # if this is the interface name dont do anything - if record_hrn == interface_hrn or record['peer_authority']: + if record_hrn == interface_hrn or \ + record_hrn == root_auth or \ + record['peer_authority']: continue # dont delete vini's internet2 placeholdder record # normally this would be deleted becuase it does not have a plc record @@ -227,7 +225,7 @@ def main(): site = sites_dict[login_base] for person in persons: tmp_username = person['email'].split("@")[0] - alt_username = person['email'].split("@")[0].replace(".", "_") + alt_username = person['email'].split("@")[0].replace(".", "_").replace("+", "_") if username in [tmp_username, alt_username] and \ site['site_id'] in person['site_ids'] and \ person['person_id'] == record['pointer']: @@ -244,11 +242,11 @@ def main(): elif type == 'node': login_base = get_leaf(get_authority(record_hrn)) - nodename = get_leaf(record_hrn) + nodename = Xrn.unescape(get_leaf(record_hrn)) if login_base in sites_dict: site = sites_dict[login_base] for node in nodes: - tmp_nodename = node['hostname'].split(".")[0] + tmp_nodename = node['hostname'] if tmp_nodename == nodename and \ node['site_id'] == site['site_id'] and \ node['node_id'] == record['pointer']: @@ -262,7 +260,7 @@ def main(): sfaImporter.delete_record(record_hrn, type) # save pub keys - trace('Import: saving current pub keys', logger) + sfaImporter.logger.info('Import: saving current pub keys') save_keys(keys_filename, person_keys) if __name__ == "__main__":