X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=42cc8ba1f5a9a8d0970719ff85a5a1e57161fbdf;hb=03839166e30819c37290f33056f44aaee1583bfc;hp=f6494070c84be9be3ffe06aaadc58a8929479879;hpb=9ac5d96ebeaa0136eb89a21f1c28c9b9c78655f9;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index f6494070..42cc8ba1 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -1,36 +1,50 @@ from django.template import RequestContext from django.shortcuts import render_to_response -from portal.templateviews import LoginRequiredAutoLogoutView +from unfold.loginrequired import LoginRequiredAutoLogoutView from unfold.page import Page from manifold.core.query import Query, AnalyzedQuery -from myslice.viewutils import topmenu_items, the_user +from ui.topmenu import topmenu_items, the_user -from plugins.raw.raw import Raw -from plugins.stack.stack import Stack -from plugins.tabs.tabs import Tabs -from plugins.hazelnut import Hazelnut -from plugins.resources_selected import ResourcesSelected -from plugins.googlemaps import GoogleMaps -from plugins.senslabmap.senslabmap import SensLabMap -from plugins.querycode.querycode import QueryCode +from plugins.raw import Raw +from plugins.stack import Stack +from plugins.tabs import Tabs +from plugins.querytable import QueryTable +from plugins.queryupdater import QueryUpdater +from plugins.googlemap import GoogleMap +from plugins.senslabmap import SensLabMap +from plugins.scheduler import Scheduler +from plugins.querycode import QueryCode from plugins.query_editor import QueryEditor from plugins.active_filters import ActiveFilters -from plugins.quickfilter.quickfilter import QuickFilter -from plugins.messages.messages import Messages -#from plugins.updater import Updater +from plugins.quickfilter import QuickFilter +from plugins.messages import Messages +from plugins.slicestat import SliceStat + +from myslice.config import Config tmp_default_slice='ple.upmc.myslicedemo' +# temporary : turn off the users part to speed things up +#do_query_users=True +do_query_users=False + +insert_messages=False +#insert_messages=True + class SliceView (LoginRequiredAutoLogoutView): def get (self,request, slicename=tmp_default_slice): page = Page(request) page.add_css_files ('css/slice-view.css') - page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });') + page.add_js_files ( [ "js/common.functions.js" ] ) + page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });') + page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off")) + config=Config() + page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url())) page.expose_js_metadata() metadata = page.get_metadata() @@ -44,19 +58,22 @@ class SliceView (LoginRequiredAutoLogoutView): main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename) main_query.select( 'slice_hrn', - 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn', - #'lease.urn', + 'resource.hrn', 'resource.hostname', 'resource.type', + 'resource.network_hrn', + 'lease.urn', 'user.user_hrn', #'application.measurement_point.counter' ) query_resource_all = Query.get('resource').select(resource_fields) - query_user_all = Query.get('user').select(user_fields) + if do_query_users: + query_user_all = Query.get('user').select(user_fields) aq = AnalyzedQuery(main_query, metadata=metadata) page.enqueue_query(main_query, analyzed_query=aq) page.enqueue_query(query_resource_all) - page.enqueue_query(query_user_all) + if do_query_users: + page.enqueue_query(query_user_all) # ... and for the relations # XXX Let's hardcode resources for now @@ -89,194 +106,254 @@ class SliceView (LoginRequiredAutoLogoutView): ) # -------------------------------------------------------------------------- - # ResourcesSelected - # - main_stack.insert(ResourcesSelected( + # QueryUpdater (Pending Operations) + + main_stack.insert(QueryUpdater( page = page, title = 'Pending operations', query = main_query, togglable = True, + # start turned off, it will open up itself when stuff comes in + toggled = False, domid = 'pending', outline_complete = True, )) - -# main_stack.insert( -# Raw (page=page,togglable=False, toggled=True,html='Description: TODO') -# ) - - # the resources part is made of a Stack, - # with first a Tabs (List, Geographic), - # and second the QueryEditor to tweak the set of attributes to show - resources_as_list = Hazelnut( - page = page, - title = 'Resources as a List', - domid = 'checkboxes', - # this is the query at the core of the slice list - query = sq_resource, - query_all = query_resource_all, - checkboxes = True, - datatables_options = { - # for now we turn off sorting on the checkboxes columns this way - # this of course should be automatic in hazelnut - 'aoColumns' : [None, None, None, None, {'bSortable': False}], - 'iDisplayLength' : 25, - 'bLengthChange' : True, - }, + + # -------------------------------------------------------------------------- + # Filter Resources + + filter_query_editor = QueryEditor( + page = page, + query = sq_resource, + query_all = query_resource_all, + title = "Select Columns", + domid = 'select-columns', + ) + filter_active_filters = ActiveFilters( + page = page, + query = sq_resource, + title = "Active Filters", ) + filters_area = Stack( + page = page, + title = 'Filter Resources', + domid = 'filters', + sons = [filter_query_editor, filter_active_filters], + togglable = True, + toggled = 'persistent', + outline_complete = True, + ) + main_stack.insert (filters_area) + + # -------------------------------------------------------------------------- + # RESOURCES + # the resources part is made of a Tabs (Geographic, List), - resources_as_map = GoogleMaps( + resources_as_gmap = GoogleMap( page = page, title = 'Geographic view', - domid = 'gmap', + domid = 'resources-map', # tab's sons preferably turn this off togglable = False, query = sq_resource, query_all = query_resource_all, + googlemap_api_key = Config().googlemap_api_key(), checkboxes = True, # center on Paris latitude = 49., - longitude = 2.2, - zoom = 3, + longitude = 9, + zoom = 4, ) - resources_query_editor = QueryEditor( - page = page, - query = sq_resource, - ) - resources_active_filters = ActiveFilters( - page = page, - query = sq_resource, - ) + resources_as_3dmap = SensLabMap( + page = page, + title = '3D Map', + domid = 'senslabmap', + query = sq_resource, + query_all = query_resource_all, + ) - resources_area = Stack ( - page=page, - domid="resources", - togglable=True, - title="Resources", - outline_complete=True, - sons = [ - Tabs ( page=page, - sons=[ resources_as_list, resources_as_map, ] - ), - Stack ( page=page, - title="Customize", - togglable=True, - sons = [ resources_query_editor, resources_active_filters, ] - ), - ] + resources_as_list = QueryTable( + page = page, + domid = 'resources-list', + title = 'List view', + # this is the query at the core of the slice list + query = sq_resource, + query_all = query_resource_all, + checkboxes = True, + datatables_options = { + 'iDisplayLength': 25, + 'bLengthChange' : True, + 'bAutoWidth' : True, + }, ) - main_stack.insert (resources_area) + resources_as_scheduler = Scheduler( + page = page, + title = 'Scheduler', + domid = 'scheduler', + query = sq_resource, + query_all_resources = query_resource_all, + query_lease = sq_lease, + ) + # with the new 'Filter' stuff on top, no need for anything but the querytable + resources_as_list_area = resources_as_list -# sq_plugin = Tabs ( -# page=page, -# title="Slice view for %s"%slicename, -# togglable=True, -# sons=[], -# ) + resources_area = Tabs ( page=page, + domid="resources", + togglable=True, + title="Resources", + outline_complete=True, + sons=[ + resources_as_scheduler, + #resources_as_gmap, + #resources_as_3dmap, + resources_as_list_area, ], + active_domid = 'resources-map', + persistent_active=True, + ) + main_stack.insert (resources_area) + + # -------------------------------------------------------------------------- + # USERS + if do_query_users: + tab_users = Tabs( + page = page, + domid = 'users', + outline_complete = True, + togglable = True, + title = 'Users', + active_domid = 'users-list', + ) + main_stack.insert(tab_users) - ############################################################################ - # RESOURCES - # - # A stack inserted in the subquery tab that will hold all operations - # related to resources - # + tab_users.insert(QueryTable( + page = page, + title = 'Users List', + domid = 'users-list', + # tab's sons preferably turn this off + togglable = False, + # this is the query at the core of the slice list + query = sq_user, + query_all = query_user_all, + checkboxes = True, + datatables_options = { + 'iDisplayLength' : 25, + 'bLengthChange' : True, + 'bAutoWidth' : True, + }, + )) + +# DEMO + # -------------------------------------------------------------------------- + # MEASUREMENTS + measurements_stats_cpu = SliceStat( + title = "CPU Usage", + domid = 'resources-stats-cpu', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'cpu' + ) -# stack_resources = Stack( -# page = page, -# title = 'Resources', -# sons=[], + measurements_stats_mem = SliceStat( + title = "Memory Usage", + domid = 'resources-stats-mem', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'mem' + ) + + measurements_stats_asb = SliceStat( + title = "Traffic Sent", + domid = 'resources-stats-asb', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'asb' + ) + + measurements_stats_arb = SliceStat( + title = "Traffic Received", + domid = 'resources-stats-arb', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'arb' + ) + + tab_measurements = Tabs ( page=page, + domid="measurements", + togglable=True, + toggled = False, + title="Measurements", + outline_complete=True, + sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ], + active_domid = 'measurements_stats_cpu', + ) + main_stack.insert (tab_measurements) + +# tab_measurements = Tabs ( +# page = page, +# active_domid = 'measurements-list', +# outline_complete = True, +# togglable = True, +# title = 'Measurements', +# domid = 'measurements', # ) - -# stack_resources.insert(resource_active_filters) -# +# main_stack.insert(tab_measurements) # -# stack_resources.insert(tab_resource_plugins) - -# sq_plugin.insert(stack_resources) - - ############################################################################ - # USERS - # - - tab_users = Tabs( - page = page, - domid = 'users', - outline_complete = True, - togglable = True, - title = 'Users', - active_domid = 'checkboxes2', - ) - main_stack.insert(tab_users) - -# tab_users.insert(Hazelnut( +# tab_measurements.insert(QueryTable( # page = page, -# title = 'Users List', -# domid = 'checkboxes2', +# title = 'Measurements', +# domid = 'measurements-list', # # tab's sons preferably turn this off # togglable = False, # # this is the query at the core of the slice list -# query = sq_user, -# query_all = query_user_all, +# query = sq_measurement, +# # do NOT set checkboxes to False +# # this table being otherwise empty, it just does not fly with dataTables # checkboxes = True, # datatables_options = { -# # for now we turn off sorting on the checkboxes columns this way -# # this of course should be automatic in hazelnut -# 'aoColumns' : [None, None, None, None, {'bSortable': False}], # 'iDisplayLength' : 25, # 'bLengthChange' : True, +# 'bAutoWidth' : True, # }, # )) - - tab_measurements = Tabs ( - page = page, - active_domid = 'checkboxes3', - outline_complete = True, - togglable = True, - title = 'Measurements', - domid = 'measurements', - ) - main_stack.insert(tab_measurements) - - tab_measurements.insert(Hazelnut( - page = page, - title = 'Measurements', - domid = 'checkboxes3', - # tab's sons preferably turn this off - togglable = False, - # this is the query at the core of the slice list - query = sq_measurement, - checkboxes = True, - datatables_options = { - # for now we turn off sorting on the checkboxes columns this way - # this of course should be automatic in hazelnut - 'aoColumns' : [None, None, None, None, {'bSortable': False}], - 'iDisplayLength' : 25, - 'bLengthChange' : True, - }, - )) - - main_stack.insert(Messages( - page = page, - title = "Runtime messages for slice %s"%slicename, - domid = "msgs-pre", - levels = "ALL", - # plain messages are probably less nice for production but more reliable for development for now - transient = False, - # these make sense only in non-transient mode.. - togglable = True, - toggled = 'persistent', - outline_complete = True, - )) +# +# # -------------------------------------------------------------------------- +# # MESSAGES (we use transient=False for now) + if insert_messages: + main_stack.insert(Messages( + page = page, + title = "Runtime messages for slice %s"%slicename, + domid = "msgs-pre", + levels = "ALL", + # plain messages are probably less nice for production but more reliable for development for now + transient = False, + # these make sense only in non-transient mode.. + togglable = True, + toggled = 'persistent', + outline_complete = True, + )) # variables that will get passed to the view-unfold1.html template template_env = {} - # define 'unfold1_main' to the template engine - the main contents - template_env [ 'unfold1_main' ] = main_stack.render(request) + # define 'unfold_main' to the template engine - the main contents + template_env [ 'unfold_main' ] = main_stack.render(request) # more general variables expected in the template template_env [ 'title' ] = '%(slicename)s'%locals()