from plugins.raw import Raw
from plugins.stack import Stack
from plugins.tabs import Tabs
-from plugins.hazelnut import Hazelnut
-from plugins.resources_selected import ResourcesSelected
+from plugins.querytable import QueryTable
+from plugins.queryupdater import QueryUpdater
from plugins.googlemap import GoogleMap
from plugins.senslabmap import SensLabMap
+from plugins.scheduler import Scheduler
from plugins.querycode import QueryCode
from plugins.query_editor import QueryEditor
from plugins.active_filters import ActiveFilters
from plugins.quickfilter import QuickFilter
from plugins.messages import Messages
-from plugins.slicestat import Slicestat
+from plugins.slicestat import SliceStat
from myslice.config import Config
#do_query_users=True
do_query_users=False
+insert_messages=False
+#insert_messages=True
+
class SliceView (LoginRequiredAutoLogoutView):
def get (self,request, slicename=tmp_default_slice):
'slice_hrn',
'resource.hrn', 'resource.hostname', 'resource.type',
'resource.network_hrn',
- #'lease.urn',
+ 'lease.urn',
'user.user_hrn',
#'application.measurement_point.counter'
)
)
# --------------------------------------------------------------------------
- # ResourcesSelected (Pending Operations)
+ # QueryUpdater (Pending Operations)
- main_stack.insert(ResourcesSelected(
+ main_stack.insert(QueryUpdater(
page = page,
title = 'Pending operations',
query = main_query,
# RESOURCES
# the resources part is made of a Tabs (Geographic, List),
- resources_as_map = GoogleMap(
+ resources_as_gmap = GoogleMap(
page = page,
title = 'Geographic view',
domid = 'resources-map',
zoom = 4,
)
- resources_as_list = Hazelnut(
+ resources_as_3dmap = SensLabMap(
+ page = page,
+ title = '3D Map',
+ domid = 'senslabmap',
+ query = sq_resource,
+ query_all = query_resource_all,
+ )
+
+ resources_as_list = QueryTable(
page = page,
domid = 'resources-list',
title = 'List view',
},
)
- resources_stats_cpu = Slicestat(
- title = "CPU Usage",
- domid = 'resources-stats-cpu',
- page = page,
- stats = 'slice',
- key = 'hrn',
- query = 'none',
- slicename = slicename,
- o = 'cpu'
+ resources_as_scheduler = Scheduler(
+ page = page,
+ title = 'Scheduler',
+ domid = 'scheduler',
+ query = sq_resource,
+ query_lease = sq_lease,
)
-
- 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 querytable
resources_as_list_area = resources_as_list
resources_area = Tabs ( page=page,
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_scheduler,
+ #resources_as_gmap,
+ #resources_as_3dmap,
+ resources_as_list_area, ],
active_domid = 'resources-map',
)
main_stack.insert (resources_area)
# --------------------------------------------------------------------------
# USERS
-<<<<<<< HEAD
if do_query_users:
tab_users = Tabs(
page = page,
)
main_stack.insert(tab_users)
- tab_users.insert(Hazelnut(
+ tab_users.insert(QueryTable(
page = page,
title = 'Users List',
domid = 'users-list',
'bAutoWidth' : True,
},
))
-
-
-=======
- if do_query_users:
- tab_users = Tabs(
- page = page,
- domid = 'users',
- outline_complete = True,
- togglable = True,
- title = 'Users',
- active_domid = 'users-list',
- )
- main_stack.insert(tab_users)
-
- tab_users.insert(Hazelnut(
- page = page,
- title = 'Users List',
- domid = 'users-list',
- # tab's sons preferably turn this off
- togglable = False,
- # this is the query at the core of the slice list
- query = sq_user,
- query_all = query_user_all,
- checkboxes = True,
- datatables_options = {
- 'iDisplayLength' : 25,
- 'bLengthChange' : True,
- 'bAutoWidth' : True,
- },
- ))
->>>>>>> 0c8a634162f3271018102e75a3934c5db5e48f59
+
# 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,
+ toggled = False,
+ 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',
# )
# main_stack.insert(tab_measurements)
#
-# tab_measurements.insert(Hazelnut(
+# tab_measurements.insert(QueryTable(
# page = page,
# title = 'Measurements',
# domid = 'measurements-list',
#
# # --------------------------------------------------------------------------
# # MESSAGES (we use transient=False for now)
-# main_stack.insert(Messages(
-# page = page,
-# title = "Runtime messages for slice %s"%slicename,
-# domid = "msgs-pre",
-# levels = "ALL",
-# # plain messages are probably less nice for production but more reliable for development for now
-# transient = False,
-# # these make sense only in non-transient mode..
-# togglable = True,
-# toggled = 'persistent',
-# outline_complete = True,
-# ))
-#
+ if insert_messages:
+ main_stack.insert(Messages(
+ page = page,
+ title = "Runtime messages for slice %s"%slicename,
+ domid = "msgs-pre",
+ levels = "ALL",
+ # plain messages are probably less nice for production but more reliable for development for now
+ transient = False,
+ # these make sense only in non-transient mode..
+ togglable = True,
+ toggled = 'persistent',
+ outline_complete = True,
+ ))
+
# variables that will get passed to the view-unfold1.html template
template_env = {}
- # define 'unfold1_main' to the template engine - the main contents
- template_env [ 'unfold1_main' ] = main_stack.render(request)
+ # define 'unfold_main' to the template engine - the main contents
+ template_env [ 'unfold_main' ] = main_stack.render(request)
# more general variables expected in the template
template_env [ 'title' ] = '%(slicename)s'%locals()
git://git.onelab.eu / myslice.git / blobdiff