X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fclient_helper.py;h=e1edfb8207d7e85d7ee44bbf5734e855c730c74d;hb=b6dcfc034473c011988fba0d02bbeb6406925465;hp=8f9876ca1cebc0f0ac16ed5b2cc363a99ee11260;hpb=60e5f6d90d2334224f0a6ef39bd1d522ccb259f4;p=sfa.git diff --git a/sfa/client/client_helper.py b/sfa/client/client_helper.py index 8f9876ca..e1edfb82 100644 --- a/sfa/client/client_helper.py +++ b/sfa/client/client_helper.py @@ -1,4 +1,4 @@ - +import sys def pg_users_arg(records): users = [] for record in records: @@ -11,19 +11,25 @@ def pg_users_arg(records): 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'], # + 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 + '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) + users.append(user) + print>>sys.stderr, " \r\n \r\n \t CLIENT_HELPER.PY sfa_users_arg user %s",user return users def sfa_to_pg_users_arg(users):