X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fsfa-import-plc.py;h=cf2fa4ab71f960106804eb9e3c2c04ab77304451;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=ade979079034d42a66545ef1823c612910659b60;hpb=058136cdc4e5c1940cb3db82fb80fd1b9df2b78b;p=sfa.git diff --git a/sfa/plc/sfa-import-plc.py b/sfa/plc/sfa-import-plc.py index ade97907..cf2fa4ab 100755 --- a/sfa/plc/sfa-import-plc.py +++ b/sfa/plc/sfa-import-plc.py @@ -4,8 +4,8 @@ ### $URL$ # ## -# Import PLC records into the Geni database. It is indended that this tool be -# run once to create Geni records that reflect the current state of the +# 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 # planetlab database. # # The import tool assumes that the existing PLC hierarchy should all be part @@ -20,20 +20,19 @@ import getopt import sys import tempfile - +import logging.handlers +import logging from sfa.util.record import * -from sfa.util.genitable import GeniTable -from sfa.util.misc import * +from sfa.util.table import SfaTable +from sfa.util.namespace import * from sfa.util.config import Config -from sfa.util.report import trace, error - from sfa.trust.certificate import convert_public_key, Keypair from sfa.trust.trustedroot import * from sfa.trust.hierarchy import * +from sfa.plc.api import * from sfa.trust.gid import create_uuid from sfa.plc.sfaImport import * - - +from sfa.util.report import trace, error def process_options(): global hrn @@ -43,24 +42,52 @@ def process_options(): name = opt[0] val = opt[1] + +def load_keys(filename): + keys = {} + tmp_dict = {} + try: + execfile(filename, tmp_dict) + if 'keys' in tmp_dict: + keys = tmp_dict['keys'] + return keys + except: + return keys + +def save_keys(filename, keys): + f = open(filename, 'w') + f.write("keys = %s" % str(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: + sys.exit(0) root_auth = config.SFA_REGISTRY_ROOT_AUTH level1_auth = config.SFA_REGISTRY_LEVEL1_AUTH - sfaImporter = sfaImport() + keys_filename = config.config_path + os.sep + 'person_keys.py' + sfaImporter = sfaImport(logger) shell = sfaImporter.shell plc_auth = sfaImporter.plc_auth AuthHierarchy = sfaImporter.AuthHierarchy TrustedRoots = sfaImporter.TrustedRoots - table = GeniTable() + table = SfaTable() if not table.exists(): table.create() if not level1_auth or level1_auth in ['']: level1_auth = None - print "Import: creating top level authorities" if not level1_auth: sfaImporter.create_top_level_auth_records(root_auth) import_auth = root_auth @@ -70,7 +97,7 @@ def main(): sfaImporter.create_top_level_auth_records(level1_auth) import_auth = level1_auth - print "Import: adding", import_auth, "to trusted list" + trace("Import: adding" + import_auth + "to trusted list", logger) authority = AuthHierarchy.get_auth_info(import_auth) TrustedRoots.add_gid(authority.get_gid_object()) @@ -83,6 +110,8 @@ def main(): # create dict of all existing sfa records existing_records = {} existing_hrns = [] + key_ids = [] + person_keys = {} results = table.find() for result in results: existing_records[(result['hrn'], result['type'])] = result @@ -99,6 +128,21 @@ def main(): persons_dict = {} for person in persons: persons_dict[person['person_id']] = person + key_ids.extend(person['key_ids']) + + # Get all public keys + keys = shell.GetKeys(plc_auth, {'peer_id': None, 'key_id': key_ids}) + keys_dict = {} + for key in keys: + keys_dict[key['key_id']] = key['key'] + + # create a dict of person keys keyed on key_id + old_person_keys = load_keys(keys_filename) + for person in persons: + pubkeys = [] + for key_id in person['key_ids']: + pubkeys.append(keys_dict[key_id]) + person_keys[person['person_id']] = pubkeys # Get all plc nodes nodes = shell.GetNodes(plc_auth, {'peer_id': None}, ['node_id', 'hostname', 'site_id']) @@ -119,7 +163,7 @@ 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(import_auth, site) + site_hrn = sfaImporter.import_site(import_auth, site) # import node records for node_id in site['node_ids']: @@ -147,20 +191,39 @@ def main(): continue person = persons_dict[person_id] hrn = email_to_hrn(site_hrn, person['email']) + old_keys = [] + new_keys = [] + if person_id in old_person_keys: + old_keys = old_person_keys[person_id] + if person_id in person_keys: + new_keys = person_keys[person_id] + update_record = False + for key in new_keys: + if key not in old_keys: + update_record = True + if hrn not in existing_hrns or \ - (hrn, 'user') not in existing_records: + (hrn, 'user') not in existing_records or update_record: sfaImporter.import_person(site_hrn, person) - # remove stale records 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 == import_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 + if ".vini" in import_auth and import_auth.endswith('vini') and \ + record_hrn.endswith("internet2"): + continue + found = False - if record_hrn == import_auth: - continue + if type == 'authority': for site in sites: site_hrn = import_auth + "." + site['login_base'] - if site_hrn == record_hrn: + if site_hrn == record_hrn and site['site_id'] == record['pointer']: found = True break @@ -172,14 +235,17 @@ def main(): for person in persons: tmp_username = person['email'].split("@")[0] alt_username = person['email'].split("@")[0].replace(".", "_") - if username in [tmp_username, alt_username] and site['site_id'] in person['site_ids']: + if username in [tmp_username, alt_username] and \ + site['site_id'] in person['site_ids'] and \ + person['person_id'] == record['pointer']: found = True break elif type == 'slice': slicename = hrn_to_pl_slicename(record_hrn) for slice in slices: - if slicename == slice['name']: + if slicename == slice['name'] and \ + slice['slice_id'] == record['pointer']: found = True break @@ -190,18 +256,21 @@ def main(): site = sites_dict[login_base] for node in nodes: tmp_nodename = node['hostname'].split(".")[0] - if tmp_nodename == nodename and node['site_id'] == site['site_id']: + if tmp_nodename == nodename and \ + node['site_id'] == site['site_id'] and \ + node['node_id'] == record['pointer']: found = True break else: continue if not found: - trace("Import: Removing %s %s" % (type, record_hrn)) record_object = existing_records[(record_hrn, type)] sfaImporter.delete_record(record_hrn, type) - + # save pub keys + trace('Import: saving current pub keys', logger) + save_keys(keys_filename, person_keys) if __name__ == "__main__": main()