From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 16 Nov 2011 14:44:58 +0000 (+0100)
Subject: Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
X-Git-Tag: sfa-2.1-24~3^2~280
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4fb70becb406d616257ffadf8bf9093490f71bfc;p=sfa.git

Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
---

4fb70becb406d616257ffadf8bf9093490f71bfc
diff --cc sfa/senslab/slab-import.py
index ff1cba6c,1cfbda10..b14bebbb
--- a/sfa/senslab/slab-import.py
+++ b/sfa/senslab/slab-import.py
@@@ -82,10 -78,12 +82,14 @@@ def import_node(hrn, node)
  # person is already a sfa record 
  def import_person(person):       
      existing_records = table.find({'hrn': person['hrn'], 'type': 'user'})
 +    extime = datetime.datetime.utcnow()
 +    person['date_created'] = int(time.mktime(extime.timetuple()))
      if not existing_records:
          print>>sys.stderr, " \r\n \t slab-import : person record %s inserted" %(person['hrn'])
+         uuid=create_uuid() 
+         RSA_KEY_STRING=person['pkey']
+         pkey=convert_public_key(RSA_KEY_STRING)
+ 	person['gid']=self.senslabauth.create_gid("urn:publicid:IDN+"+self.authname+"+user+"+ldapentry[1]['uid'][0], uuid, pkey, CA=False)
          table.insert(person)
      else:
          existing_record = existing_records[0]