From 17f41e9b521790ab660ea8660a161272a5f04fb5 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Thu, 5 Jun 2014 14:51:56 +0200 Subject: [PATCH] slice resource view: Reserved resources and Leases in SimpleList plugins --- portal/sliceresourceview.py | 49 +++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py index 2034eac4..f99c7d98 100644 --- a/portal/sliceresourceview.py +++ b/portal/sliceresourceview.py @@ -19,6 +19,7 @@ from plugins.queryupdater import QueryUpdater from plugins.testbeds import TestbedsPlugin from plugins.scheduler2 import Scheduler2 from plugins.columns_editor import ColumnsEditor +from plugins.lists.simplelist import SimpleList from myslice.theme import ThemeView @@ -43,13 +44,16 @@ class SliceResourceView (LoginRequiredView, ThemeView): user_fields = ['user_hrn'] # [column['name'] for column in user_md['column']] # TODO The query to run is embedded in the URL + # 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_hrn', 'resource.urn', 'resource.hostname', 'resource.type', 'resource.network_hrn', - 'lease.urn', + 'lease.resource', + 'lease.start_time', + 'lease.end_time', #'user.user_hrn', #'application.measurement_point.counter' ) @@ -95,21 +99,35 @@ class SliceResourceView (LoginRequiredView, ThemeView): # RESERVED RESOURCES LIST # resources as a list using datatable plugin - list_reserved_resources = QueryTable( - page = page, - domid = 'resources-reserved-list', - title = 'List view', - query = sq_resource, - query_all = sq_resource, - init_key = "urn", - checkboxes = True, - datatables_options = { - 'iDisplayLength': 25, - 'bLengthChange' : True, - 'bAutoWidth' : True, - }, + list_reserved_resources = SimpleList( + title = None, + page = page, + key = 'urn', + query = sq_resource, ) + list_reserved_leases = SimpleList( + title = None, + page = page, + key = 'resource', + query = sq_lease, + ) + +# list_reserved_resources = QueryTable( +# page = page, +# domid = 'resources-reserved-list', +# title = 'List view', +# query = sq_resource, +# query_all = sq_resource, +# init_key = "urn", +# checkboxes = True, +# datatables_options = { +# 'iDisplayLength': 25, +# 'bLengthChange' : True, +# 'bAutoWidth' : True, +# }, +# ) + # -------------------------------------------------------------------------- # COLUMNS EDITOR # list of fields to be applied on the query @@ -203,7 +221,8 @@ class SliceResourceView (LoginRequiredView, ThemeView): template_env = {} template_env['list_resources'] = list_resources.render(self.request) -# template_env['list_reserved_resources'] = list_reserved_resources.render(self.request) + template_env['list_reserved_resources'] = list_reserved_resources.render(self.request) + template_env['list_reserved_leases'] = list_reserved_leases.render(self.request) template_env['columns_editor'] = filter_column_editor.render(self.request) -- 2.43.0