X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=8e103a1ff85d44d57e9500c1bc668e4c4a4da167;hb=f9d7861ae487f2fa696ea37d16779e5e042e2281;hp=c9e41b90ac3daad1adef83a4ad41d45f0b4a99d3;hpb=2e02ce3947cb83f38406c2e67a3d4cac3f93ce6c;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index c9e41b90..8e103a1f 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -1,31 +1,51 @@ +import json 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 manifold.manifoldapi import execute_query -from myslice.viewutils 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.query_editor import QueryEditor +from ui.topmenu import topmenu_items, the_user + +from plugins.validatebutton import ValidateButton +from plugins.raw import Raw +from plugins.stack import Stack +from plugins.tabs import Tabs +from plugins.querytable import QueryTable +from plugins.querygrid import QueryGrid +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 +# Thierry +# stay away from query editor for now as it seems to make things go very slow +# see https://lists.myslice.info/pipermail/devel-myslice/2013-December/000221.html +#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 + +#do_query_leases=True +do_query_leases=False + +insert_grid=False +#insert_grid=True + +insert_messages=False +#insert_messages=True class SliceView (LoginRequiredAutoLogoutView): @@ -33,10 +53,15 @@ class SliceView (LoginRequiredAutoLogoutView): 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_chunks ('$(function() { console.log("users turned %s"); });'%("on" if do_query_users else "off")) + 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() - + metadata = page.get_metadata() resource_md = metadata.details_by_object('resource') resource_fields = [column['name'] for column in resource_md['column']] @@ -48,21 +73,49 @@ 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.urn', + 'resource.hostname', 'resource.type', + 'resource.network_hrn', + '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_init_key = 'hostname' query_resource_all = Query.get('resource').select(resource_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) if do_query_users: - page.enqueue_query(query_user_all) + # Required: the user must have an authority in its user.config + # XXX Temporary solution + user_query = Query().get('local:user').select('config','email') + user_details = execute_query(self.request, user_query) + + # not always found in user_details... + config={} + for user_detail in user_details: + #email = user_detail['email'] + if user_detail['config']: + config = json.loads(user_detail['config']) + user_detail['authority'] = config.get('authority',"Unknown Authority") + + if user_detail['authority'] is not None: + sub_authority = user_detail['authority'].split('.') + root_authority = sub_authority[0] + query_user_all = Query.get(root_authority+':user').select(user_fields) + + # XXX TODO this filter doesn't work - to be improved in Manifold + #.filter_by('authority.authority_hrn', '=', user_detail['authority']) + + page.enqueue_query(query_user_all) + else: + print "authority of the user is not in local:user db" + query_user_all = Query.get('user').select(user_fields) + # query_user_all = None # ... and for the relations # XXX Let's hardcode resources for now @@ -95,140 +148,164 @@ 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 = 'resources_list', - # 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, - 'bAutiWidth' : True, - }, + + # -------------------------------------------------------------------------- + # Filter Resources + +# turn off for now -- see above +# 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, + # this key is the one issued by google + googlemap_api_key = Config().googlemap_api_key(), + # the key to use at init-time + init_key = main_query_init_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, - title = "Select Columns", - ) - resources_active_filters = ActiveFilters( - page = page, - query = sq_resource, - title = "Active Filters ?", - ) + 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, ] , - active_domid = 'gmap', - ), - 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_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, + # use 'hrn' as the internal unique key for this plugin + init_key = main_query_init_key, + checkboxes = True, + datatables_options = { + 'iDisplayLength': 25, + 'bLengthChange' : True, + 'bAutoWidth' : True, + }, ) - main_stack.insert (resources_area) + if insert_grid: + resources_as_grid = QueryGrid( + page = page, + domid = 'resources-grid', + title = 'Grid view', + # this is the query at the core of the slice list + query = sq_resource, + query_all = query_resource_all, + # use 'hrn' as the internal unique key for this plugin + # xxx todo on querygrid as well + # init_key = main_query_init_key, + checkboxes = True, + ) + 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, + ) -# sq_plugin = Tabs ( -# page=page, -# title="Slice view for %s"%slicename, -# togglable=True, -# sons=[], -# ) - - - ############################################################################ - # RESOURCES - # - # A stack inserted in the subquery tab that will hold all operations - # related to resources - # - -# stack_resources = Stack( -# page = page, -# title = 'Resources', -# sons=[], -# ) - -# stack_resources.insert(resource_active_filters) -# -# -# stack_resources.insert(tab_resource_plugins) - -# sq_plugin.insert(stack_resources) - - ############################################################################ + # 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, + ] + if insert_grid: + resources_sons.append(resources_as_grid) + + 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: + if do_query_users and query_user_all is not None: tab_users = Tabs( page = page, domid = 'users', outline_complete = True, togglable = True, title = 'Users', - active_domid = 'checkboxes2', + active_domid = 'users-list', ) main_stack.insert(tab_users) - tab_users.insert(Hazelnut( + tab_users.insert(QueryTable( page = page, title = 'Users List', - domid = 'checkboxes2', + domid = 'users-list', # tab's sons preferably turn this off togglable = False, # this is the query at the core of the slice list @@ -236,61 +313,136 @@ class SliceView (LoginRequiredAutoLogoutView): query_all = query_user_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, + 'bAutoWidth' : True, }, )) - - tab_measurements = Tabs ( - page = page, - active_domid = 'checkboxes3', - outline_complete = True, - togglable = True, - title = 'Measurements', - domid = 'measurements', + +# 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' ) - 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, - )) - + + 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) + 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, + )) +# topmenu animation +# xxx all this should go into a plugin if its own with the topmenu and all... + query_pi_auths = Query.get('ple:user').filter_by('user_hrn', '==', '$user_hrn' ).select('pi_authorities') + page.enqueue_query(query_pi_auths) + # even though this plugin does not have any html materialization, the corresponding domid + # must exist because it is searched at init-time to create the JS plugin + # so we simply piggy-back the target button here + validatebutton = ValidateButton (page=page, + # see above + domid='topmenu-validation', + query=query_pi_auths, + # this one is the target for a $.show() when the query comes back + button_domid="topmenu-validation") + # although the result does not matter, rendering is required for the JS init code to make it in the page + validatebutton.render(request) +# end topmenu addition + # 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()