X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceresourceview.py;h=7c0d5c0a08e6609717e306d47a931db74abddba0;hb=ca18b72eaf2f8f06a41136cb95fdc4f04cf67c0b;hp=17b9096d096546bd2823e6ab646a764350849cc9;hpb=ad016322ae3f21b27cda0e942fa48a10c3c728a3;p=myslice.git diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py index 17b9096d..7c0d5c0a 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) @@ -398,22 +413,21 @@ class SliceResourceView (LoginRequiredView, ThemeView): # }, # ) - # # -------------------------------------------------------------------------- - # # SLA View and accept dialog - # - # sla_dialog = SlaDialog( - # page = page, - # title = 'sla dialog', - # query = main_query, - # togglable = False, - # # start turned off, it will open up itself when stuff comes in - # toggled = True, - # domid = 'sla_dialog', - # outline_complete = True, - # username = request.user, - # ) - # - + # -------------------------------------------------------------------------- + # SLA View and accept dialog + + sla_dialog = SlaDialog( + page = page, + title = 'sla dialog', + query = main_query, + #togglable = False, + # start turned off, it will open up itself when stuff comes in + #toggled = True, + domid = 'sla_dialog', + #outline_complete = True, + username = request.user, + ) + template_env = {} template_env['request'] = self.request @@ -430,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) @@ -442,7 +457,7 @@ class SliceResourceView (LoginRequiredView, ThemeView): # template_env['vm_form'] = univbrisvtamform.render(self.request) # template_env['pending_resources'] = pending_resources.render(self.request) - # template_env['sla_dialog'] = '' # sla_dialog.render(self.request) + template_env['sla_dialog'] = sla_dialog.render(self.request) template_env["theme"] = self.theme template_env["username"] = request.user template_env["slice"] = slicename