X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fmanagers%2Fregistry_manager_slab.py;fp=sfa%2Fmanagers%2Fregistry_manager_slab.py;h=903f49c429bb8554e9a876951021f3f1edccaaee;hp=b780210369120a810a5742ced413523f877ea0e4;hb=14ca7e52f6af8accc0ba6e362e2a674ea4579e7f;hpb=36135942ed4dd09cbae187005eb94d70c60f3164 diff --git a/sfa/managers/registry_manager_slab.py b/sfa/managers/registry_manager_slab.py index b7802103..903f49c4 100644 --- a/sfa/managers/registry_manager_slab.py +++ b/sfa/managers/registry_manager_slab.py @@ -15,8 +15,10 @@ from sfa.trust.credential import Credential from sfa.trust.certificate import Certificate, Keypair, convert_public_key from sfa.trust.gid import create_uuid +#myapi=SfaAPI() # The GENI GetVersion call def GetVersion(api): + # Bugfix TP 09/11/2011 #peers =dict ([ (peername,v._ServerProxy__host) for (peername,v) in api.registries.iteritems() peers =dict ([ (peername,v.get_url()) for (peername,v) in api.registries.iteritems() @@ -162,6 +164,7 @@ def resolve(api, xrns, type=None, full=True): if full: print >>sys.stderr, '\r\n \r\n REGISTRY:_FULL', api + api.driver.fill_record_info(local_records) # convert local record objects to dicts @@ -213,6 +216,7 @@ def list(api, xrn, origin_hrn=None): def register(api, record): + #hrn, type = record['hrn'], record['type'] hrn = str(record['hrn']).strip("['']") type = str( record['type']).strip("['']") @@ -239,6 +243,9 @@ def register(api, record): #api.auth.verify_object_permission(hrn) api.auth.verify_object_permission( record['hrn']) auth_info = api.auth.get_auth_info(record['authority']) + + + pub_key = None # make sure record has a gid if 'gid' not in record: @@ -314,6 +321,7 @@ def register(api, record): # time by sfa and doesont already exist in plc if not persons or not persons[0]['site_ids']: login_base = get_leaf(record['authority']) + api.driver.AddPersonToSite(pointer, login_base) # What roles should this user have?