X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fregistry_manager_pl.py;h=619e48153f7fee6d89b3174272a87c0f4896af0b;hb=9167ba6e1a70f1ff29619247f2d6f1509ae1652d;hp=43c2865ca5cb7d62f05bea33297fcd2ffbac8693;hpb=784ffdffd4ea4dda795fcc8d6ae480b459ea20fd;p=sfa.git diff --git a/sfa/managers/registry_manager_pl.py b/sfa/managers/registry_manager_pl.py index 43c2865c..619e4815 100644 --- a/sfa/managers/registry_manager_pl.py +++ b/sfa/managers/registry_manager_pl.py @@ -103,8 +103,6 @@ def resolve(api, xrns, type=None, origin_hrn=None): # convert set to list remaining_hrns = [hrn for hrn in remaining_hrns] table = SfaTable() - - print remaining_hrns local_records = table.findObjects({'hrn': remaining_hrns}) for record in local_records: try: @@ -124,7 +122,7 @@ def resolve(api, xrns, type=None, origin_hrn=None): return records -def list(api, xrn): +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 @@ -219,13 +217,13 @@ def register(api, 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']])