From: Loic Baron Date: Wed, 26 Feb 2014 15:04:51 +0000 (+0100) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~287^2~4 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=50b0885272edb338be08c7dab5cbf0c694a5aa2c Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- 50b0885272edb338be08c7dab5cbf0c694a5aa2c diff --cc rest/__init__.py index f7c15570,fdcd878a..d1ac9ea4 --- a/rest/__init__.py +++ b/rest/__init__.py @@@ -10,8 -10,10 +10,10 @@@ from manifold.core.query imp from manifoldapi.manifoldapi import execute_query from string import join + import decimal + import datetime import json - +import datetime # handles serialization of datetime in json DateEncoder = lambda obj: obj.strftime("%B %d, %Y %H:%M:%S") if isinstance(obj, datetime.datetime) else None @@@ -54,13 -59,11 +59,13 @@@ def dispatch(request, object_type, obje # return post(request, object_type, object_name) def platform(request, object_name, object_properties): - query = Query().get('local:platform').filter_by('disabled', '==', '0').select(object_properties) + query = Query().get('local:platform').filter_by('disabled', '==', '0').filter_by('gateway_type', '==', 'sfa').filter_by('platform', '!=', 'myslice').select(object_properties) return send(request, execute_query(request, query), object_properties) +# Add different filters possibilities [['user.user_hrn','==','$user_hrn'],['parent_authority','==','ple.upmc']] def slice(request, object_name, object_properties): - query = Query().get('slice').filter_by('user.user_hrn', '==', '$user_hrn').select(object_properties) + #query = Query().get('slice').filter_by('user.user_hrn', '==', '$user_hrn').select(object_properties) + query = Query().get('slice').filter_by('parent_authority', '==', 'ple.upmc').select(object_properties) return send(request, execute_query(request, query), object_properties) def resource(request, object_name, object_properties):