From 67c450a7064c094d5db3ae0a49d3de905e863155 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Thu, 10 Jan 2013 16:12:53 +0100 Subject: [PATCH] Further bug fixes for federated user adding. --- sfa/senslab/slabdriver.py | 8 ++++---- sfa/senslab/slabslices.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index bb36c67d..50c8e1ab 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -1278,7 +1278,7 @@ class SlabDriver(Driver): lease_duration)) #tmp = slice_record['reg-researchers'][0].split(".") - username = slice_record['user']['uid'] + username = slice_record['login'] #username = tmp[(len(tmp)-1)] job_id = self.LaunchExperimentOnOAR(hostname_list, slice_record['hrn'], \ lease_start_time, lease_duration, username) @@ -1407,7 +1407,7 @@ class SlabDriver(Driver): logger.debug("SLABDRIVER \tGetLeases resa_ %s \r\n leasefilter %s"\ %(resa,lease_filter_dict)) - if lease_filter_dict['name'] == resa['slice_hrn']: + if lease_filter_dict['name'] == resa['hrn']: reservation_list.append(resa) if lease_filter_dict is None: @@ -1773,14 +1773,14 @@ class SlabDriver(Driver): return def __add_person_to_db(self, user_dict): - hrn = Xrn(user_dict['urn']).get_hrn() + check_if_exists = dbsession.query(RegUser).filter_by(email = user_dict['email']).first() #user doesn't exists if not check_if_exists: logger.debug("__add_person_to_db \t Adding %s \r\n \r\n \ _________________________________________________________________________\ " %(hrn)) - user_record = RegUser(hrn = hrn, pointer= '-1', authority=get_authority(hrn), \ + user_record = RegUser(hrn =user_dict['hrn'] , pointer= '-1', authority=get_authority(hrn), \ email= user_dict['email'], gid = None) user_record.reg_keys = [RegKey(user_dict['pkey'])] user_record.just_created() diff --git a/sfa/senslab/slabslices.py b/sfa/senslab/slabslices.py index 316eed7e..4e173092 100644 --- a/sfa/senslab/slabslices.py +++ b/sfa/senslab/slabslices.py @@ -555,7 +555,7 @@ class SlabSlices: person['mail'] = added_user['email'] person['email'] = added_user['email'] person['key_ids'] = added_user.get('key_ids', []) - person['urn'] = added_user['urn'] + #person['urn'] = added_user['urn'] #person['person_id'] = self.driver.AddPerson(person) person['uid'] = self.driver.AddPerson(person) @@ -571,7 +571,7 @@ class SlabSlices: added_persons.append(person) # enable the account - self.driver.UpdatePerson(slice_record['reg_researchers'][0], added_user_hrn) + #self.driver.UpdatePerson(slice_record['reg_researchers'][0], added_user_email) # add person to site #self.driver.AddPersonToSite(added_user_id, login_base) -- 2.43.0