X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fsenslab%2Fslabslices.py;h=131b4a5738daa5088f738ca3edc73c0da2cbdcc7;hb=3ccd71c24c7d1ee94cd3c5229e6e84a3fe70309a;hp=715e3b6829639ffe213ff5a9e48cc772e7233cf0;hpb=ade641476e60bdeccf61f4b2dd110833db466051;p=sfa.git diff --git a/sfa/senslab/slabslices.py b/sfa/senslab/slabslices.py index 715e3b68..131b4a57 100644 --- a/sfa/senslab/slabslices.py +++ b/sfa/senslab/slabslices.py @@ -346,8 +346,13 @@ class SlabSlices: #Check if user is in LDAP using its hrn. #Assuming Senslab is centralised : one LDAP for all sites, user_id unknown from LDAP # LDAP does not provide users id, therfore we rely on hrns - if users_by_hrn: - existing_users = self.driver.GetPersons({'hrn': users_by_hrn.keys()}) + if users_by_hrn: + #Construct the list of filters for GetPersons + filter_user = [] + for hrn in users_by_hrn: + filter_user.append ( {'hrn':hrn}) + existing_users = self.driver.GetPersons(filter_user) + #existing_users = self.driver.GetPersons({'hrn': users_by_hrn.keys()}) #existing_users = self.driver.GetPersons({'hrn': users_by_hrn.keys()}, #['hrn','pkey']) if existing_users: @@ -381,10 +386,10 @@ class SlabSlices: requested_user_hrns = users_by_hrn.keys() print>>sys.stderr, " \r\n \r\n \t slabslices.py verify_person requested_user_ids %s user_by_hrn %s " %( requested_user_ids,users_by_hrn) # existing slice users - existing_slice_users_filter = {'hrn': slice_record.get('PI', [])} + existing_slice_users_filter = {'hrn': slice_record['PI'][0]} print>>sys.stderr, " \r\n \r\n slices.py verify_person requested_user_ids %s existing_slice_users_filter %s slice_record %s" %(requested_user_ids,existing_slice_users_filter,slice_record) - existing_slice_users = self.driver.GetPersons(existing_slice_users_filter) + existing_slice_users = self.driver.GetPersons([existing_slice_users_filter]) #existing_slice_users = self.driver.GetPersons(existing_slice_users_filter,['hrn','pkey']) print>>sys.stderr, " \r\n \r\n slices.py verify_person existing_slice_users %s " %(existing_slice_users)