X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=trash%2Fsliceview.py;h=eea4e22e39b8551defbd9c5d77138ef5335e2c8c;hb=2f1347ac1031c64b93c0b397add527ef33948974;hp=ee030451c9568dad501c6f35580751f920945ae3;hpb=544e6ac78d490061f848f98adb0e08574b474371;p=myslice.git diff --git a/trash/sliceview.py b/trash/sliceview.py index ee030451..eea4e22e 100644 --- a/trash/sliceview.py +++ b/trash/sliceview.py @@ -4,6 +4,7 @@ from django.template import RequestContext from django.shortcuts import render_to_response from django.contrib.auth.decorators import login_required +from django.http import HttpResponseRedirect from unfold.page import Page #from manifold.manifoldquery import ManifoldQuery @@ -20,8 +21,9 @@ from plugins.querycode.querycode import QueryCode from plugins.quickfilter.quickfilter import QuickFilter from plugins.messages.messages import Messages -from myslice.viewutils import quickfilter_criterias +from manifold.manifoldresult import ManifoldException +from myslice.viewutils import quickfilter_criterias from myslice.viewutils import topmenu_items, the_user # XXX JORDAN @@ -32,28 +34,48 @@ debug = True @login_required def slice_view (request, slicename=tmp_default_slice): - + # xxx Thierry - ugly hack + # fetching metadata here might fail - e.g. with an expired session.. + # let's catch this early on and log out our user if needed + # it should of course be handled in a more generic way + try: + return _slice_view(request,slicename) + except ManifoldException, manifold_result: + # xxx needs a means to display this message to user... + from django.contrib.auth import logout + logout(request) + return HttpResponseRedirect ('/') + except Exception, e: + # xxx we need to sugarcoat this error message in some error template... + print "Unexpected exception",e + import traceback + traceback.print_exc() + # return ... + +def _slice_view (request, slicename): + page = Page(request) + page.expose_js_metadata() # TODO The query to run is embedded in the URL - main_query = Query({'action': 'get', 'object': 'slice'}).filter_by('slice_hrn', '=', slicename) + main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename) # Get default fields from metadata unless specified if not main_query.fields: - md_fields = page.get_metadata() - md_fields = md_fields.details_by_subject('slice') + metadata = page.get_metadata() + md_fields = metadata.details_by_object('slice') if debug: print "METADATA", md_fields # TODO Get default fields - main_query.fields = ['slice_hrn', 'resource.hrn', 'resource.hostname', 'resource.type', 'resource.authority'] + main_query.fields = [ + 'slice_hrn', + 'resource.hrn', 'resource.hostname', 'resource.type', 'resource.authority', + 'user.user_hrn', +# 'application.measurement_point.counter' + ] -#old# main_query = ManifoldQuery (action='get', -#old# subject='resource', -#old# timestamp='latest', -#old# fields=['network','type','hrn','hostname'], -#old# filters= [ [ 'slice_hrn', '=', slicename, ] ], -#old# ) - page.enqueue_query(main_query) + aq = AnalyzedQuery(main_query) + page.enqueue_query(main_query, analyzed_query=aq) # Prepare the display according to all metadata # (some parts will be pending, others can be triggered by users). @@ -66,19 +88,15 @@ def slice_view (request, slicename=tmp_default_slice): title="Slice view for %s"%slicename, domid='thestack', togglable=False, - sons=[ - Messages ( - page=page, - title="Runtime messages for slice %s"%slicename, - domid="msgs-pre", - levels="ALL", - ), - Raw (page=page,togglable=False, toggled=True,html="