From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Mon, 17 Sep 2012 12:04:52 +0000 (+0200)
Subject: handle Nitos users also
X-Git-Tag: sfa-2.1-15~30
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=747dd542314525690db2a746d3168e4cee8ccc48;p=sfa.git

handle Nitos users also
---

diff --git a/sfa/client/client_helper.py b/sfa/client/client_helper.py
index 32e21a1c..291a8731 100644
--- a/sfa/client/client_helper.py
+++ b/sfa/client/client_helper.py
@@ -14,7 +14,8 @@ def sfa_users_arg(records, slice_record):
     for record in records:
         if record['type'] != 'user': 
             continue
-        user = {'urn': record['geni_urn'], #
+        try:
+            user = {'urn': record['geni_urn'], #
                 'keys': record['keys'],
                 'email': record['email'], # needed for MyPLC
                 'person_id': record['person_id'], # needed for MyPLC
@@ -22,8 +23,18 @@ def sfa_users_arg(records, slice_record):
                 'last_name': record['last_name'], # needed for MyPLC
                 'slice_record': slice_record, # needed for legacy refresh peer
                 'key_ids': record['key_ids'] # needed for legacy refresh peer
-                }         
+                }
+        except:
+            # handle NITOS user args
+            user = {'urn': record['geni_urn'], 
+                'keys': record['keys'],
+                'email': record['email'], 
+                'user_id': record['user_id'], 
+                'slice_record': slice_record,
+                }
+        
         users.append(user)
+
     return users        
 
 def sfa_to_pg_users_arg(users):