X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fregistry_manager.py;h=6d7bb6ddece6bb93e1b9c6c2f2a9a8347aaaac06;hb=4f9d407d0ce159bdb359e9ab500bf88b5f586e62;hp=48728015ec486e2a9bfc0365a8335d09d31a0a9c;hpb=93687e978298661b0cd2cb2e4ba8cd6e7f5cd1d8;p=sfa.git diff --git a/sfa/managers/registry_manager.py b/sfa/managers/registry_manager.py index 48728015..6d7bb6dd 100644 --- a/sfa/managers/registry_manager.py +++ b/sfa/managers/registry_manager.py @@ -33,35 +33,36 @@ from sqlalchemy.orm.collections import InstrumentedList # * write operations (register, update) need e.g. # 'researcher' or 'pi' to be set - reg-* are just ignored # -# the 'normalize' helper functions below aim at ironing this out +# the '_normalize_input' helper functions below aim at ironing this out # however in order to break as few code as possible we essentially make sure that *both* fields are set # upon entering the write methods (so again register and update) for legacy, as some driver code # might depend on the presence of, say, 'researcher' -# registry calls this 'reg-researchers' -# some drivers call this 'researcher' -# this is even more confusing as people might use 'researchers' -def normalize_input_researcher (record): - # this aims at detecting a mispelled input - if 'researchers' in record and 'researcher' not in record: - record['researcher']=record['researchers'] - del record['researchers'] +# normalize an input record to a write method - register or update +# e.g. registry calls this 'reg-researchers' +# while some drivers call this 'researcher' +# we need to make sure that both keys appear and are the same +def _normalize_input (record, reg_key, driver_key): # this looks right, use this for both keys - if 'reg-researchers' in record: - # and issue a warning if they were both set as we're overwriting some user data here - if 'researcher' in record: - logger.warning ("normalize_input_researcher: incoming record has both values, using reg-researchers") - record['researcher']=record['reg-researchers'] + if reg_key in record: + # and issue a warning if they were both set and different + # as we're overwriting some user data here + if driver_key in record: + logger.warning ("normalize_input: incoming record has both values, using %s"%reg_key) + record[driver_key]=record[reg_key] # we only have one key set, duplicate for the other one - elif 'researcher' in record: - logger.warning ("normalize_input_researcher: you should use 'reg-researchers' instead ot 'researcher'") - record['reg-researchers']=record['researcher'] - # if at this point we still have 'researchers' it's going to be ignored and that might be confusing - if 'researchers' in record: - logger.warning ("normalize_input_researcher: incoming record has confusing 'researchers' key - ignored - use 'reg-researchers' instead") + elif driver_key in record: + logger.warning ("normalize_input: you should use '%s' instead of '%s'"%(reg_key,driver_key)) + record[reg_key]=record[driver_key] def normalize_input_record (record): - normalize_input_researcher (record) + _normalize_input (record, 'reg-researchers','researcher') + _normalize_input (record, 'reg-pis','pi') + _normalize_input (record, 'reg-keys','keys') + # xxx the keys thing could use a little bit more attention: + # some parts of the code are using 'keys' while they should use 'reg-keys' + # but I run out of time for now + if 'reg-keys' in record: record['keys']=record['reg-keys'] return record class RegistryManager: @@ -75,8 +76,7 @@ class RegistryManager: if hrn != api.hrn]) xrn=Xrn(api.hrn,type='authority') return version_core({'interface':'registry', - 'sfa': 2, - 'geni_api': 2, + 'sfa': 3, 'hrn':xrn.get_hrn(), 'urn':xrn.get_urn(), 'peers':peers}) @@ -241,7 +241,8 @@ class RegistryManager: return records - def List (self, api, xrn, origin_hrn=None, options={}): + def List (self, api, xrn, origin_hrn=None, options=None): + if options is None: options={} dbsession=api.dbsession() # load all know registry names into a prefix tree and attempt to find # the longest matching prefix @@ -361,11 +362,10 @@ class RegistryManager: if not record.gid: uuid = create_uuid() pkey = Keypair(create=True) - if getattr(record,'keys',None): - pub_key=record.keys + pub_key=getattr(record,'reg-keys',None) + if pub_key is not None: # use only first key in record - if isinstance(record.keys, types.ListType): - pub_key = record.keys[0] + if pub_key and isinstance(pub_key, types.ListType): pub_key = pub_key[0] pkey = convert_public_key(pub_key) gid_object = api.auth.hierarchy.create_gid(urn, uuid, pkey) @@ -383,7 +383,7 @@ class RegistryManager: record.gid=gid.save_to_string(save_parents=True) # locate objects for relationships - pi_hrns = getattr(record,'pi',None) + pi_hrns = getattr(record,'reg-pis',None) if pi_hrns is not None: record.update_pis (pi_hrns, dbsession) elif isinstance (record, RegSlice): @@ -392,9 +392,12 @@ class RegistryManager: elif isinstance (record, RegUser): # create RegKey objects for incoming keys - if hasattr(record,'keys'): - logger.debug ("creating %d keys for user %s"%(len(record.keys),record.hrn)) - record.reg_keys = [ RegKey (key) for key in record.keys ] + if hasattr(record,'reg-keys'): + keys=getattr(record,'reg-keys') + # some people send the key as a string instead of a list of strings + if isinstance(keys,types.StringTypes): keys=[keys] + logger.debug ("creating %d keys for user %s"%(len(keys),record.hrn)) + record.reg_keys = [ RegKey (key) for key in keys ] # update testbed-specific data if needed pointer = api.driver.register (record.__dict__, hrn, pub_key) @@ -456,7 +459,7 @@ class RegistryManager: if researcher_hrns is not None: record.update_researchers (researcher_hrns, dbsession) elif isinstance (record, RegAuthority): - pi_hrns = getattr(new_record,'pi',None) + pi_hrns = getattr(new_record,'reg-pis',None) if pi_hrns is not None: record.update_pis (pi_hrns, dbsession) # update the PLC information that was specified with the record