X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2F__init__.py;h=f87196634c5125be96a7a7882650a55da840b3be;hb=4e8925bca017d05c0325edd7f9146b83835267db;hp=7bcd8ed6c8e2540ce621eb265b5d101d00ba323e;hpb=16c948cbc41f745569c6fbd4014cc7bd92d92844;p=myslice.git

diff --git a/rest/__init__.py b/rest/__init__.py
index 7bcd8ed6..f8719663 100644
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -13,13 +13,12 @@ from string import join
 import decimal
 import datetime
 import json
-from json import encoder
 
 # handles serialization of datetime in json
 DateEncoder = lambda obj: obj.strftime("%B %d, %Y %H:%M:%S") if isinstance(obj, datetime.datetime) else None
 
 # support converting decimal in json
-encoder.FLOAT_REPR = lambda o: format(o, '.2f')
+json.encoder.FLOAT_REPR = lambda o: format(o, '.2f')
 
 # handles decimal numbers serialization in json
 class DecimalEncoder(json.JSONEncoder):
@@ -31,26 +30,27 @@ class DecimalEncoder(json.JSONEncoder):
 def dispatch(request, object_type, object_name):
     
     object_properties = None
-    object_filters = None
+    object_filters = {}
     
     switch = {
          'platform' : platform,
          'slice' : slice,
          'resource' : resource,
          'user' : user,
+         'authority' : authority,
     }
     
     if request.method == 'POST':
-        if 'filters' in request.POST :
-            object_filters = request.POST.getlist('filters[]')
-            print '########################'
-            print object_filters
-        print "$$$$$$$$$$$$$$$$$$$$$$"
-        print request.POST
+        req_items = request.POST.items()
+    elif request.method == 'GET':
+        req_items = request.GET.items()
         
-        if 'columns[]' in request.POST :
+    for el in req_items:
+        if el[0].startswith('filters'):
+            object_filters[el[0][8:-1]] = el[1]
+        elif el[0].startswith('columns'):
             object_properties = request.POST.getlist('columns[]')
-    
+
     # platform is local
     if ((object_type == 'platform') or (object_type == 'testbed')) :
         object_type = 'local:platform'
@@ -69,28 +69,45 @@ def dispatch(request, object_type, object_name):
                 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):
-    #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)
+def slice(request, object_name, object_properties, object_filters = None):
+    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):
-    query = Query().get('resource').select(object_properties)
+    query = Query().get('resource')
+    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 user(request, object_name, object_properties, object_filters = None):
-#    query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select(object_properties)
-    query = Query().get('user').filter_by('parent_authority', '==', 'ple.upmc').select(object_properties)
+    query = Query().get('user')#.filter_by('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 authority(request, object_name, object_properties, object_filters = None):
+    query = Query().get('authority')#.filter_by('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 send(request, response, object_properties):
@@ -103,7 +120,6 @@ def send(request, response, object_properties):
         response_data = {}
         response_data['columns'] = object_properties
         response_data['labels'] = object_properties
-        #response_data['labels'] = [ 'Platform', 'Name', 'Url', 'Description','Gateway Type' ]
         response_data['data'] = []
         response_data['total'] = len(response)
         for r in response :