From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 15 Nov 2011 15:32:16 +0000 (+0100)
Subject: Fixed problem inserting ldap user into sfa table.
X-Git-Tag: sfa-2.1-24~3^2~291
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3f8b0c3e790bb98886b38e77a0f41dff08203cf4;p=sfa.git

Fixed problem inserting ldap user into sfa table.
---

diff --git a/sfa/senslab/LDAPapi.py b/sfa/senslab/LDAPapi.py
index fbc14ec9..fed0ac36 100644
--- a/sfa/senslab/LDAPapi.py
+++ b/sfa/senslab/LDAPapi.py
@@ -82,7 +82,7 @@ class LDAPapi :
 				'serial': 'none',
 				'authority': self.authname,
 				'peer_authority': '',
-				'pointer' : '',
+				'pointer' : -1,
 				'hrn': hrn,
 				'date_created' : 'none',
 				'last_updated': 'none'
diff --git a/sfa/senslab/slab-import.py b/sfa/senslab/slab-import.py
index c10a91fd..94052cad 100644
--- a/sfa/senslab/slab-import.py
+++ b/sfa/senslab/slab-import.py
@@ -141,8 +141,7 @@ def main():
     #print "\r\n NODES8DICT ",nodes_dict
     
     ldap_person_list = Driver.GetPersons()
-    print "\r\n PERSONS_LIST ",ldap_person_list
-
+    
    
     
     #slices_list = SenslabUsers.GetSlices()
@@ -196,7 +195,9 @@ def main():
 					
     # remove stale records    
     system_records = [interface_hrn, root_auth, interface_hrn + '.slicemanager']
+
     for (record_hrn, type) in existing_records.keys():
+        #print " \r\n EXISTING RECORDS " , (record_hrn, type)
         if record_hrn in system_records:
             continue
         
@@ -218,10 +219,10 @@ def main():
             break
                 
         elif type == 'user':
-            for person in persons:
+            for person in ldap_person_list:
                 if person['hrn'] == record_hrn:
                     found = True
-                break
+                    break
             
         elif type == 'node':
             login_base = get_leaf(get_authority(record_hrn))
@@ -237,8 +238,8 @@ def main():
         
         if not found:
             record_object = existing_records[(record_hrn, type)]
-            print "\t\t NOT FOUND ! "
+            print "\t\t  NOT FOUND ! ", record_hrn
             delete_record(record_hrn, type) 
     
 if __name__ == "__main__":
-    main()    
\ No newline at end of file
+    main()