From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Wed, 26 Feb 2014 17:35:56 +0000 (+0100)
Subject: resolved rest conflicts
X-Git-Tag: myslice-1.1~287
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c78cba16c3004d7b2067408ecdd5fe932b6e4fd0;p=unfold.git

resolved rest conflicts
---

c78cba16c3004d7b2067408ecdd5fe932b6e4fd0
diff --cc rest/__init__.py
index 3b6c48d8,1f9a9490..c463463c
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@@ -65,20 -69,19 +65,21 @@@ def dispatch(request, object_type, obje
                  return error(request, object_name, {})
          return switch.get(object_type, error)(request, object_name, object_properties, object_filters)
  
 -#     if request.method == 'GET':
 -#         return switch.get(request, object_type, object_name, object_properties)
 -#     elif request.method == 'POST':
 -#         return post(request, object_type, object_name)
 -
  def platform(request, object_name, object_properties, object_filters = None):
 -    query  = Query().get('local:platform').filter_by('disabled', '==', '0').filter_by('gateway_type', '==', 'sfa').filter_by('platform', '!=', 'myslice').select(object_properties)
 +    query  = Query().get('local:platform').filter_by('disabled', '==', '0').filter_by('gateway_type', '==', 'sfa').filter_by('platform', '!=', 'myslice')
 +    if object_filters :
 +        for k, f in object_filters.iteritems() :
 +            query.filter_by(k, '==', f)
 +    query.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, object_filters = None):
 -    #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)
 +    query = Query().get('slice').filter_by('user.user_hrn', '==', '$user_hrn')
 +    if object_filters :
 +        for k, f in object_filters.iteritems() :
 +            query.filter_by(k, '==', f)
 +    query.select(object_properties)
      return send(request, execute_query(request, query), object_properties)
  
  def resource(request, object_name, object_properties, object_filters = None):