git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a57786a
)
ASAP plugin added to the Slice page
author
Loic Baron
<loic.baron@lip6.fr>
Tue, 16 Jun 2015 15:59:35 +0000
(17:59 +0200)
committer
Loic Baron
<loic.baron@lip6.fr>
Tue, 16 Jun 2015 15:59:35 +0000
(17:59 +0200)
portal/sliceresourceview.py
patch
|
blob
|
history
diff --git
a/portal/sliceresourceview.py
b/portal/sliceresourceview.py
index
341fa4b
..
30a0726
100644
(file)
--- 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.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
# Bristol plugin
from plugins.univbris import Univbris
@@
-239,6
+240,20
@@
class SliceResourceView (LoginRequiredView, ThemeView):
query_lease = sq_lease,
)
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)
# --------------------------------------------------------------------------
# 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['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)
# Bristol plugin
# template_env['welcome'] = univbriswelcome.render(self.request)