X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fclient%2Fclient_helper.py;h=6e9170603a2524cff50fbcae9e3ca9d5079c5b4c;hp=e1edfb8207d7e85d7ee44bbf5734e855c730c74d;hb=796d35d54ab31e209ddf76b4584b6508b309c6c1;hpb=97d09a321eff49c73c09f44a10d1ae0d7767d250

diff --git a/sfa/client/client_helper.py b/sfa/client/client_helper.py
index e1edfb82..6e917060 100644
--- a/sfa/client/client_helper.py
+++ b/sfa/client/client_helper.py
@@ -1,36 +1,50 @@
-import sys
+###
+#
+# Thierry - 2012 sept 21
+#
+# it seems terribly wrong that the client should decide to use PG- or PL- related code
+# esp. in a context where we're trying to have more and more kinds of testbeds involved
+#
+# also, the 'users' field that CreateSliver is expecting (the key point here is to get this right)
+# is specified to have at least a urn and a list of keys, both of these being supported natively
+# in the sfa db
+# So long story short, it seems to me that we should have a common code that fills in 'urn' and 'keys'
+# and then code that tentatively tries to add as much extra info that we can get on these users
+#
+# the fact e.g. that PlanetLab insists on getting a first_name and last_name is not
+# exactly consistent with the GENI spec. of CreateSliver
+#
 def pg_users_arg(records):
     users = []  
     for record in records:
         if record['type'] != 'user': 
             continue
-        user = {'urn': record['geni_urn'],
-                'keys': record['keys']}
+        user = {'urn': record['reg-urn'],
+                'keys': record['reg-keys'],
+                'email': record['email']}
         users.append(user)
     return users    
 
-def sfa_users_arg(records, slice_record):
+def sfa_users_arg (records, slice_record):
     users = []
-    print>>sys.stderr, " \r\n \r\n \t CLIENT_HELPER.PY sfa_users_arg slice_record %s \r\n records %s"%(slice_record,records)
     for record in records:
         if record['type'] != 'user': 
             continue
-        user = {'urn': record['geni_urn'], 
-                'keys': record['keys'],
-                'email': record['email'], # needed for MyPLC
-                'person_id': record['record_id'], 
-                'hrn': record['hrn'],
-                'type': record['type'],
-                'authority' : record['authority'],
-                'gid' : record['gid'],
-                '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
-                }         
-        users.append(user)   
-        print>>sys.stderr, " \r\n \r\n \t CLIENT_HELPER.PY sfa_users_arg user %s",user
-    return users        
+        user = {'urn': record['reg-urn'],
+                'keys': record['reg-keys'],
+                'slice_record': slice_record,
+                }
+        # fill as much stuff as possible from planetlab or similar
+        # note that reg-email is not yet available
+        pl_fields = ['email', 'person_id', 'first_name', 'last_name', 'key_ids']
+        nitos_fields = [ 'email', 'user_id' ]
+        extra_fields = list ( set(pl_fields).union(set(nitos_fields)))
+        # try to fill all these in
+        for field in extra_fields:
+            if field in record: user[field]=record[field]
+        users.append(user)
+
+    return users
 
 def sfa_to_pg_users_arg(users):