git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor cleanup
[myslice.git]
/
portal
/
dashboardview.py
diff --git
a/portal/dashboardview.py
b/portal/dashboardview.py
index
01478c7
..
44a3ea9
100644
(file)
--- a/
portal/dashboardview.py
+++ b/
portal/dashboardview.py
@@
-1,7
+1,8
@@
from manifold.core.query import Query
from unfold.page import Page
from manifold.core.query import Query
from unfold.page import Page
-from plugins.lists.simplelist import SimpleList
+from plugins.lists.testbedlist import TestbedList
+from plugins.lists.slicelist import SliceList
from unfold.loginrequired import LoginRequiredAutoLogoutView
from unfold.loginrequired import LoginRequiredAutoLogoutView
@@
-22,33
+23,29
@@
class DashboardView (LoginRequiredAutoLogoutView):
# Slow...
#slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
# Slow...
#slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
+ testbed_query = Query().get('network').select('network_hrn','platform')
+ # DEMO GEC18 Query only PLE
slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
- auth_query = Query().get('network').select('network_hrn')
- print "AUTH QUERY =====================", auth_query
- print "filter", auth_query.filters
page.enqueue_query(slice_query)
page.enqueue_query(slice_query)
- page.enqueue_query(
auth
_query)
+ page.enqueue_query(
testbed
_query)
page.expose_js_metadata()
page.expose_queries()
page.expose_js_metadata()
page.expose_queries()
- slicelist = SimpleList(
- title = None,
+ slicelist = SliceList(
page = page,
page = page,
-
key = 'slice.slice_hrn'
,
+
title = "slices"
,
query = slice_query,
)
query = slice_query,
)
-
- authlist = SimpleList(
- title = None,
+ testbedlist = TestbedList(
page = page,
page = page,
-
key = 'network_hrn'
,
- query =
auth
_query,
+
title = "testbeds"
,
+ query =
testbed
_query,
)
)
-
+
context = super(DashboardView, self).get_context_data(**kwargs)
context['person'] = self.request.user
context = super(DashboardView, self).get_context_data(**kwargs)
context['person'] = self.request.user
- context['
networks'] = auth
list.render(self.request)
+ context['
testbeds'] = testbed
list.render(self.request)
context['slices'] = slicelist.render(self.request)
# XXX This is repeated in all pages
context['slices'] = slicelist.render(self.request)
# XXX This is repeated in all pages