X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Fsliceresourceview.py;h=30a0726b4bbecd6fe8aface5448e79bd8ddaa4c9;hb=f9673799ad8b5f348560b68f2b49944b6fc4ec1e;hp=341fa4b6ccb10ba93e46985a9bb1d016285fc5a3;hpb=a57786aed6a0db101b5304198282762ec4654a6b;p=unfold.git diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py index 341fa4b6..30a0726b 100644 --- a/portal/sliceresourceview.py +++ b/portal/sliceresourceview.py @@ -22,6 +22,7 @@ from plugins.googlemap import GoogleMap from plugins.filter_status import FilterStatusPlugin from plugins.testbeds import TestbedsPlugin from plugins.scheduler2 import Scheduler2 +from plugins.asap import AsapPlugin # Bristol plugin from plugins.univbris import Univbris @@ -239,6 +240,20 @@ class SliceResourceView (LoginRequiredView, ThemeView): query_lease = sq_lease, ) + # -------------------------------------------------------------------------- + # LEASES Asap Scheduler + # Select an end_time for all unconfigured resources + # start_time is as soon as possible + + resources_as_asap = AsapPlugin( + page = page, + domid = 'asap', + title = 'Asap', + # this is the query at the core of the slice list + query = sq_resource, + query_lease = sq_lease, + ) + # -------------------------------------------------------------------------- # QueryUpdater (Pending Operations) @@ -429,6 +444,7 @@ class SliceResourceView (LoginRequiredView, ThemeView): template_env['map_resources'] = map_resources.render(self.request) template_env['scheduler'] = resources_as_scheduler2.render(self.request) + template_env['asap'] = resources_as_asap.render(self.request) # Bristol plugin # template_env['welcome'] = univbriswelcome.render(self.request)