From d041d6a410611efb27e66a12a9728996492f15d8 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Mon, 11 Mar 2013 15:51:28 +0100 Subject: [PATCH] Changes to handle slices coming from federated testbed and senslab user creation. --- sfa/senslab/slabdriver.py | 8 +++++--- sfa/senslab/slabslices.py | 40 ++++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index 450827b8..7c233843 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -420,14 +420,14 @@ class SlabTestbedAPI(): return @staticmethod - def __add_person_to_db(self, user_dict): + def __add_person_to_db(user_dict): 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 \ _________________________________________________________________________\ - " %(user_dict['hrn'])) + " %(user_dict)) hrn = user_dict['hrn'] user_record = RegUser(hrn=hrn , pointer= '-1', authority=get_authority(hrn), \ email=user_dict['email'], gid = None) @@ -449,7 +449,9 @@ class SlabTestbedAPI(): """ ret = self.ldap.LdapAddUser(record) - logger.debug("SLABDRIVER AddPerson return code %s \r\n "%(ret)) + + record['hrn'] = self.root_auth + '.' + ret['uid'] + logger.debug("SLABDRIVER AddPerson return code %s record %s \r\n "%(ret,record)) self.__add_person_to_db(record) return ret['uid'] diff --git a/sfa/senslab/slabslices.py b/sfa/senslab/slabslices.py index 93a0e271..5f5e52f4 100644 --- a/sfa/senslab/slabslices.py +++ b/sfa/senslab/slabslices.py @@ -352,14 +352,8 @@ class SlabSlices: slice_record %s peer %s sfa_peer %s ldap_user %s"\ %(slice_record, peer,sfa_peer ,ldap_user )) #User already registered in ldap, meaning user should be in SFA db - #and hrn = sfa_auth+ uid - if ldap_user : - hrn = self.driver.slab_api.root_auth +'.'+ ldap_user['uid'] - - user = self.driver.get_user_record(hrn) - - logger.debug(" SLABSLICES \tverify_slice hrn %s USER %s" %(hrn, user)) - sfa_slice = {'slice_hrn': slicename, + #and hrn = sfa_auth+ uid + sfa_slice = {'hrn': slicename, #'url': slice_record.get('url', slice_hrn), #'description': slice_record.get('description', slice_hrn) 'node_list' : [], @@ -369,15 +363,35 @@ class SlabSlices: 'slice_id' : slice_record['record_id'], 'reg-researchers':slice_record['reg-researchers'], #'record_id_slice': slice_record['record_id'], - 'peer_authority':str(peer.hrn) + 'peer_authority':str(sfa_peer) + + } + if ldap_user : + hrn = self.driver.slab_api.root_auth +'.'+ ldap_user['uid'] + + user = self.driver.get_user_record(hrn) + + logger.debug(" SLABSLICES \tverify_slice hrn %s USER %s" %(hrn, user)) + #sfa_slice = {'slice_hrn': slicename, + ##'url': slice_record.get('url', slice_hrn), + ##'description': slice_record.get('description', slice_hrn) + #'node_list' : [], + #'authority' : slice_record['authority'], + #'gid':slice_record['gid'], + ##'record_id_user' : user.record_id, + #'slice_id' : slice_record['record_id'], + #'reg-researchers':slice_record['reg-researchers'], + ##'record_id_slice': slice_record['record_id'], + #'peer_authority':str(peer.hrn) - } + #} + # add the slice + if sfa_slice : + self.driver.slab_api.AddSlice(sfa_slice, user) if peer: sfa_slice['slice_id'] = slice_record['record_id'] - # add the slice - if sfa_slice: - self.driver.slab_api.AddSlice(sfa_slice, user) + #slice['slice_id'] = self.driver.slab_api.AddSlice(slice) logger.debug("SLABSLICES \tverify_slice ADDSLICE OK") #slice['node_ids']=[] -- 2.47.0