X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fregistry_manager_pl.py;h=619e48153f7fee6d89b3174272a87c0f4896af0b;hb=9167ba6e1a70f1ff29619247f2d6f1509ae1652d;hp=32dacec76d000e9c9800376980d4e6abbd2071b0;hpb=9a1596f2dda68faf9a5ed8c51424fc9dc87c5c12;p=sfa.git diff --git a/sfa/managers/registry_manager_pl.py b/sfa/managers/registry_manager_pl.py index 32dacec7..619e4815 100644 --- a/sfa/managers/registry_manager_pl.py +++ b/sfa/managers/registry_manager_pl.py @@ -2,24 +2,28 @@ import types import time from sfa.server.registry import Registries from sfa.util.prefixTree import prefixTree -from sfa.util.record import GeniRecord -from sfa.util.genitable import GeniTable -from sfa.util.record import GeniRecord -from sfa.util.genitable import GeniTable +from sfa.util.record import SfaRecord +from sfa.util.table import SfaTable +from sfa.util.record import SfaRecord from sfa.trust.gid import GID from sfa.util.namespace import * from sfa.trust.credential import * from sfa.trust.certificate import * from sfa.util.faults import * -def get_credential(api, hrn, type, is_self=False): +def get_credential(api, xrn, type, is_self=False): + # convert xrn to hrn + if type: + hrn = urn_to_hrn(xrn)[0] + else: + hrn, type = urn_to_hrn(xrn) # Is this a root or sub authority auth_hrn = api.auth.get_authority(hrn) if not auth_hrn or hrn == api.config.SFA_INTERFACE_HRN: auth_hrn = hrn # get record info auth_info = api.auth.get_auth_info(auth_hrn) - table = GeniTable() + table = SfaTable() records = table.findObjects({'type': type, 'hrn': hrn}) if not records: raise RecordNotFound(hrn) @@ -59,28 +63,28 @@ def get_credential(api, hrn, type, is_self=False): return new_cred.save_to_string(save_parents=True) -def resolve(api, hrns, type=None, origin_hrn=None): +def resolve(api, xrns, type=None, origin_hrn=None): # load all know registry names into a prefix tree and attempt to find # the longest matching prefix - if not isinstance(hrns, types.ListType): - hrns = [hrns] - + if not isinstance(xrns, types.ListType): + xrns = [xrns] + hrns = [urn_to_hrn(xrn)[0] for xrn in xrns] # create a dict whre key is an registry hrn and its value is a # hrns at that registry (determined by the known prefix tree). - hrn_dict = {} + xrn_dict = {} registries = Registries(api) tree = prefixTree() registry_hrns = registries.keys() tree.load(registry_hrns) - for hrn in hrns: - registry_hrn = tree.best_match(hrn) - if registry_hrn not in hrn_dict: - hrn_dict[registry_hrn] = [] - hrn_dict[registry_hrn].append(hrn) + for xrn in xrns: + registry_hrn = tree.best_match(urn_to_hrn(xrn)[0]) + if registry_hrn not in xrn_dict: + xrn_dict[registry_hrn] = [] + xrn_dict[registry_hrn].append(xrn) records = [] - for registry_hrn in hrn_dict: + for registry_hrn in xrn_dict: # skip the hrn without a registry hrn # XX should we let the user know the authority is unknown? if not registry_hrn: @@ -88,15 +92,17 @@ def resolve(api, hrns, type=None, origin_hrn=None): # if the best match (longest matching hrn) is not the local registry, # forward the request - hrns = hrn_dict[registry_hrn] + xrns = xrn_dict[registry_hrn] if registry_hrn != api.hrn: credential = api.getCredential() - peer_records = registries[registry_hrn].resolve(credential, hrn, origin_hrn) - records.extend([GeniRecord(dict=record).as_dict() for record in peer_records]) + peer_records = registries[registry_hrn].resolve(credential, xrns, origin_hrn) + records.extend([SfaRecord(dict=record).as_dict() for record in peer_records]) # try resolving the remaining unfound records at the local registry - remaining_hrns = set(hrns).difference([record['hrn'] for record in records]) - table = GeniTable() + remaining_hrns = set(hrns).difference([record['hrn'] for record in records]) + # convert set to list + remaining_hrns = [hrn for hrn in remaining_hrns] + table = SfaTable() local_records = table.findObjects({'hrn': remaining_hrns}) for record in local_records: try: @@ -104,7 +110,7 @@ def resolve(api, hrns, type=None, origin_hrn=None): records.append(dict(record)) except PlanetLabRecordDoesNotExist: # silently drop the ones that are missing in PL - print >> log, "ignoring geni record ", record['hrn'], \ + print >> log, "ignoring SFA record ", record['hrn'], \ " because pl record does not exist" table.remove(record) @@ -112,38 +118,39 @@ def resolve(api, hrns, type=None, origin_hrn=None): raise RecordNotFound(str(hrns)) if type: - records = filter(lambda rec: rec['type'] == type, records) + records = filter(lambda rec: rec['type'] in [type], records) return records -def list(api, hrn): +def list(api, xrn, origin_hrn=None): + hrn, type = urn_to_hrn(xrn) # load all know registry names into a prefix tree and attempt to find # the longest matching prefix records = [] registries = Registries(api) - hrns = registries.keys() + registry_hrns = registries.keys() tree = prefixTree() - tree.load(hrns) + tree.load(registry_hrns) registry_hrn = tree.best_match(hrn) #if there was no match then this record belongs to an unknow registry if not registry_hrn: - raise MissingAuthority(hrn) + raise MissingAuthority(xrn) # if the best match (longest matching hrn) is not the local registry, # forward the request records = [] if registry_hrn != api.hrn: credential = api.getCredential() - record_list = registries[registry_hrn].list(credential, hrn, origin_hrn) - records = [GeniRecord(dict=record).as_dict() for record in record_list] + record_list = registries[registry_hrn].list(credential, xrn, origin_hrn) + records = [SfaRecord(dict=record).as_dict() for record in record_list] # if we still havnt found the record yet, try the local registry if not records: if not api.auth.hierarchy.auth_exists(hrn): raise MissingAuthority(hrn) - table = GeniTable() + table = SfaTable() records = table.find({'authority': hrn}) return records @@ -155,15 +162,15 @@ def register(api, record): # validate the type if type not in ['authority', 'slice', 'node', 'user']: - raise UnknownGeniType(type) + raise UnknownSfaType(type) # check if record already exists - table = GeniTable() + table = SfaTable() existing_records = table.find({'type': type, 'hrn': hrn}) if existing_records: raise ExistingRecord(hrn) - record = GeniRecord(dict = record) + record = SfaRecord(dict = record) record['authority'] = get_authority(record['hrn']) type = record['type'] hrn = record['hrn'] @@ -175,7 +182,7 @@ def register(api, record): uuid = create_uuid() pkey = Keypair(create=True) if 'key' in record and record['key']: - if isinstance(record['key'], list): + if isinstance(record['key'], types.ListType): pub_key = record['key'][0] else: pub_key = record['key'] @@ -194,7 +201,7 @@ def register(api, record): # get the GID from the newly created authority gid = auth_info.get_gid_object() record.set_gid(gid.save_to_string(save_parents=True)) - pl_record = api.geni_fields_to_pl_fields(type, hrn, record) + pl_record = api.sfa_fields_to_pl_fields(type, hrn, record) sites = api.plshell.GetSites(api.plauth, [pl_record['login_base']]) if not sites: pointer = api.plshell.AddSite(api.plauth, pl_record) @@ -206,17 +213,17 @@ def register(api, record): elif (type == "slice"): acceptable_fields=['url', 'instantiation', 'name', 'description'] - pl_record = api.geni_fields_to_pl_fields(type, hrn, record) + pl_record = api.sfa_fields_to_pl_fields(type, hrn, record) for key in pl_record.keys(): if key not in acceptable_fields: pl_record.pop(key) - slices = api.plshell.GetSlices(api.plauth, [pl_record['name']]) - if not slices: - pointer = api.plshell.AddSlice(api.plauth, pl_record) - else: - pointer = slices[0]['slice_id'] - record.set_pointer(pointer) - record['pointer'] = pointer + slices = api.plshell.GetSlices(api.plauth, [pl_record['name']]) + if not slices: + pointer = api.plshell.AddSlice(api.plauth, pl_record) + else: + pointer = slices[0]['slice_id'] + record.set_pointer(pointer) + record['pointer'] = pointer elif (type == "user"): persons = api.plshell.GetPersons(api.plauth, [record['email']]) @@ -240,7 +247,7 @@ def register(api, record): api.plshell.AddPersonKey(api.plauth, pointer, {'key_type' : 'ssh', 'key' : pub_key}) elif (type == "node"): - pl_record = api.geni_fields_to_pl_fields(type, hrn, record) + pl_record = api.sfa_fields_to_pl_fields(type, hrn, record) login_base = hrn_to_pl_login_base(record['authority']) nodes = api.plshell.GetNodes(api.plauth, [pl_record['hostname']]) if not nodes: @@ -259,11 +266,11 @@ def register(api, record): return record.get_gid_object().save_to_string(save_parents=True) def update(api, record_dict): - new_record = GeniRecord(dict = record_dict) + new_record = SfaRecord(dict = record_dict) type = new_record['type'] hrn = new_record['hrn'] api.auth.verify_object_permission(hrn) - table = GeniTable() + table = SfaTable() # make sure the record exists records = table.findObjects({'type': type, 'hrn': hrn}) if not records: @@ -284,7 +291,7 @@ def update(api, record_dict): api.plshell.UpdateSite(api.plauth, pointer, new_record) elif type == "slice": - pl_record=api.geni_fields_to_pl_fields(type, hrn, new_record) + pl_record=api.sfa_fields_to_pl_fields(type, hrn, new_record) if 'name' in pl_record: pl_record.pop('name') api.plshell.UpdateSlice(api.plauth, pointer, pl_record) @@ -309,7 +316,7 @@ def update(api, record_dict): keys = person['key_ids'] keys = api.plshell.GetKeys(api.plauth, person['key_ids']) key_exists = False - if isinstance(new_record['key'], list): + if isinstance(new_record['key'], types.ListType): new_key = new_record['key'][0] else: new_key = new_record['key'] @@ -329,22 +336,28 @@ def update(api, record_dict): gid_object = api.auth.hierarchy.create_gid(hrn, uuid, pkey) gid = gid_object.save_to_string(save_parents=True) record['gid'] = gid - record = GeniRecord(dict=record) + record = SfaRecord(dict=record) table.update(record) elif type == "node": api.plshell.UpdateNode(api.plauth, pointer, new_record) else: - raise UnknownGeniType(type) + raise UnknownSfaType(type) # update membership for researchers, pis, owners, operators api.update_membership(record, new_record) return 1 -def remove(api, hrn, type, origin_hrn=None): - table = GeniTable() +def remove(api, xrn, type, origin_hrn=None): + # convert xrn to hrn + if type: + hrn = urn_to_hrn(xrn)[0] + else: + hrn, type = urn_to_hrn(xrn) + + table = SfaTable() filter = {'hrn': hrn} if type not in ['all', '*']: filter['type'] = type @@ -382,7 +395,7 @@ def remove(api, hrn, type, origin_hrn=None): if api.plshell.GetSites(api.plauth, record['pointer']): api.plshell.DeleteSite(api.plauth, record['pointer']) else: - raise UnknownGeniType(type) + raise UnknownSfaType(type) table.remove(record)