X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fsliceview.py;h=38c90fca4951a9d1d7bf2e5ac6685153364a9c02;hp=1eb6778e049b6870c8900fe5de8a29b980a87dbd;hb=372b744255e44a58b5616874a9eea97b4f05ad23;hpb=99791cf1c8642e4e9b34a68aa1d44f2d61370613 diff --git a/portal/sliceview.py b/portal/sliceview.py index 1eb6778e..38c90fca 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -11,20 +11,24 @@ from ui.topmenu import topmenu_items, the_user from plugins.raw import Raw from plugins.stack import Stack from plugins.tabs import Tabs -from plugins.hazelnut import Hazelnut -from plugins.resources_selected import ResourcesSelected +from plugins.querytable import QueryTable +from plugins.queryupdater import QueryUpdater from plugins.googlemap import GoogleMap -from plugins.senslabmap.senslabmap import SensLabMap +from plugins.senslabmap import SensLabMap from plugins.querycode import QueryCode from plugins.query_editor import QueryEditor from plugins.active_filters import ActiveFilters 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=True +do_query_users=False class SliceView (LoginRequiredAutoLogoutView): @@ -33,8 +37,10 @@ class SliceView (LoginRequiredAutoLogoutView): page = Page(request) page.add_css_files ('css/slice-view.css') page.add_js_files ( [ "js/common.functions.js" ] ) - page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });') - page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off")) + 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() @@ -48,7 +54,8 @@ 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', + 'resource.hrn', 'resource.hostname', 'resource.type', + 'resource.network_hrn', #'lease.urn', 'user.user_hrn', #'application.measurement_point.counter' @@ -95,22 +102,50 @@ class SliceView (LoginRequiredAutoLogoutView): ) # -------------------------------------------------------------------------- - # ResourcesSelected (Pending Operations) + # QueryUpdater (Pending Operations) - main_stack.insert(ResourcesSelected( + 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, )) - + + # -------------------------------------------------------------------------- + # 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 = GoogleMap( + resources_as_gmap = GoogleMap( page = page, title = 'Geographic view', domid = 'resources-map', @@ -125,9 +160,18 @@ class SliceView (LoginRequiredAutoLogoutView): zoom = 4, ) - resources_as_list = Hazelnut( + resources_as_3dmap = SensLabMap( + page = page, + title = '3D Map', + domid = 'senslabmap', + query = sq_resource, + query_all = query_resource_all, + ) + + 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, @@ -139,45 +183,21 @@ class SliceView (LoginRequiredAutoLogoutView): }, ) - resources_query_editor = QueryEditor( - page = page, - query = query_resource_all, - title = "Select Columns", - ) - resources_active_filters = ActiveFilters( - page = page, - query = sq_resource, - title = "Active Filters ?", - ) + # with the new 'Filter' stuff on top, no need for anything but the querytable + resources_as_list_area = resources_as_list - # List area itself is a Stack with hazelnut on top, - # and a togglable tabs for customization plugins - resources_as_list_area = Stack( - page = page, - title = 'Resources as a List', - domid = 'resources-list-area', - sons= [ resources_as_list, - Tabs ( page=page, - title="Customize Resources layout", - togglable=True, - toggled='persistent', - domid="customize-resources", - outline_complete=True, - sons = [ resources_query_editor, resources_active_filters, ], - ), - ], - ) resources_area = Tabs ( page=page, domid="resources", togglable=True, title="Resources", outline_complete=True, - sons=[ resources_as_map, resources_as_list_area, ], + sons=[ resources_as_gmap, + resources_as_3dmap, + resources_as_list_area, ], active_domid = 'resources-map', ) main_stack.insert (resources_area) - # -------------------------------------------------------------------------- # USERS @@ -192,7 +212,7 @@ class SliceView (LoginRequiredAutoLogoutView): ) main_stack.insert(tab_users) - tab_users.insert(Hazelnut( + tab_users.insert(QueryTable( page = page, title = 'Users List', domid = 'users-list', @@ -208,56 +228,114 @@ class SliceView (LoginRequiredAutoLogoutView): 'bAutoWidth' : True, }, )) - + +# DEMO # -------------------------------------------------------------------------- # MEASUREMENTS - tab_measurements = Tabs ( - page = page, - active_domid = 'measurements-list', - outline_complete = True, - togglable = True, - title = 'Measurements', - domid = 'measurements', + measurements_stats_cpu = SliceStat( + title = "CPU Usage", + domid = 'resources-stats-cpu', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'cpu' ) - main_stack.insert(tab_measurements) - - tab_measurements.insert(Hazelnut( - page = page, - 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_measurement, - checkboxes = True, - datatables_options = { - 'iDisplayLength' : 25, - 'bLengthChange' : True, - 'bAutoWidth' : True, - }, - )) - - # -------------------------------------------------------------------------- - # MESSAGES (we use transient=False for now) - 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, - )) - + + 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', +# ) +# main_stack.insert(tab_measurements) +# +# tab_measurements.insert(QueryTable( +# page = page, +# 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_measurement, +# # do NOT set checkboxes to False +# # this table being otherwise empty, it just does not fly with dataTables +# checkboxes = True, +# datatables_options = { +# 'iDisplayLength' : 25, +# 'bLengthChange' : True, +# 'bAutoWidth' : True, +# }, +# )) +# +# # -------------------------------------------------------------------------- +# # MESSAGES (we use transient=False for now) +# 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()