Deleted slice_senslab table (redundancy with reg-researchers relationship

[sfa.git] / sfa / senslab / slabslices.py

diff --git a/sfa/senslab/slabslices.py b/sfa/senslab/slabslices.py
index 3fe82b4..6d9b582 100644 (file)
--- a/sfa/senslab/slabslices.py
+++ b/sfa/senslab/slabslices.py
@@ -55,9 +55,10 @@ class SlabSlices:
         
     def verify_slice_leases(self, sfa_slice, requested_jobs_dict, peer):
 
-       
+        logger.debug("SLABSLICES verify_slice_leases sfa_slice %s \
+                        "%( sfa_slice))
         #First get the list of current leases from OAR          
-        leases = self.driver.GetLeases({'name':sfa_slice['slice_hrn']})
+        leases = self.driver.GetLeases({'name':sfa_slice['hrn']})
         logger.debug("SLABSLICES verify_slice_leases requested_jobs_dict %s \
                         leases %s "%(requested_jobs_dict, leases ))
         
@@ -157,7 +158,7 @@ class SlabSlices:
 
         #Deleted leases are the ones with lease id not declared in the Rspec
         if deleted_leases:
-            self.driver.DeleteLeases(deleted_leases, sfa_slice['slice_hrn'])
+            self.driver.DeleteLeases(deleted_leases, sfa_slice['hrn'])
             logger.debug("SLABSLICES \
                     verify_slice_leases slice %s deleted_leases %s"\
                     %(sfa_slice, deleted_leases))
@@ -474,10 +475,10 @@ class SlabSlices:
                 else:
                     #User not existing in LDAP
                     #TODO SA 21/08/12 raise smthg to add user or add it auto ?
-                    new_record = {}
-                    new_record['pkey'] = users[0]['keys'][0]
-                    new_record['mail'] = users[0]['email']
-                    self.driver.ldap.LdapAddUser(new_record)
+                    #new_record = {}
+                    #new_record['pkey'] = users[0]['keys'][0]
+                    #new_record['mail'] = users[0]['email']
+                  
                     logger.debug(" SLABSLICE.PY \tverify_person users \
                                 not in ldap ...NEW ACCOUNT NEEDED %s \r\n \t \
                                 ldap_reslt %s "  %(users, ldap_reslt))
@@ -526,19 +527,22 @@ class SlabSlices:
                 if k in added_user:
                     person[k] = added_user[k]
 
-            person['keys'] = added_user['keys'][0]
+            person['pkey'] = added_user['keys'][0]
+            person['mail'] = added_user['email']
+            person['email'] = added_user['email']
             person['key_ids'] =  added_user.get('key_ids', [])
                 
-
-
+            #person['person_id'] = self.driver.AddPerson(person)
+            person['uid'] = self.driver.AddPerson(person)
             
-            person['person_id'] = self.driver.AddPerson(person)
-            if peer:
-                person['peer_person_id'] = added_user['person_id']
+            #Update slice_Record with the id now known to LDAP
+            slice_record['reg-researchers'] = [self.driver.root_auth + '.' + person['uid']]
+            #if peer:
+                #person['peer_person_id'] = added_user['person_id']
             added_persons.append(person)
            
             # enable the account 
-            self.driver.UpdatePerson(person['person_id'], {'enabled': True})
+            self.driver.UpdatePerson(slice_record['reg-researchers'][0], added_user_hrn)
             
             # add person to site
             #self.driver.AddPersonToSite(added_user_id, login_base)