From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 16 Nov 2011 13:38:18 +0000 (+0100)
Subject: Cleaned up in import_slice. Added import_person that was previously removed.
X-Git-Tag: sfa-2.1-24~3^2~283^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ddf02c4131624f817000667132166560a36bf4e8;p=sfa.git

Cleaned up in import_slice. Added import_person that was previously removed.
---

diff --git a/sfa/senslab/slab-import.py b/sfa/senslab/slab-import.py
index 62105150..e41e2ca4 100644
--- a/sfa/senslab/slab-import.py
+++ b/sfa/senslab/slab-import.py
@@ -87,12 +87,12 @@ def import_person(person):
         table.update(person)
         
 def import_slice(person):
-    slice = { 'peer_authority': None,'type':'slice','pointer':-1, 'date_created': None, 'last_updated': None }
-    slice['hrn'] = person['hrn']+'_slice'
+
+    hrn = person['hrn']+'_slice'
     pkey = Keypair(create=True)
-    urn = hrn_to_urn(slice['hrn'], 'slice')
-    slice['gid'] = AuthHierarchy.create_gid(urn, create_uuid(), pkey)
-    slice_record= SfaRecord(hrn=slice['hrn'], gid=slice['gid'], type="slice", pointer=slice['pointer'])
+    urn = hrn_to_urn(hrn, 'slice')
+    gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey)
+    slice_record= SfaRecord(hrn=hrn, gid=gid, type="slice", pointer=-1)
     slice_record['authority'] = get_authority(slice_record['hrn'])
     print>>sys.stderr, " \r\n \t slab-import : slice record %s " %(slice_record['hrn']) 
     existing_records = table.find({'hrn': slice_record['hrn'], 'type': 'slice'})
@@ -194,6 +194,7 @@ def main():
     for person in ldap_person_list:
         if person['hrn'] not in existing_hrns or \
             (person['hrn'], 'user') not in existing_records :
+            import_person(person)
             import_slice(person)
 
 # import slices