rest update interface

[myslice.git] / rest / __init__.py

diff --git a/rest/__init__.py b/rest/__init__.py
index 38c1c44..f871966 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -13,7 +13,6 @@ from string import join
 import decimal
 import datetime
 import json
-import urlparse
 
 # handles serialization of datetime in json
 DateEncoder = lambda obj: obj.strftime("%B %d, %Y %H:%M:%S") if isinstance(obj, datetime.datetime) else None
@@ -30,7 +29,7 @@ class DecimalEncoder(json.JSONEncoder):
 
 def dispatch(request, object_type, object_name):
     
-    object_properties = []
+    object_properties = None
     object_filters = {}
     
     switch = {
@@ -38,15 +37,20 @@ def dispatch(request, object_type, object_name):
          'slice' : slice,
          'resource' : resource,
          'user' : user,
+         'authority' : authority,
     }
     
     if request.method == 'POST':
-        for el in request.POST.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[]')
-    
+        req_items = request.POST.items()
+    elif request.method == 'GET':
+        req_items = request.GET.items()
+        
+    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'
@@ -75,7 +79,7 @@ def platform(request, object_name, object_properties, object_filters = None):
 
 # 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')
+    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)
@@ -91,9 +95,15 @@ def resource(request, object_name, object_properties, object_filters = None):
     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')
+    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)
@@ -110,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 :