X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=0c32b4014bea70996308fb1bb873cf67d7d669cd;hb=fcd452b931fcc40fd82807d2c0affdd0d951d9e3;hp=c1dcdbf3d68f6350b9d6cb5d40147ff2e6e885c4;hpb=0c12a2033bcb737c05c472cb069a288f44b3872a;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index c1dcdbf3..0c32b401 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -15,6 +15,7 @@ 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
@@ -30,6 +31,12 @@ tmp_default_slice='ple.upmc.myslicedemo'
 #do_query_users=True
 do_query_users=False
 
+#do_query_leases=True
+do_query_leases=False
+
+insert_messages=False
+#insert_messages=True
+
 class SliceView (LoginRequiredAutoLogoutView):
 
     def get (self,request, slicename=tmp_default_slice):
@@ -39,6 +46,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         page.add_js_files  ( [ "js/common.functions.js" ] )
         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()
@@ -56,10 +64,13 @@ class SliceView (LoginRequiredAutoLogoutView):
                 'slice_hrn',
                 'resource.hrn', 'resource.hostname', 'resource.type', 
                 'resource.network_hrn',
-                #'lease.urn',
+                'lease.urn',
                 'user.user_hrn',
                 #'application.measurement_point.counter'
         )
+        # for internal use in the querytable plugin;
+        # needs to be a unique column present for each returned record
+        main_query_key = 'hrn'
     
         query_resource_all = Query.get('resource').select(resource_fields)
         if do_query_users:
@@ -145,7 +156,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         # 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',
@@ -153,6 +164,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             togglable  = False,
             query      = sq_resource,
             query_all  = query_resource_all,
+            googlemap_api_key = Config().googlemap_api_key(),
             checkboxes = True,
             # center on Paris
             latitude   = 49.,
@@ -160,6 +172,14 @@ class SliceView (LoginRequiredAutoLogoutView):
             zoom       = 4,
         )
 
+        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',
@@ -167,6 +187,8 @@ class SliceView (LoginRequiredAutoLogoutView):
             # 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,
             checkboxes = True,
             datatables_options = { 
                 'iDisplayLength': 25,
@@ -175,16 +197,38 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
+        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,
+                )
+
        # 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_list_area,
+            ] if do_query_leases else [
+            resources_as_gmap, 
+            resources_as_3dmap,
+            resources_as_list_area,
+            ]
+
         resources_area = Tabs ( page=page, 
                                 domid="resources",
                                 togglable=True,
                                 title="Resources",
                                 outline_complete=True,
-                                sons=[ resources_as_map, resources_as_list_area ],
+                                sons= resources_sons,
                                 active_domid = 'resources-map',
+                                persistent_active=True,
                                 )
         main_stack.insert (resources_area)
 
@@ -307,19 +351,20 @@ class SliceView (LoginRequiredAutoLogoutView):
 #    
 #        # --------------------------------------------------------------------------
 #        # 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 = {}