X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=trash%2Fsliceview.py;h=bf7aa2f368adde3a50ad5df7d1c79d0d7cacb619;hb=e256853ef256809864927b91deb42e713baea769;hp=ee030451c9568dad501c6f35580751f920945ae3;hpb=f14a5114d0cf6673c172bdb89669fa80efcd3f2b;p=myslice.git diff --git a/trash/sliceview.py b/trash/sliceview.py index ee030451..bf7aa2f3 100644 --- a/trash/sliceview.py +++ b/trash/sliceview.py @@ -1,59 +1,76 @@ # Create your views here. -from django.template import RequestContext -from django.shortcuts import render_to_response - -from django.contrib.auth.decorators import login_required - -from unfold.page import Page -#from manifold.manifoldquery import ManifoldQuery -from manifold.core.query import Query, AnalyzedQuery - -from plugins.raw.raw import Raw -from plugins.stack.stack import Stack -from plugins.tabs.tabs import Tabs -from plugins.lists.slicelist import SliceList -from plugins.hazelnut.hazelnut import Hazelnut -from plugins.googlemap.googlemap import GoogleMap -from plugins.senslabmap.senslabmap import SensLabMap -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 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 myslice.viewutils import topmenu_items, the_user +from unfold.page import Page +from manifold.core.query import Query, AnalyzedQuery +from manifold.manifoldresult import ManifoldException +from manifold.metadata import MetaData as Metadata +from myslice.viewutils import quickfilter_criterias, topmenu_items, the_user -# XXX JORDAN -from manifold.metadata import MetaData as Metadata +from plugins.raw.raw import Raw +from plugins.stack.stack import Stack +from plugins.tabs.tabs import Tabs +from plugins.lists.slicelist import SliceList +from plugins.hazelnut.hazelnut import Hazelnut +from plugins.resources_selected import ResourcesSelected +from plugins.googlemap.googlemap import GoogleMap +from plugins.senslabmap.senslabmap import SensLabMap +from plugins.querycode.querycode import QueryCode +from plugins.quickfilter.quickfilter import QuickFilter +from plugins.messages.messages import Messages tmp_default_slice='ple.inria.heartbeat' 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.resource_hrn', 'resource.hostname', 'resource.type', 'resource.authority', + 'lease.urn', + '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). @@ -63,74 +80,170 @@ def slice_view (request, slicename=tmp_default_slice): # Create the base layout (Stack)... main_plugin = Stack ( page=page, - 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="