from manifold.core.query import Query, AnalyzedQuery
from manifold.manifoldapi import execute_query
-from ui.topmenu import topmenu_items, the_user
+from ui.topmenu import topmenu_items_live, the_user
from plugins.raw import Raw
from plugins.stack import Stack
from plugins.queryupdater import QueryUpdater
from plugins.googlemap import GoogleMap
from plugins.senslabmap import SensLabMap
-from plugins.scheduler import Scheduler
+#from plugins.scheduler import Scheduler
+from plugins.scheduler2 import Scheduler2
from plugins.querycode import QueryCode
# Thierry
# stay away from query editor for now as it seems to make things go very slow
# see https://lists.myslice.info/pipermail/devel-myslice/2013-December/000221.html
-#from plugins.query_editor import QueryEditor
+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 myslice.config import Config
+from myslice.configengine import ConfigEngine
tmp_default_slice='ple.upmc.myslicedemo'
# temporary : turn off the users part to speed things up
-do_query_users=True
-#do_query_users=False
+#do_query_users=True
+do_query_users=False
#do_query_leases=True
do_query_leases=False
page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });')
page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
page.add_js_chunks ('$(function() { messages.debug("sliceview: leases turned %s"); });'%("on" if do_query_leases else "off"))
- config=Config()
- page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
- page.expose_js_metadata()
-
+ page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(ConfigEngine().manifold_url()))
+
metadata = page.get_metadata()
resource_md = metadata.details_by_object('resource')
resource_fields = [column['name'] for column in resource_md['column']]
main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
main_query.select(
'slice_hrn',
- 'resource.hrn', 'resource.urn', 'resource.hostname', 'resource.type',
+ #'resource.hrn', 'resource.urn',
+ 'resource.hostname', 'resource.type',
'resource.network_hrn',
'lease.urn',
'user.user_hrn',
)
# for internal use in the querytable plugin;
# needs to be a unique column present for each returned record
- #main_query_key = 'hrn'
+ main_query_init_key = 'hostname'
query_resource_all = Query.get('resource').select(resource_fields)
# not always found in user_details...
config={}
- for user_detail in user_details:
- #email = user_detail['email']
- if user_detail['config']:
- config = json.loads(user_detail['config'])
- user_detail['authority'] = config.get('authority',"Unknown Authority")
-
- if user_detail['authority'] is not None:
- sub_authority = user_detail['authority'].split('.')
- root_authority = sub_authority[0]
- query_user_all = Query.get(root_authority+':user').select(user_fields)
-
- # XXX TODO this filter doesn't work - to be improved in Manifold
- #.filter_by('authority.authority_hrn', '=', user_detail['authority'])
-
- page.enqueue_query(query_user_all)
- else:
- print "authority of the user is not in local:user db"
- query_user_all = Query.get('user').select(user_fields)
+# for user_detail in user_details:
+# #email = user_detail['email']
+# if user_detail['config']:
+# config = json.loads(user_detail['config'])
+# user_detail['authority'] = config.get('authority',"Unknown Authority")
+#
+# if user_detail['authority'] is not None:
+# sub_authority = user_detail['authority'].split('.')
+# root_authority = sub_authority[0]
+# query_user_all = Query.get(root_authority+':user').select(user_fields)
+#
+# # XXX TODO this filter doesn't work - to be improved in Manifold
+# #.filter_by('authority.authority_hrn', '=', user_detail['authority'])
+#
+# page.enqueue_query(query_user_all)
+# else:
+# print "authority of the user is not in local:user db"
+ query_user_all = Query.get('user').select(user_fields)
# query_user_all = None
# ... and for the relations
# Filter Resources
# turn off for now -- see above
-# filter_query_editor = QueryEditor(
-# page = page,
-# query = sq_resource,
-# query_all = query_resource_all,
-# title = "Select Columns",
-# domid = 'select-columns',
-# )
+ filter_query_editor = QueryEditor(
+ page = page,
+ query = sq_resource,
+ query_all = query_resource_all,
+ title = "Select Columns",
+ domid = 'select-columns',
+ )
filter_active_filters = ActiveFilters(
page = page,
query = sq_resource,
page = page,
title = 'Filter Resources',
domid = 'filters',
- sons = [# filter_query_editor,
+ sons = [filter_query_editor,
filter_active_filters],
togglable = True,
toggled = 'persistent',
togglable = False,
query = sq_resource,
query_all = query_resource_all,
- googlemap_api_key = Config().googlemap_api_key(),
+ # this key is the one issued by google
+ googlemap_api_key = ConfigEngine().googlemap_api_key(),
+ # the key to use at init-time
+ init_key = main_query_init_key,
checkboxes = True,
# center on Paris
latitude = 49.,
# this is the query at the core of the slice list
query = sq_resource,
query_all = query_resource_all,
- # safer to use 'hrn' as the internal unique key for this plugin
- #id_key = main_query_key,
+ init_key = main_query_init_key,
checkboxes = True,
datatables_options = {
'iDisplayLength': 25,
# this is the query at the core of the slice list
query = sq_resource,
query_all = query_resource_all,
- # safer to use 'hrn' as the internal unique key for this plugin
- id_key = main_query_key,
+ init_key = main_query_init_key,
checkboxes = True,
)
- if do_query_leases:
- resources_as_scheduler = Scheduler(
- page = page,
- title = 'Scheduler',
- domid = 'scheduler',
- query = sq_resource,
- query_all_resources = query_resource_all,
- query_lease = sq_lease,
- )
+
+
+ #if do_query_leases:
+ # resources_as_scheduler = Scheduler(
+
+ # page = page,
+ # title = 'Scheduler',
+ # domid = 'scheduler',
+ # query = sq_resource,
+ # query_all_resources = query_resource_all,
+ # query_lease = sq_lease,
+
+ # )
+
+ resources_as_scheduler2 = Scheduler2(
+ page = page,
+ domid = 'scheduler',
+ title = 'Scheduler',
+ # this is the query at the core of the slice list
+ query = sq_resource,
+ query_all_resources = query_resource_all,
+ query_lease = sq_lease,
+ )
# with the new 'Filter' stuff on top, no need for anything but the querytable
resources_as_list_area = resources_as_list
resources_sons = [
resources_as_gmap,
resources_as_3dmap,
- resources_as_scheduler,
+ resources_as_scheduler2,
resources_as_list_area,
] if do_query_leases else [
resources_as_gmap,
resources_as_3dmap,
resources_as_list_area,
+ resources_as_scheduler2,
]
if insert_grid:
resources_sons.append(resources_as_grid)
- print 40*'+-',"resources_sons has",len(resources_sons),"son"
-
resources_area = Tabs ( page=page,
domid="resources",
togglable=True,
title="Resources",
outline_complete=True,
sons= resources_sons,
- active_domid = 'resources-map',
+
+ active_domid = 'scheduler',
persistent_active=True,
)
main_stack.insert (resources_area)
)
tab_measurements = Tabs ( page=page,
- domid="measurements",
- togglable=True,
- toggled = False,
- title="Measurements",
+ domid = "measurements",
+ togglable = True,
+ toggled = 'persistent',
+ title = "Measurements",
outline_complete=True,
- sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],
- active_domid = 'measurements_stats_cpu',
+ sons = [ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],
+ active_domid = 'resources-stats-cpu',
+ persistent_active = True,
)
main_stack.insert (tab_measurements)
outline_complete = True,
))
-
# variables that will get passed to the view-unfold1.html template
template_env = {}
# more general variables expected in the template
template_env [ 'title' ] = '%(slicename)s'%locals()
# the menu items on the top
- template_env [ 'topmenu_items' ] = topmenu_items('Slice', request)
+ template_env [ 'topmenu_items' ] = topmenu_items_live('Slice', page)
# so we can sho who is logged
template_env [ 'username' ] = the_user (request)
# don't forget to run the requests
- page.expose_queries ()
-
- # xxx create another plugin with the same query and a different layout (with_datatables)
- # show that it worls as expected, one single api call to backend and 2 refreshed views
-
+ page.expose_js_metadata()
# the prelude object in page contains a summary of the requirements() for all plugins
# define {js,css}_{files,chunks}
- prelude_env = page.prelude_env()
- template_env.update(prelude_env)
- result=render_to_response ('view-unfold1.html',template_env,
+ template_env.update(page.prelude_env())
+
+ return render_to_response ('view-unfold1.html',template_env,
context_instance=RequestContext(request))
- return result
git://git.onelab.eu / myslice.git / blobdiff