X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=0c32b4014bea70996308fb1bb873cf67d7d669cd;hb=fcd452b931fcc40fd82807d2c0affdd0d951d9e3;hp=44effc9ab2303eef223fefbdb146f5c36cda6d16;hpb=a1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index 44effc9a..0c32b401 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -11,16 +11,17 @@ 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 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 import QuickFilter from plugins.messages import Messages -from plugins.slicestat import Slicestat +from plugins.slicestat import SliceStat from myslice.config import Config @@ -30,6 +31,12 @@ tmp_default_slice='ple.upmc.myslicedemo' #do_query_users=True do_query_users=False +#do_query_leases=True +do_query_leases=False + +insert_messages=False +#insert_messages=True + class SliceView (LoginRequiredAutoLogoutView): def get (self,request, slicename=tmp_default_slice): @@ -39,6 +46,7 @@ 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("sliceview: leases turned %s"); });'%("on" if do_query_leases else "off")) config=Config() page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url())) page.expose_js_metadata() @@ -56,10 +64,13 @@ class SliceView (LoginRequiredAutoLogoutView): 'slice_hrn', 'resource.hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn', - #'lease.urn', + 'lease.urn', 'user.user_hrn', #'application.measurement_point.counter' ) + # for internal use in the querytable plugin; + # needs to be a unique column present for each returned record + main_query_key = 'hrn' query_resource_all = Query.get('resource').select(resource_fields) if do_query_users: @@ -102,9 +113,9 @@ 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, @@ -145,7 +156,7 @@ class SliceView (LoginRequiredAutoLogoutView): # 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', @@ -153,6 +164,7 @@ class SliceView (LoginRequiredAutoLogoutView): togglable = False, query = sq_resource, query_all = query_resource_all, + googlemap_api_key = Config().googlemap_api_key(), checkboxes = True, # center on Paris latitude = 49., @@ -160,13 +172,23 @@ 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, + # safer to use 'hrn' as the internal unique key for this plugin + id_key = main_query_key, checkboxes = True, datatables_options = { 'iDisplayLength': 25, @@ -175,7 +197,76 @@ class SliceView (LoginRequiredAutoLogoutView): }, ) - resources_stats_cpu = Slicestat( + if do_query_leases: + 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 + + resources_sons = [ + resources_as_gmap, + resources_as_3dmap, + resources_as_scheduler, + resources_as_list_area, + ] if do_query_leases else [ + resources_as_gmap, + resources_as_3dmap, + resources_as_list_area, + ] + + resources_area = Tabs ( page=page, + domid="resources", + togglable=True, + title="Resources", + outline_complete=True, + sons= resources_sons, + 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) + + 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, @@ -186,7 +277,7 @@ class SliceView (LoginRequiredAutoLogoutView): o = 'cpu' ) - resources_stats_mem = Slicestat( + measurements_stats_mem = SliceStat( title = "Memory Usage", domid = 'resources-stats-mem', page = page, @@ -197,7 +288,7 @@ class SliceView (LoginRequiredAutoLogoutView): o = 'mem' ) - resources_stats_asb = Slicestat( + measurements_stats_asb = SliceStat( title = "Traffic Sent", domid = 'resources-stats-asb', page = page, @@ -208,7 +299,7 @@ class SliceView (LoginRequiredAutoLogoutView): o = 'asb' ) - resources_stats_arb = Slicestat( + measurements_stats_arb = SliceStat( title = "Traffic Received", domid = 'resources-stats-arb', page = page, @@ -218,85 +309,18 @@ class SliceView (LoginRequiredAutoLogoutView): 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", + tab_measurements = Tabs ( page=page, + domid="measurements", togglable=True, - title="Resources", + toggled = False, + title="Measurements", outline_complete=True, - sons=[ resources_as_map, resources_as_list_area, resources_stats_cpu, resources_stats_mem, resources_stats_asb, resources_stats_arb ], - active_domid = 'resources-map', + sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ], + active_domid = 'measurements_stats_cpu', ) - main_stack.insert (resources_area) - - # -------------------------------------------------------------------------- - # USERS - -<<<<<<< HEAD - 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) - - tab_users.insert(Hazelnut( - 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, - }, - )) - + main_stack.insert (tab_measurements) -======= - 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) - - tab_users.insert(Hazelnut( - 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, - }, - )) ->>>>>>> 0c8a634162f3271018102e75a3934c5db5e48f59 -# DEMO - # -------------------------------------------------------------------------- - # MEASUREMENTS # tab_measurements = Tabs ( # page = page, # active_domid = 'measurements-list', @@ -307,7 +331,7 @@ class SliceView (LoginRequiredAutoLogoutView): # ) # main_stack.insert(tab_measurements) # -# tab_measurements.insert(Hazelnut( +# tab_measurements.insert(QueryTable( # page = page, # title = 'Measurements', # domid = 'measurements-list', @@ -327,25 +351,26 @@ class SliceView (LoginRequiredAutoLogoutView): # # # -------------------------------------------------------------------------- # # 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, -# )) -# + 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()