add an optional 'options' dict to Resolve (checked that old clients

[sfa.git] / sfa / client / client_helper.py

diff --git a/sfa/client/client_helper.py b/sfa/client/client_helper.py
index 291a873..d25873f 100644 (file)
--- a/sfa/client/client_helper.py
+++ b/sfa/client/client_helper.py
@@ -4,38 +4,39 @@ def pg_users_arg(records):
     for record in records:
         if record['type'] != 'user': 
             continue
-        user = {'urn': record['geni_urn'],
+        user = {'urn': record['urn'],
                 'keys': record['keys']}
         users.append(user)
     return users    
 
-def sfa_users_arg(records, slice_record):
+def sfa_users_arg (records, slice_record):
     users = []
     for record in records:
         if record['type'] != 'user': 
             continue
         try:
-            user = {'urn': record['geni_urn'], #
-                'keys': record['keys'],
-                'email': record['email'], # needed for MyPLC
-                'person_id': record['person_id'], # needed for MyPLC
-                'first_name': record['first_name'], # needed for MyPLC
-                '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
-                }
+            user = {'urn': record['urn'], #
+# all right, so this is sooo totally wrong
+#                    'keys': record['keys'],
+#                    'email': record['email'], # needed for MyPLC
+#                    'person_id': record['person_id'], # needed for MyPLC
+#                    'first_name': record['first_name'], # needed for MyPLC
+#                    '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,
-                }
-        
+            user = {'urn': record['urn'], 
+                    'keys': record['keys'],
+                    'email': record['email'], 
+                    'user_id': record['user_id'], 
+                    'slice_record': slice_record,
+                    }
+            
         users.append(user)
 
-    return users        
+    return users
 
 def sfa_to_pg_users_arg(users):