X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=78c2fabd498aa900db4365c5e81cf78fec03eed4;hb=437602b3ee7f5bcf6a6d8724b6d10734d6952124;hp=b9293b99b63f1d6918f188dbe3e40eeaa425bc12;hpb=f3b60376826a28db2d4d7e6fdf41276f57b951ed;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index b9293b99..78c2fabd 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -20,13 +20,15 @@ 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): @@ -37,7 +39,8 @@ class SliceView (LoginRequiredAutoLogoutView): 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")) - page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(Config.manifold_url())) + config=Config() + page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url())) page.expose_js_metadata() metadata = page.get_metadata() @@ -133,8 +136,7 @@ class SliceView (LoginRequiredAutoLogoutView): domid = 'filters', sons = [filter_query_editor, filter_active_filters], togglable = True, - # start turned off, it will open up itself when stuff comes in - toggled = False, + toggled = 'persistent', outline_complete = True, ) main_stack.insert (filters_area) @@ -161,6 +163,7 @@ class SliceView (LoginRequiredAutoLogoutView): resources_as_list = Hazelnut( 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, @@ -172,34 +175,63 @@ class SliceView (LoginRequiredAutoLogoutView): }, ) - # 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_stats_cpu = SliceStat( + title = "CPU Usage", + domid = 'resources-stats-cpu', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'cpu' + ) + + resources_stats_mem = SliceStat( + title = "Memory Usage", + domid = 'resources-stats-mem', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'mem' + ) + + resources_stats_asb = SliceStat( + title = "Traffic Sent", + domid = 'resources-stats-asb', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'asb' + ) + + resources_stats_arb = SliceStat( + title = "Traffic Received", + domid = 'resources-stats-arb', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'arb' + ) + + # with the new 'Filter' stuff on top, no need for anything but the hazelnut + resources_as_list_area = resources_as_list + 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_map, resources_as_list_area, resources_stats_cpu, resources_stats_mem, resources_stats_asb, resources_stats_arb ], active_domid = 'resources-map', ) main_stack.insert (resources_area) - # -------------------------------------------------------------------------- # USERS @@ -230,52 +262,53 @@ 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', - ) - 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, - # 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, - )) - +# 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(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, +# # 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 = {}