added authority query, we need a more generic function, not 1 per object, there are...

[myslice.git] / rest / __init__.py

diff --git a/rest/__init__.py b/rest/__init__.py
index 636f1e5..f871966 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -29,7 +29,7 @@ class DecimalEncoder(json.JSONEncoder):
 
 def dispatch(request, object_type, object_name):
     
-    object_properties = []
+    object_properties = None
     object_filters = {}
     
     switch = {
@@ -37,6 +37,7 @@ def dispatch(request, object_type, object_name):
          'slice' : slice,
          'resource' : resource,
          'user' : user,
+         'authority' : authority,
     }
     
     if request.method == 'POST':
@@ -49,8 +50,7 @@ def dispatch(request, object_type, object_name):
             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'
@@ -79,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)
@@ -95,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)