X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceresourceview.py;h=e887ff7afd71ed44a5353132713e5f8d2a971852;hb=754158ae8e3a6b8e1d5cfeed23de32e4ad941a29;hp=f6d29dbfa0b0aa2e1da4ed1ee38cf3725fd5f661;hpb=b3ede7e149682b5ff4e86ce948ae73681aaed9a0;p=unfold.git diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py index f6d29dbf..e887ff7a 100644 --- a/portal/sliceresourceview.py +++ b/portal/sliceresourceview.py @@ -1,27 +1,30 @@ -from django.template import RequestContext -from django.shortcuts import render_to_response +from django.template import RequestContext +from django.shortcuts import render_to_response from manifold.core.query import Query, AnalyzedQuery from manifoldapi.manifoldapi import execute_query import json -from django.views.generic.base import TemplateView +from django.views.generic.base import TemplateView -from unfold.loginrequired import LoginRequiredView +from unfold.loginrequired import LoginRequiredView from django.http import HttpResponse from django.shortcuts import render -from unfold.page import Page +from unfold.page import Page -from myslice.configengine import ConfigEngine -from plugins.querytable import QueryTable -from plugins.googlemap import GoogleMap -from plugins.queryupdater import QueryUpdater -from plugins.testbeds import TestbedsPlugin -from plugins.scheduler2 import Scheduler2 -from plugins.columns_editor import ColumnsEditor -from plugins.sladialog import SlaDialog -from plugins.lists.simplelist import SimpleList +from myslice.configengine import ConfigEngine + +from plugins.apply import ApplyPlugin +from plugins.querytable import QueryTable +from plugins.googlemap import GoogleMap +# from plugins.queryupdater import QueryUpdaterPlugin +from plugins.filter_status import FilterStatusPlugin +from plugins.testbeds import TestbedsPlugin +from plugins.scheduler2 import Scheduler2 +from plugins.columns_editor import ColumnsEditor +from plugins.sladialog import SlaDialog +from plugins.lists.simplelist import SimpleList from myslice.theme import ThemeView @@ -49,13 +52,15 @@ class SliceResourceView (LoginRequiredView, ThemeView): # Example: select slice_hrn, resource.urn, lease.resource, lease.start_time, lease.end_time from slice where slice_hrn == "ple.upmc.myslicedemo" main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename) main_query.select( + 'slice_urn', # XXX We need the key otherwise the storage of records bugs ! 'slice_hrn', - 'resource.urn', + 'resource.urn', 'resource.hostname', 'resource.type', 'resource.network_hrn', 'lease.resource', 'lease.start_time', 'lease.end_time', + 'lease.lease_id', # Important for NITOS identify already existing leases #'user.user_hrn', #'application.measurement_point.counter' ) @@ -68,14 +73,14 @@ class SliceResourceView (LoginRequiredView, ThemeView): sq_lease = aq.subquery('lease') query_resource_all = Query.get('resource').select(resource_fields) - page.enqueue_query(query_resource_all) + #page.enqueue_query(query_resource_all) # leases query - lease_md = metadata.details_by_object('lease') - lease_fields = [column['name'] for column in lease_md['column']] + #lease_md = metadata.details_by_object('lease') + #lease_fields = [column['name'] for column in lease_md['column']] - query_lease_all = Query.get('lease').select(lease_fields) - page.enqueue_query(query_lease_all) + #query_lease_all = Query.get('lease').select(lease_fields) + #page.enqueue_query(query_lease_all) # -------------------------------------------------------------------------- # ALL RESOURCES LIST @@ -154,16 +159,16 @@ class SliceResourceView (LoginRequiredView, ThemeView): # 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 = ConfigEngine().googlemap_api_key(), # the key to use at init-time init_key = main_query_init_key, checkboxes = True, - # center on Paris - latitude = 49., - longitude = 9, - zoom = 8, + + # To center around Europe : 53,9 / 3 + latitude = 53., + longitude = 9., + zoom = 3, ) # -------------------------------------------------------------------------- @@ -177,24 +182,22 @@ class SliceResourceView (LoginRequiredView, ThemeView): # this is the query at the core of the slice list query = sq_resource, query_lease = sq_lease, - query_all_resources = query_resource_all, - query_all_leases = query_lease_all, ) # -------------------------------------------------------------------------- # QueryUpdater (Pending Operations) - pending_resources = QueryUpdater( - page = page, - title = 'Pending operations', - query = main_query, - togglable = False, - # start turned off, it will open up itself when stuff comes in - toggled = False, - domid = 'pending', - outline_complete = True, - username = request.user, - ) +# pending_resources = QueryUpdaterPlugin( +# page = page, +# title = 'Pending operations', +# query = main_query, +# togglable = False, +# # start turned off, it will open up itself when stuff comes in +# toggled = False, +# domid = 'pending', +# outline_complete = True, +# username = request.user, +# ) # -------------------------------------------------------------------------- # NETWORKS @@ -203,18 +206,17 @@ class SliceResourceView (LoginRequiredView, ThemeView): network_md = metadata.details_by_object('network') network_fields = [column['name'] for column in network_md['column']] - #query_network = Query.get('network').select(network_fields) - #page.enqueue_query(query_network) + query_networks = Query.get('network').select(network_fields) + page.enqueue_query(query_networks) filter_testbeds = TestbedsPlugin( - page = page, - domid = 'testbeds-filter', - title = 'Filter by testbeds', - query = sq_resource, - query_all = query_resource_all, - #query_network = query_network, - init_key = "network_hrn", - checkboxes = True, + page = page, + domid = 'testbeds-filter', + title = 'Filter by testbeds', + query = sq_resource, + query_networks = query_networks, + init_key = "network_hrn", + checkboxes = True, datatables_options = { 'iDisplayLength': 25, 'bLengthChange' : True, @@ -222,6 +224,19 @@ class SliceResourceView (LoginRequiredView, ThemeView): }, ) + filter_status = FilterStatusPlugin( + page = page, + domid = "filter-status", + query = sq_resource, + ) + apply = ApplyPlugin( + page = page, + domid = "apply", + query = main_query, + username = request.user, + ) + + # -------------------------------------------------------------------------- # SLA View and accept dialog @@ -242,6 +257,8 @@ class SliceResourceView (LoginRequiredView, ThemeView): account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') platform_details = execute_query(self.request, platform_query) account_details = execute_query(self.request, account_query) + + # XXX When session has expired, this is None and thus not iterable for platform_detail in platform_details: for account_detail in account_details: if platform_detail['platform_id'] == account_detail['platform_id']: @@ -263,10 +280,13 @@ class SliceResourceView (LoginRequiredView, ThemeView): template_env['columns_editor'] = filter_column_editor.render(self.request) template_env['filter_testbeds'] = filter_testbeds.render(self.request) + template_env['filter_status'] = filter_status.render(self.request) + template_env['apply'] = apply.render(self.request) + template_env['map_resources'] = map_resources.render(self.request) template_env['scheduler'] = resources_as_scheduler2.render(self.request) - template_env['pending_resources'] = pending_resources.render(self.request) - template_env['sla_dialog'] = sla_dialog.render(self.request) +# template_env['pending_resources'] = pending_resources.render(self.request) + template_env['sla_dialog'] = '' # sla_dialog.render(self.request) template_env["theme"] = self.theme template_env["username"] = request.user template_env["pi"] = pi