modified rest function: platform, user, slice

diff --git a/myslice/urls.py b/myslice/urls.py
index 1eac188..30a29de 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -63,7 +63,7 @@ urls = [
     #
     #(r'^view/?', include('view.urls')),
     #(r'^list/slices', 'view.list.slices'),
-    #(r'^list/(?P<object_type>[^/]+)', 'view.list.default'),
+    (r'^list/(?P<object_type>[^/]+)', 'rest.list'),
     #
     #
     # Portal

diff --git a/rest/__init__.py b/rest/__init__.py
index 892e4ca..ba26663 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -24,6 +24,7 @@ def dispatch(request, object_type, object_name):
     if (object_type == 'platform') :
         object_type = 'local:platform'
         object_properties = ['platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type'];
+        return switch.get('platform', error)(request, object_name, object_properties)
     else :
         query = Query.get('local:object').filter_by('table', '==', object_type).select('column.name')
         results = execute_query(request, query)
@@ -33,30 +34,31 @@ def dispatch(request, object_type, object_name):
                 object_properties.append(r['name'])
         else :
             return error()
-
-    return switch.get(object_type, error)(request, object_type, object_name, object_properties)
+        return switch.get(object_type, error)(request, object_name, object_properties)
 
 #     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():
-    return HttpResponse(json.dumps({'user' : 'error message'}), content_type="application/json")
+def platform(request, object_name, object_properties):
+    query  = Query().get('local:platform').filter_by('disabled', '==', '0').select(object_properties)
+    return send(request, execute_query(request, query), object_properties)
 
-def slice():
-    return HttpResponse(json.dumps({'user' : 'error message'}), content_type="application/json")
+def slice(request, object_name, object_properties):
+    query = Query().get('slice').filter_by('user.user_hrn', '==', '$user_hrn').select(object_properties)
+    return send(request, execute_query(request, query), object_properties)
 
-def user(request, object_type, object_name, object_properties):
+def user(request, object_name, object_properties):
     query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select(object_properties)
-    #.select('slice.slice_hrn')
-        
     return send(request, execute_query(request, query), object_properties)
 
 def send(request, response, object_properties):
     if request.path.split('/')[1] == 'rest' :
         response_data = response
-    else :
+    elif request.path.split('/')[1] == 'table' :
+        response_data = response
+    elif request.path.split('/')[1] == 'datatable' :
         response_data = {}
         response_data['columns'] = object_properties
         response_data['labels'] = object_properties
@@ -74,37 +76,5 @@ def send(request, response, object_properties):
          
     return HttpResponse(json.dumps(response_data), content_type="application/json")
 
-
-
-
-
-def get(request, object_type, object_name, object_properties):
-        
-    query = Query().get(object_type).select(object_properties).filter_by('user_hrn', '=', '$user_hrn')
-    if (object_name) :
-        query = query.filter_by(object_type + '_hrn', '=', object_name)
-    
-    response = execute_query(request, query)
-    
-    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 :
-        d = []
-        for p in object_properties :
-            d.append(r[p])
-        print d
-        
-        response_data['data'].append(d)
-        #response_data['data'].append([ r['platform'], r['platform_longname'], r['platform_url'], r['platform_description'], r['gateway_type'] ])
-         
-    return HttpResponse(json.dumps(response_data), content_type="application/json")
-
-def post(request, object_type, object_name):
-    pass
-
-def error():
-    return HttpResponse(json.dumps({'error' : 'error message'}), content_type="application/json")
\ No newline at end of file
+def error(request, object_name, object_properties):
+    return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json")
\ No newline at end of file