Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
	rest/__init__.py

diff --cc rest/__init__.py
index acc953d,b8e733a..3c393d5
--- 1/rest/__init__.py
--- 2/rest/__init__.py
+++ b/rest/__init__.py
@@@ -62,16 -78,15 +78,17 @@@ def platform(request, object_name, obje
      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)
  
 -def slice(request, object_name, object_properties, object_filters = None):
 -    query = Query().get('slice').filter_by('user.user_hrn', '==', '$user_hrn').select(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('parent_authority', '==', 'ple.upmc').select(object_properties)
      return send(request, execute_query(request, query), object_properties)
  
- def resource(request, object_name, object_properties):
-     pass
+ def resource(request, object_name, object_properties, object_filters = None):
+     query = Query().get('resource').select(object_properties)
+     return send(request, execute_query(request, query), object_properties)
  
- def user(request, object_name, object_properties):
+ def user(request, object_name, object_properties, object_filters = None):
      query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select(object_properties)
      return send(request, execute_query(request, query), object_properties)