X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2FsfaImport.py;h=a554cb61a3ac9a9724ce5350b823fb1f6836b768;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=13d75e61619b88976e1e1310738e6436241d113a;hpb=67fde8b2fb4f6197fe2aa57f907a615ee1115986;p=sfa.git diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py index 13d75e61..a554cb61 100644 --- a/sfa/plc/sfaImport.py +++ b/sfa/plc/sfaImport.py @@ -13,11 +13,10 @@ import sys import tempfile 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 * @@ -50,7 +49,8 @@ def cleanup_string(str): class sfaImport: - def __init__(self): + def __init__(self, logger=None): + self.logger = logger self.AuthHierarchy = Hierarchy() self.config = Config() self.TrustedRoots = TrustedRootList(Config.get_trustedroots_dir(self.config)) @@ -75,6 +75,7 @@ class sfaImport: # if auth records for this hrn dont exist, create it if not AuthHierarchy.auth_exists(hrn): + trace("Import: creating top level authorites", self.logger) AuthHierarchy.create_auth(hrn) @@ -89,13 +90,13 @@ class sfaImport: parent_hrn = hrn auth_info = AuthHierarchy.get_auth_info(parent_hrn) - table = GeniTable() + table = SfaTable() auth_record = table.find({'type': 'authority', 'hrn': hrn}) if not auth_record: - auth_record = GeniRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="authority", pointer=-1) + auth_record = SfaRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="authority", pointer=-1) auth_record['authority'] = get_authority(auth_record['hrn']) - trace(" inserting authority record for " + hrn) + trace("Import: inserting authority record for " + hrn, self.logger) table.insert(auth_record) @@ -107,7 +108,7 @@ class sfaImport: if len(hrn) > 64: hrn = hrn[:64] - trace("Import: importing person " + hrn) + trace("Import: importing person " + hrn, self.logger) key_ids = [] if 'key_ids' in person and person['key_ids']: key_ids = person["key_ids"] @@ -120,21 +121,21 @@ class sfaImport: pkey = Keypair(create=True) else: # the user has no keys - trace(" person " + hrn + " does not have a PL public key") + trace(" person " + hrn + " does not have a PL public key", self.logger) # if a key is unavailable, then we still need to put something in the # user's GID. So make one up. pkey = Keypair(create=True) # create the gid person_gid = AuthHierarchy.create_gid(hrn, create_uuid(), pkey) - table = GeniTable() - person_record = GeniRecord(hrn=hrn, gid=person_gid, type="user", pointer=person['person_id']) + table = SfaTable() + person_record = SfaRecord(hrn=hrn, gid=person_gid, type="user", pointer=person['person_id']) person_record['authority'] = get_authority(person_record['hrn']) existing_records = table.find({'hrn': hrn, 'type': 'user', 'pointer': person['person_id']}) if not existing_records: table.insert(person_record) else: - trace("Import: %s exists, updating " % hrn) + trace("Import: %s exists, updating " % hrn, self.logger) existing_record = existing_records[0] person_record['record_id'] = existing_record['record_id'] table.update(person_record) @@ -145,22 +146,22 @@ class sfaImport: slicename = cleanup_string(slicename) if not slicename: - error("Import_Slice: failed to parse slice name " + slice['name']) + error("Import_Slice: failed to parse slice name " + slice['name'], self.logger) return hrn = parent_hrn + "." + slicename - trace("Import: importing slice " + hrn) + trace("Import: importing slice " + hrn, self.logger) pkey = Keypair(create=True) slice_gid = AuthHierarchy.create_gid(hrn, create_uuid(), pkey) - slice_record = GeniRecord(hrn=hrn, gid=slice_gid, type="slice", pointer=slice['slice_id']) + slice_record = SfaRecord(hrn=hrn, gid=slice_gid, type="slice", pointer=slice['slice_id']) slice_record['authority'] = get_authority(slice_record['hrn']) - table = GeniTable() + table = SfaTable() existing_records = table.find({'hrn': hrn, 'type': 'slice', 'pointer': slice['slice_id']}) if not existing_records: table.insert(slice_record) else: - trace("Import: %s exists, updating " % hrn) + trace("Import: %s exists, updating " % hrn, self.logger) existing_record = existing_records[0] slice_record['record_id'] = existing_record['record_id'] table.update(slice_record) @@ -171,26 +172,26 @@ class sfaImport: nodename = cleanup_string(nodename) if not nodename: - error("Import_node: failed to parse node name " + node['hostname']) + error("Import_node: failed to parse node name " + node['hostname'], self.logger) return hrn = parent_hrn + "." + nodename - trace("Import: importing node " + hrn) + trace("Import: importing node " + hrn, self.logger) # ASN.1 will have problems with hrn's longer than 64 characters if len(hrn) > 64: hrn = hrn[:64] - table = GeniTable() + table = SfaTable() node_record = table.find({'type': 'node', 'hrn': hrn}) pkey = Keypair(create=True) node_gid = AuthHierarchy.create_gid(hrn, create_uuid(), pkey) - node_record = GeniRecord(hrn=hrn, gid=node_gid, type="node", pointer=node['node_id']) + node_record = SfaRecord(hrn=hrn, gid=node_gid, type="node", pointer=node['node_id']) node_record['authority'] = get_authority(node_record['hrn']) existing_records = table.find({'hrn': hrn, 'type': 'node', 'pointer': node['node_id']}) if not existing_records: table.insert(node_record) else: - trace("Import: %s exists, updating " % hrn) + trace("Import: %s exists, updating " % hrn, self.logger) existing_record = existing_records[0] node_record['record_id'] = existing_record['record_id'] table.update(node_record) @@ -209,14 +210,14 @@ class sfaImport: # internet2 nodes. This is a special operation for some vini # sites only if ".vini" in parent_hrn and parent_hrn.endswith('vini'): - if sitename.startswith("ii"): + if sitename.startswith("i2"): #sitename = sitename.replace("ii", "") hrn = ".".join([parent_hrn, "internet2", sitename]) elif sitename.startswith("nlr"): #sitename = sitename.replace("nlr", "") hrn = ".".join([parent_hrn, "internet2", sitename]) - trace("Import_Site: importing site " + hrn) + trace("Import: importing site " + hrn, self.logger) # create the authority if not AuthHierarchy.auth_exists(hrn): @@ -224,14 +225,14 @@ class sfaImport: auth_info = AuthHierarchy.get_auth_info(hrn) - table = GeniTable() - auth_record = GeniRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="authority", pointer=site['site_id']) + table = SfaTable() + auth_record = SfaRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="authority", pointer=site['site_id']) auth_record['authority'] = get_authority(auth_record['hrn']) existing_records = table.find({'hrn': hrn, 'type': 'authority', 'pointer': site['site_id']}) if not existing_records: table.insert(auth_record) else: - trace("Import: %s exists, updating " % hrn) + trace("Import: %s exists, updating " % hrn, self.logger) existing_record = existing_records[0] auth_record['record_id'] = existing_record['record_id'] table.update(auth_record) @@ -241,7 +242,8 @@ class sfaImport: def delete_record(self, hrn, type): # delete the record - table = GeniTable() + table = SfaTable() record_list = table.find({'type': type, 'hrn': hrn}) for record in record_list: + trace("Import: Removing record %s %s" % (type, hrn), self.logger) table.remove(record)