From d3c4599bc7e78f9b01ebac0c39d919bf5a731212 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Sat, 26 Oct 2013 16:36:37 +0200 Subject: [PATCH] Demo GEC18 - Queries onnly to PLE for Registration & SliceRequest --- portal/dashboardview.py | 5 +- portal/registrationview.py | 13 ++--- portal/slicerequestview.py | 14 ++--- portal/sliceview.py | 102 ++++++++++++++++++++----------------- 4 files changed, 72 insertions(+), 62 deletions(-) diff --git a/portal/dashboardview.py b/portal/dashboardview.py index 8e1fa4c4..91f4016a 100644 --- a/portal/dashboardview.py +++ b/portal/dashboardview.py @@ -22,10 +22,9 @@ class DashboardView (LoginRequiredAutoLogoutView): # Slow... #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('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','platform') - print "AUTH QUERY =====================", auth_query - print "filter", auth_query.filters + # DEMO GEC18 Query only PLE + slice_query = Query().get('ple:user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn') page.enqueue_query(slice_query) page.enqueue_query(auth_query) diff --git a/portal/registrationview.py b/portal/registrationview.py index 2322081c..9ecba0dc 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -29,14 +29,15 @@ class RegistrationView (View): def dispatch (self, request): errors = [] - authorities_query = Query.get('authority').\ - select('name', 'authority_hrn') + #authorities_query = Query.get('authority').\ + # select('name', 'authority_hrn') - onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False') - onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) - if onelab_enabled: + #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False') + #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) + #if onelab_enabled: + if True: print "ONELAB ENABLED" - authorities_query = authorities_query.filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple']) + authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos']) else: print "FIREXP ENABLED" diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index da8e667c..c34a9035 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -14,16 +14,16 @@ from ui.topmenu import topmenu_items, the_user class SliceRequestView (LoginRequiredAutoLogoutView): def authority_hrn_initial (self, request): - authorities_query = Query.get('authority').\ - select('name', 'authority_hrn') + #authorities_query = Query.get('authority').\ + # select('name', 'authority_hrn') - onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple-onelab').filter_by('disabled', '==', 'False') - onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) - if onelab_enabled: - authorities_query = authorities_query.filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple']) + #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple-onelab').filter_by('disabled', '==', 'False') + #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) + #if onelab_enabled: + authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple','ple.nitos']) authorities = execute_admin_query(request, authorities_query) - #authorities = sorted(authorities) + authorities = sorted(authorities) authority_hrn_tuples = [ (authority['authority_hrn'], authority['name'] if authority['name'] else authority['authority_hrn'],) for authority in authorities ] print "authority_hrn_tuples=", authority_hrn_tuples diff --git a/portal/sliceview.py b/portal/sliceview.py index 78c2fabd..b41e92cb 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -175,51 +175,7 @@ class SliceView (LoginRequiredAutoLogoutView): }, ) - resources_stats_cpu = SliceStat( - title = "CPU Usage", - domid = 'resources-stats-cpu', - page = page, - stats = 'slice', - key = 'hrn', - query = 'none', - slicename = slicename, - o = 'cpu' - ) - - resources_stats_mem = SliceStat( - title = "Memory Usage", - domid = 'resources-stats-mem', - page = page, - stats = 'slice', - key = 'hrn', - query = 'none', - slicename = slicename, - o = 'mem' - ) - - resources_stats_asb = SliceStat( - title = "Traffic Sent", - domid = 'resources-stats-asb', - page = page, - stats = 'slice', - key = 'hrn', - query = 'none', - slicename = slicename, - o = 'asb' - ) - - resources_stats_arb = SliceStat( - title = "Traffic Received", - domid = 'resources-stats-arb', - page = page, - stats = 'slice', - key = 'hrn', - query = 'none', - slicename = slicename, - o = 'arb' - ) - - # with the new 'Filter' stuff on top, no need for anything but the hazelnut + # with the new 'Filter' stuff on top, no need for anything but the hazelnut resources_as_list_area = resources_as_list resources_area = Tabs ( page=page, @@ -227,7 +183,7 @@ class SliceView (LoginRequiredAutoLogoutView): togglable=True, title="Resources", outline_complete=True, - sons=[ resources_as_map, resources_as_list_area, resources_stats_cpu, resources_stats_mem, resources_stats_asb, resources_stats_arb ], + sons=[ resources_as_map, resources_as_list_area ], active_domid = 'resources-map', ) main_stack.insert (resources_area) @@ -266,6 +222,60 @@ class SliceView (LoginRequiredAutoLogoutView): # DEMO # -------------------------------------------------------------------------- # MEASUREMENTS + measurements_stats_cpu = SliceStat( + title = "CPU Usage", + domid = 'resources-stats-cpu', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'cpu' + ) + + measurements_stats_mem = SliceStat( + title = "Memory Usage", + domid = 'resources-stats-mem', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'mem' + ) + + measurements_stats_asb = SliceStat( + title = "Traffic Sent", + domid = 'resources-stats-asb', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'asb' + ) + + measurements_stats_arb = SliceStat( + title = "Traffic Received", + domid = 'resources-stats-arb', + page = page, + stats = 'slice', + key = 'hrn', + query = 'none', + slicename = slicename, + o = 'arb' + ) + + tab_measurements = Tabs ( page=page, + domid="measurements", + togglable=True, + title="Measurements", + outline_complete=True, + sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ], + active_domid = 'measurements_stats_cpu', + ) + main_stack.insert (tab_measurements) + # tab_measurements = Tabs ( # page = page, # active_domid = 'measurements-list', -- 2.43.0