From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 13 Mar 2012 00:36:12 +0000 (-0400)
Subject: only import ssh keys
X-Git-Tag: sfa-2.1-24~21^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8d4066ef87acbece44e9dcdbd57a8ea0ba225d4f

only import ssh keys
---

diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py
index 153104b7..83673180 100644
--- a/sfa/importer/plimporter.py
+++ b/sfa/importer/plimporter.py
@@ -155,7 +155,8 @@ class PlImporter:
         key_ids = []
         for person in persons:
             key_ids.extend(person['key_ids'])
-        keys = shell.GetKeys( {'peer_id': None, 'key_id': key_ids} )
+        keys = shell.GetKeys( {'peer_id': None, 'key_id': key_ids,
+                               'key_type': 'ssh'} )
         # create a hash of keys by key_id
         keys_by_id = dict ( [ ( key['key_id'], key ) for key in keys ] ) 
         # create a dict person_id -> [ (plc)keys ]
@@ -163,7 +164,9 @@ class PlImporter:
         for person in persons:
             pubkeys = []
             for key_id in person['key_ids']:
-                pubkeys.append(keys_by_id[key_id])
+                key = keys_by_id[key_id]
+                if key['key_type'] == 'ssh': 
+                    pubkeys.append(key)
             keys_by_person_id[person['person_id']] = pubkeys
         # Get all plc nodes  
         nodes = shell.GetNodes( {'peer_id': None}, ['node_id', 'hostname', 'site_id'])