From: Ciro Scognamiglio Date: Mon, 3 Mar 2014 14:29:42 +0000 (+0100) Subject: Generic ObjectRequest class can be used for the rest interface X-Git-Tag: myslice-1.1~252^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=49d96d60d820e6d9b8434fa070470e39d5c08422;p=unfold.git Generic ObjectRequest class can be used for the rest interface --- diff --git a/manifoldapi/__init__.pyc b/manifoldapi/__init__.pyc deleted file mode 100644 index a3ccdebf..00000000 Binary files a/manifoldapi/__init__.pyc and /dev/null differ diff --git a/manifoldapi/manifoldapi.pyc b/manifoldapi/manifoldapi.pyc deleted file mode 100644 index 4286a73e..00000000 Binary files a/manifoldapi/manifoldapi.pyc and /dev/null differ diff --git a/manifoldapi/manifoldproxy.pyc b/manifoldapi/manifoldproxy.pyc deleted file mode 100644 index 7c8be6c6..00000000 Binary files a/manifoldapi/manifoldproxy.pyc and /dev/null differ diff --git a/manifoldapi/manifoldresult.pyc b/manifoldapi/manifoldresult.pyc deleted file mode 100644 index 6960dc77..00000000 Binary files a/manifoldapi/manifoldresult.pyc and /dev/null differ diff --git a/manifoldapi/metadata.pyc b/manifoldapi/metadata.pyc deleted file mode 100644 index a6906818..00000000 Binary files a/manifoldapi/metadata.pyc and /dev/null differ diff --git a/myslice/urls.py b/myslice/urls.py index cc8b2592..0a811d97 100644 --- a/myslice/urls.py +++ b/myslice/urls.py @@ -25,7 +25,6 @@ import portal.sliceview import portal.sliceresourceview from portal.sliceuserview import SliceUserView - #### high level choices # main entry point (set to the / URL) # beware that if this view is broken you end up in an endless cycle... @@ -63,9 +62,9 @@ urls = [ # # # RESTful interface - (r'^rest/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.dispatch'), - (r'^table/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.dispatch'), - (r'^datatable/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.dispatch'), + (r'^rest/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.get.dispatch'), + (r'^table/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.get.dispatch'), + (r'^datatable/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.get.dispatch'), (r'^update/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.update.dispatch'), (r'^create/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.create.dispatch'), (r'^delete/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.delete.dispatch'), diff --git a/portal/static/js/myslice-ui.js b/portal/static/js/myslice-ui.js index 04199868..1195969d 100644 --- a/portal/static/js/myslice-ui.js +++ b/portal/static/js/myslice-ui.js @@ -35,7 +35,7 @@ $(document).ready(function() { }); //{'columns' : ['hostname','country','type'], 'filters' : { 'country' : 'France' } } - oTable.load("/table/resource/", {'columns' : ['hostname','country','type'] }, function(data) { + oTable.load("/table/resource/", {'fields' : ['hostname','hrn','country','type'], 'options': ['checkbox'] }, function(data) { $(this).dataTable( { "sScrollY": window.innerHeight - 275, "sDom": "frtiS", diff --git a/portal/static/js/onelab_slice-resource-view.js b/portal/static/js/onelab_slice-resource-view.js new file mode 100644 index 00000000..9ec5df13 --- /dev/null +++ b/portal/static/js/onelab_slice-resource-view.js @@ -0,0 +1,3 @@ +$(document).ready(function() { + +}); \ No newline at end of file diff --git a/portal/templates/onelab/onelab_slice-resource-view.html b/portal/templates/onelab/onelab_slice-resource-view.html index 5432be77..a2971d18 100644 --- a/portal/templates/onelab/onelab_slice-resource-view.html +++ b/portal/templates/onelab/onelab_slice-resource-view.html @@ -1,5 +1,9 @@ {% extends "layout_wide.html" %} +{% block head %} + +{% endblock %} + {% block content %}
diff --git a/rest/__init__.py b/rest/__init__.py index 854c9e8c..c21c5ec9 100644 --- a/rest/__init__.py +++ b/rest/__init__.py @@ -1,15 +1,8 @@ from manifold.core.query import Query +from manifoldapi.manifoldapi import execute_query -from django.views.generic.base import TemplateView -from django.shortcuts import render_to_response - -from unfold.loginrequired import LoginRequiredView from django.http import HttpResponse -from manifold.core.query import Query -from manifoldapi.manifoldapi import execute_query - -from string import join import decimal import datetime @@ -27,54 +20,67 @@ class DecimalEncoder(json.JSONEncoder): if isinstance(o, decimal.Decimal): return (str(o) for o in [o]) return super(DecimalEncoder, self)._iterencode(o, markers) - -class objectRequest(object): + +class ObjectRequest(object): def __init__(self, request, object_type, object_name): self.type = object_type self.name = object_name - self.properties = [] + self.fields = [] self.filters = {} self.options = None - - self.request = request - - # XXX TODO: What about the local: objects? - # Example: local:user (Manifold) is different from user (SFA GW) + self.request = request + if ((self.type == 'platform') or (self.type == 'testbed')) : self.type = 'local:platform' self.id = 'platform' - self.properties = ['platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type']; + self.fields = ['platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type']; self.filters['disabled'] = '0' self.filters['gateway_type'] = 'sfa' self.filters['platform'] = '!myslice' else : - self.id = 'hrn' - query = Query.get('local:object').filter_by('table', '==', self.type).select('column.name') - results = execute_query(self.request, query) - if results : - for r in results[0]['column'] : - self.properties.append(r['name']) - else : - return error('db error') - return None + self.setKey() + + self.setLocalFields() + - def addFilters(self, properties): - selected_properties = [] - for p in properties : - if p in self.properties : - selected_properties.append(p) - self.properties = selected_properties - self.setId() + def setKey(self): + print self.type + # What about key formed of multiple fields??? + query = Query.get('local:object').filter_by('table', '==', self.type).select('key') + results = execute_query(self.request, query) + print "key of object = %s" % results + if results : + for r in results[0]['key'] : + self.id = r + else : + raise Exception, 'Manifold db error' + + def setLocalFields(self): + query = Query.get('local:object').filter_by('table', '==', self.type).select('column.name') + results = execute_query(self.request, query) + if results : + for r in results[0]['column'] : + self.fields.append(r['name']) + else : + raise Exception, 'Manifold db error' - def setId(self): - if self.id in self.properties : - self.properties.remove(self.id) - [self.id].extend(self.properties) + def setFields(self, fields): + selected_fields = [] + for p in fields : + if p in self.fields : + selected_fields.append(p) + self.fields = selected_fields + + # + if self.id in self.fields : + self.fields.remove(self.id) + [self.id].extend(self.fields) - def execute(self): - query = Query.get(self.type).select(self.properties) + def applyFilters(self, query, force_filters = False): + if (force_filters and not self.filters) : + raise Exception, "Filters required" if self.filters : for k, f in self.filters.iteritems() : if (f[:1] == "!") : @@ -89,41 +95,44 @@ class objectRequest(object): query.filter_by(k, '<', f[1:]) else : query.filter_by(k, '==', f) + return query + + def get(self): + query = Query.get(self.type).select(self.fields) + query = self.applyFilters(query) return execute_query(self.request, query) - -def dispatch(request, object_type, object_name): - o = objectRequest(request, object_type, object_name) + def update(self): + query = Query.update(self.type) + query = self.applyFilters(query, True) + if self.params : + query.set(self.params) + else: + raise Exception, "Params are required for update" + return execute_query(self.request, query) - if request.method == 'POST': - req_items = request.POST - elif request.method == 'GET': - req_items = request.GET - - for el in req_items.items(): - if el[0].startswith('filters'): - o.filters[el[0][8:-1]] = el[1] - elif el[0].startswith('columns'): - o.addFilters(req_items.getlist('columns[]')) - elif el[0].startswith('options'): - o.options = req_items.getlist('options[]') - - response = o.execute() + def delete(self): + query = Query.delete(self.type) + query = self.applyFilters(query, True) + if self.params : + query.set(self.params) + else: + raise Exception, "Params are required for update" + return execute_query(self.request, query) - if request.path.split('/')[1] == 'rest' : - response_data = response - return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json") - elif request.path.split('/')[1] == 'table' : - return render_to_response('table-default.html', {'data' : response, 'properties' : o.properties, 'id' : o.id, 'options' : o.options}) - elif request.path.split('/')[1] == 'datatable' : + def json(self): + return HttpResponse(json.dumps(self.get(), cls=DecimalEncoder, default=DateEncoder), content_type="application/json") + + def datatable(self): + response = self.get() response_data = {} - response_data['columns'] = o.properties - response_data['labels'] = o.properties + response_data['fields'] = self.fields + response_data['labels'] = self.fields response_data['data'] = [] response_data['total'] = len(response) for r in response : d = [] - for p in o.properties : + for p in self.fields : d.append(r[p]) response_data['data'].append(d) @@ -131,3 +140,6 @@ def dispatch(request, object_type, object_name): def error(msg): return HttpResponse(json.dumps({'error' : msg}), content_type="application/json") + +def success(msg): + return HttpResponse(json.dumps({'success' : msg}), content_type="application/json") diff --git a/rest/delete.py b/rest/delete.py index f6800b08..41a39e4d 100644 --- a/rest/delete.py +++ b/rest/delete.py @@ -1,86 +1,9 @@ -from manifold.core.query import Query - -from django.views.generic.base import TemplateView -from django.shortcuts import render_to_response - from unfold.loginrequired import LoginRequiredView -from django.http import HttpResponse - -from manifold.core.query import Query, AnalyzedQuery -from manifoldapi.manifoldapi import execute_query from string import join -import decimal -import datetime -import json - -# 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 -json.encoder.FLOAT_REPR = lambda o: format(o, '.2f') - -# handles decimal numbers serialization in json -class DecimalEncoder(json.JSONEncoder): - def _iterencode(self, o, markers=None): - if isinstance(o, decimal.Decimal): - return (str(o) for o in [o]) - return super(DecimalEncoder, self)._iterencode(o, markers) - -class objectRequest(object): - - def __init__(self, request, object_type, object_name): - self.type = object_type - self.name = object_name - # No params in delete - self.properties = [] - self.filters = {} - self.options = None - - self.request = request - - # What about key formed of multiple fields??? - query = Query.get('local:object').filter_by('table', '==', self.type).select('key') - results = execute_query(self.request, query) - print "key of object = %s" % results - if results : - for r in results[0]['key'] : - self.id = r - else : - return error('Manifold db error') - - query = Query.get('local:object').filter_by('table', '==', self.type).select('column.name') - results = execute_query(self.request, query) - if results : - for r in results[0]['column'] : - self.properties.append(r['name']) - else : - return error('Manifold db error') - def setId(self): - if self.id in self.properties : - self.properties.remove(self.id) - [self.id].extend(self.properties) +from rest import ObjectRequest, error, success - def execute(self): - query = Query.delete(self.type) - if self.filters : - for k, f in self.filters.iteritems() : - if (f[:1] == "!") : - query.filter_by(k, '!=', f[1:]) - elif (f[:2] == ">=") : - query.filter_by(k, '>=', f[2:]) - elif (f[:1] == ">") : - query.filter_by(k, '>', f[1:]) - elif (f[:2] == "<=") : - query.filter_by(k, '<=', f[2:]) - elif (f[:1] == "<") : - query.filter_by(k, '<', f[1:]) - else : - query.filter_by(k, '==', f) - else: - raise Exception, "Filters are required for delete" - return execute_query(self.request, query) def dispatch(request, object_type, object_name): @@ -93,7 +16,7 @@ def dispatch(request, object_type, object_name): if request.method == 'POST': req_items = request.POST elif request.method == 'GET': - #return HttpResponse(json.dumps({'error' : 'only post request is supported'}), content_type="application/json") + #return error('only post request is supported') req_items = request.GET for el in req_items.items(): @@ -106,10 +29,10 @@ def dispatch(request, object_type, object_name): response = o.execute() if response : - return HttpResponse(json.dumps({'success' : 'record deleted'}), content_type="application/json") + return success('record deleted') else : - return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json") + return error('an error has occurred') except Exception, e: - return HttpResponse(json.dumps({'error' : str(e)}), content_type="application/json") + return error(str(e)) diff --git a/rest/get.py b/rest/get.py index d5866483..02c651b5 100644 --- a/rest/get.py +++ b/rest/get.py @@ -1,63 +1,31 @@ -from manifold.core.query import Query, AnalyzedQuery - -from django.views.generic.base import TemplateView +from django.shortcuts import render_to_response from unfold.loginrequired import LoginRequiredView -from django.http import HttpResponse -from manifold.core.query import Query, AnalyzedQuery -from manifoldapi.manifoldapi import execute_query +from rest import ObjectRequest, error -import json +from string import join -def platform(request, platform_name): - - platform_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type') - response = execute_query(request,platform_query) +def dispatch(request, object_type, object_name): - response_data = {} - response_data['columns'] = [ 'platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type' ] - response_data['labels'] = [ 'Platform', 'Name', 'Url', 'Description','Gateway Type' ] - response_data['data'] = [] - for r in response : - 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 slice(request, slice_name): + o = ObjectRequest(request, object_type, object_name) - platform_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type') - response = execute_query(request,platform_query) - - - - response_data = {} - response_data['columns'] = [ 'platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type' ] - response_data['labels'] = [ 'Platform', 'Name', 'Url', 'Description','Gateway Type' ] - response_data['data'] = [] - for r in response : - 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") - -# slicename = 'ple.upmc.myslicedemo' -# main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename) -# main_query.select( -# 'slice_hrn', -# 'resource.hrn', 'resource.urn', -# 'resource.hostname', 'resource.type', -# 'resource.network_hrn', -# 'lease.urn', -# 'user.user_hrn', -# #'application.measurement_point.counter' -# ) -# -# res = execute_query(self.request,main_query) -# -# print res -# -# return render(request, self.template_name, {"resources": res[0]['resource']}) - - -# def get (self, request, name='default'): -# return HttpResponse() + if request.method == 'POST': + req_items = request.POST + elif request.method == 'GET': + req_items = request.GET + + for el in req_items.items(): + if el[0].startswith('filters'): + o.filters[el[0][8:-1]] = el[1] + elif el[0].startswith('fields'): + o.setFields(req_items.getlist('fields[]')) + elif el[0].startswith('options'): + o.options = req_items.getlist('options[]') + + if request.path.split('/')[1] == 'rest' : + return o.json() + elif request.path.split('/')[1] == 'table' : + return render_to_response('table-default.html', {'data' : o.get(), 'fields' : o.fields, 'id' : o.id, 'options' : o.options}) + elif request.path.split('/')[1] == 'datatable' : + return o.datatable() diff --git a/rest/platform.py b/rest/platform.py deleted file mode 100644 index bdb6e069..00000000 --- a/rest/platform.py +++ /dev/null @@ -1,42 +0,0 @@ -from manifold.core.query import Query, AnalyzedQuery - -from django.views.generic.base import TemplateView - -from unfold.loginrequired import LoginRequiredView -from django.http import HttpResponse - -from manifold.core.query import Query, AnalyzedQuery -from manifoldapi.manifoldapi import execute_query - -import json - - -def dispatch(request, platform_name): - return get(request, platform_name) - -def get(request, platform_name): - - platform_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type') - response = execute_query(request,platform_query) - - q = Query.get('slice').select('slice_hrn') - result = execute_query(request,q) - print result -# # -# query = Query.get('local:object').select('table') -# results = execute_query(request, query) -# print results -# - query = Query.get('local:object').filter_by('table', '==', 'slice').select('column.name') - results = execute_query(request, query) - print results - - response_data = {} - response_data['columns'] = [ 'platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type' ] - response_data['labels'] = [ 'Platform', 'Name', 'Url', 'Description','Gateway Type' ] - response_data['data'] = [] - #response_data['resources'] = { 'total' : len(r) } - for r in response : - 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") diff --git a/rest/templates/table-default.html b/rest/templates/table-default.html index da7ba0c2..d8397ce1 100644 --- a/rest/templates/table-default.html +++ b/rest/templates/table-default.html @@ -1,15 +1,15 @@ {% load rest_filters %} - {% if "checkbox" in options %}checkbox{% endif %} - {% for p in properties %}{{ p }}{% endfor %} + {% if "checkbox" in options %}{% endif %} + {% for f in fields %}{{ f }}{% endfor %} {% for d in data %} {% if "checkbox" in options %}{% endif %} - {% for p in properties %}
{{ d|key:p }}
{% endfor %} + {% for f in fields %}
{{ d|key:f }}
{% endfor %} {% endfor %} \ No newline at end of file diff --git a/rest/update.py b/rest/update.py index 6cdf7826..7b277593 100644 --- a/rest/update.py +++ b/rest/update.py @@ -1,5 +1,3 @@ -from manifold.core.query import Query - from django.views.generic.base import TemplateView from django.shortcuts import render_to_response @@ -9,80 +7,12 @@ from django.http import HttpResponse from manifold.core.query import Query, AnalyzedQuery from manifoldapi.manifoldapi import execute_query -from string import join -import decimal -import datetime -import json - -# 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 -json.encoder.FLOAT_REPR = lambda o: format(o, '.2f') - -# handles decimal numbers serialization in json -class DecimalEncoder(json.JSONEncoder): - def _iterencode(self, o, markers=None): - if isinstance(o, decimal.Decimal): - return (str(o) for o in [o]) - return super(DecimalEncoder, self)._iterencode(o, markers) - -class objectRequest(object): +from rest import ObjectRequest, error, success - def __init__(self, request, object_type, object_name): - self.type = object_type - self.name = object_name - # params required in update - self.params = [] - self.properties = [] - self.filters = {} - self.options = None - - self.request = request - - # What about key formed of multiple fields??? - query = Query.get('local:object').filter_by('table', '==', self.type).select('key') - results = execute_query(self.request, query) - print "key of object = %s" % results - if results : - for r in results[0]['key'] : - self.id = r - else : - return error('Manifold db error') - - query = Query.get('local:object').filter_by('table', '==', self.type).select('column.name') - results = execute_query(self.request, query) - if results : - for r in results[0]['column'] : - self.properties.append(r['name']) - else : - return error('Manifold db error') +from string import join - def execute(self): - query = Query.update(self.type) - if self.filters : - for k, f in self.filters.iteritems() : - if (f[:1] == "!") : - query.filter_by(k, '!=', f[1:]) - elif (f[:2] == ">=") : - query.filter_by(k, '>=', f[2:]) - elif (f[:1] == ">") : - query.filter_by(k, '>', f[1:]) - elif (f[:2] == "<=") : - query.filter_by(k, '<=', f[2:]) - elif (f[:1] == "<") : - query.filter_by(k, '<', f[1:]) - else : - query.filter_by(k, '==', f) - else: - raise Exception, "Filters are required for update" - if self.params : - query.set(self.params) - else: - raise Exception, "Params are required for update" - +import json - return execute_query(self.request, query) def dispatch(request, object_type, object_name): @@ -95,7 +25,7 @@ def dispatch(request, object_type, object_name): if request.method == 'POST': req_items = request.POST elif request.method == 'GET': - #return HttpResponse(json.dumps({'error' : 'only post request is supported'}), content_type="application/json") + #return error('only post request is supported') req_items = request.GET for el in req_items.items(): @@ -112,10 +42,10 @@ def dispatch(request, object_type, object_name): response = o.execute() if response : - return HttpResponse(json.dumps({'success' : 'record updated'}), content_type="application/json") + return success('record updated') else : - return HttpResponse(json.dumps({'error' : 'an error has occurred'}), content_type="application/json") + return error('an error has occurred') except Exception, e: - return HttpResponse(json.dumps({'error' : str(e)}), content_type="application/json") + return error(str(e)) diff --git a/rest/urls.py b/rest/urls.py deleted file mode 100644 index 55d364d2..00000000 --- a/rest/urls.py +++ /dev/null @@ -1,8 +0,0 @@ - -from django.conf.urls import patterns, include, url -from django.conf import settings - - -urlpatterns = patterns('', - url(r'^rest/get/slice/(?P[^/]+)/?$', 'rest.get.slice') -) diff --git a/ui/templates/layout-unfold1.html b/ui/templates/layout-unfold1.html index 7d3ee2e6..01e22fb7 100644 --- a/ui/templates/layout-unfold1.html +++ b/ui/templates/layout-unfold1.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block base_content %} -
+
{% block unfold_main %} "The main content area (define block 'unfold_main')" {% endblock unfold_main %} -
+
{% endblock %}