X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2FsfaImport.py;h=f429ceeb1f1fabf99181f006b2e4d0906570d447;hb=4b2e86d099a60df5fb6b9732c080a3d10512c029;hp=f362984f0ce13d98f2b015c49237a0440d59d9c2;hpb=1971124b0a49cfbd7bce902722a1512baf8562f3;p=sfa.git diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py index f362984f..f429ceeb 100644 --- a/sfa/plc/sfaImport.py +++ b/sfa/plc/sfaImport.py @@ -48,26 +48,12 @@ def cleanup_string(str): str = str.replace('"', "_") return str -def person_to_hrn(parent_hrn, person): - # the old way - Lastname_Firstname - #personname = person['last_name'] + "_" + person['first_name'] - - # the new way - use email address up to the "@" - personname = person['email'].split("@")[0] - - personname = cleanup_string(personname) - - hrn = parent_hrn + "." + personname - return hrn - - class sfaImport: def __init__(self): self.AuthHierarchy = Hierarchy() - self.TrustedRoots = TrustedRootList() - self.config = Config() + self.TrustedRoots = TrustedRootList(Config.get_trustedroots_dir(self.config)) self.plc_auth = self.config.get_plc_auth() self.root_auth = self.config.SFA_REGISTRY_ROOT_AUTH self.level1_auth = self.config.SFA_REGISTRY_LEVEL1_AUTH @@ -108,49 +94,49 @@ class sfaImport: if not auth_record: auth_record = GeniRecord(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) table.insert(auth_record) def import_person(self, parent_hrn, person): AuthHierarchy = self.AuthHierarchy - hrn = person_to_hrn(parent_hrn, person) + hrn = email_to_hrn(parent_hrn, person['email']) # ASN.1 will have problems with hrn's longer than 64 characters if len(hrn) > 64: hrn = hrn[:64] trace("Import: importing person " + hrn) - - table = GeniTable() - key_ids = [] if 'key_ids' in person and person['key_ids']: key_ids = person["key_ids"] - # get the user's private key from the SSH keys they have uploaded # to planetlab keys = self.shell.GetKeys(self.plc_auth, key_ids) key = keys[0]['key'] pkey = convert_public_key(key) + if not pkey: + pkey = Keypair(create=True) else: # the user has no keys trace(" person " + hrn + " does not have a PL public key") - # 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) - person_record = table.find({'type': 'user', 'hrn': hrn}) - if not person_record: - trace(" inserting user record for " + hrn) - person_record = GeniRecord(hrn=hrn, gid=person_gid, type="user", pointer=person['person_id']) + table = GeniTable() + person_record = GeniRecord(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(" updating user record for " + hrn) - person_record = GeniRecord(hrn=hrn, gid=person_gid, type="user", pointer=person['person_id']) + trace("Import: %s exists, updating " % hrn) + existing_record = existing_records[0] + person_record['record_id'] = existing_record['record_id'] table.update(person_record) def import_slice(self, parent_hrn, slice): @@ -165,43 +151,49 @@ class sfaImport: hrn = parent_hrn + "." + slicename trace("Import: importing slice " + hrn) + 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['authority'] = get_authority(slice_record['hrn']) table = GeniTable() - - slice_record = table.find({'type': 'sslice', 'hrn': hrn}) - if not slice_record: - 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']) - trace(" inserting slice record for " + hrn) + 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) + existing_record = existing_records[0] + slice_record['record_id'] = existing_record['record_id'] + table.update(slice_record) def import_node(self, parent_hrn, node): AuthHierarchy = self.AuthHierarchy - nodename = node['hostname'].replace(".", "_") + nodename = node['hostname'].split(".")[0] nodename = cleanup_string(nodename) - + if not nodename: error("Import_node: failed to parse node name " + node['hostname']) return hrn = parent_hrn + "." + nodename - + trace("Import: importing node " + hrn) # ASN.1 will have problems with hrn's longer than 64 characters if len(hrn) > 64: hrn = hrn[:64] - trace("Import: importing node " + hrn) - table = GeniTable() - node_record = table.find({'type': 'node', 'hrn': hrn}) - if not node_record: - 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']) - trace(" inserting node record for " + 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['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) + existing_record = existing_records[0] + node_record['record_id'] = existing_record['record_id'] + table.update(node_record) def import_site(self, parent_hrn, site): @@ -233,64 +225,21 @@ class sfaImport: auth_info = AuthHierarchy.get_auth_info(hrn) table = GeniTable() - - 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=site['site_id']) - trace(" inserting authority record for " + hrn) + auth_record = GeniRecord(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) - - if 'person_ids' in site: - for person_id in site['person_ids']: - persons = shell.GetPersons(plc_auth, [person_id]) - if persons: - try: - self.import_person(hrn, persons[0]) - except Exception, e: - trace("Failed to import: %s (%s)" % (persons[0], e)) - if 'slice_ids' in site: - for slice_id in site['slice_ids']: - slices = shell.GetSlices(plc_auth, [slice_id]) - if slices: - try: - self.import_slice(hrn, slices[0]) - except Exception, e: - trace("Failed to import: %s (%s)" % (slices[0], e)) - if 'node_ids' in site: - for node_id in site['node_ids']: - nodes = shell.GetNodes(plc_auth, [node_id]) - if nodes: - try: - self.import_node(hrn, nodes[0]) - except Exception, e: - trace("Failed to import: %s (%s)" % (nodes[0], e)) - - def delete_record(self, parent_hrn, object, type): - # get the hrn - table = GeniTable() - hrn = None - if type in ['slice'] and 'name' in object and object['name']: - slice_name = object['name'].split("_")[0] - hrn = parent_hrn + "." + slice_name - elif type in ['user'] and 'email' in object and object['email']: - person_name = object['email'].split('@')[0] - hrn = parent_hrn + "." + person_name - elif type in ['node'] and 'hostname' in object and object['hostname']: - node_name = object['hostname'].replace('.','_') - hrn = parent_hrn + "." + node_name - elif type in ['site'] and 'login_base' in object and object['login_base']: - site_name = object['login_base'] - hrn = parent_hrn - parent_hrn = get_authority(hrn) - type = "authority" - # delete all records whos authority is this site - records = table.find({'authority': hrn}) - for record in records: - table.remove(record) else: - return - + trace("Import: %s exists, updating " % hrn) + existing_record = existing_record[0] + auth_record['record_id'] = existing_record['record_id'] + table.update(auth_record) + + + def delete_record(self, hrn, type): # delete the record + table = GeniTable() record_list = table.find({'type': type, 'hrn': hrn}) for record in record_list: table.remove(record)