X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2Fsfa_api.py;h=b75611bb54d5b3894e3623e3e31ee8f49434dc06;hb=d861dbcfe1188ec46ff2006f812eaf0055b74ea2;hp=e7711644a4c99f0b0baa22fead61e33515e81655;hpb=416b12a90d6a2ec3a1801d37a28ce1e5ffd8a58d;p=unfold.git diff --git a/rest/sfa_api.py b/rest/sfa_api.py index e7711644..b75611bb 100644 --- a/rest/sfa_api.py +++ b/rest/sfa_api.py @@ -204,7 +204,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None if method == "ListResources": result = server.ListResources([user_cred], api_options) dict_result = xmltodict.parse(result['value']) - result['json'] = json.dumps(dict_result) + result['parsed'] = dict_result if isinstance(dict_result['rspec']['node'], list): columns.extend(dict_result['rspec']['node'][0].keys()) else: @@ -224,7 +224,7 @@ def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None result = server.Describe([urn] ,[object_cred], api_options) dict_result = xmltodict.parse(result['value']['geni_rspec']) - result['json'] = json.dumps(dict_result) + result['parsed'] = dict_result if 'rspec' in dict_result and 'node' in dict_result['rspec']: if isinstance(dict_result['rspec']['node'], list): columns.extend(dict_result['rspec']['node'][0].keys())