X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=4037e753801eb9bf6ff722681e1144362155c6d5;hb=83f238a32f62a34370f24d69e85823c709d95627;hp=15a5e51a502e28c11ad64d41df51f74ce56c5410;hpb=0c8a634162f3271018102e75a3934c5db5e48f59;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 15a5e51a..4037e753 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -11,7 +11,7 @@ from ui.topmenu                      import topmenu_items, the_user
 from plugins.raw                     import Raw
 from plugins.stack                   import Stack
 from plugins.tabs                    import Tabs
-from plugins.hazelnut                import Hazelnut 
+from plugins.querytable              import QueryTable 
 from plugins.resources_selected      import ResourcesSelected
 from plugins.googlemap               import GoogleMap
 from plugins.senslabmap              import SensLabMap
@@ -20,6 +20,7 @@ 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
 
@@ -159,7 +160,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             zoom       = 4,
         )
 
-        resources_as_list = Hazelnut( 
+        resources_as_list = QueryTable( 
             page       = page,
             domid      = 'resources-list',
             title      = 'List view',
@@ -174,7 +175,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
-        # 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, 
@@ -182,45 +183,100 @@ class SliceView (LoginRequiredAutoLogoutView):
                                 togglable=True,
                                 title="Resources",
                                 outline_complete=True,
-                                sons=[ resources_as_map, resources_as_list_area, ],
+                                sons=[ resources_as_map, resources_as_list_area ],
                                 active_domid = 'resources-map',
                                 )
         main_stack.insert (resources_area)
 
-
         # --------------------------------------------------------------------------
         # USERS
     
-#        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,
-#                },
-#            ))
+        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(QueryTable( 
+                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,
+                },
+            ))
+
 # 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',
@@ -231,7 +287,7 @@ class SliceView (LoginRequiredAutoLogoutView):
 #        )
 #        main_stack.insert(tab_measurements)
 #    
-#        tab_measurements.insert(Hazelnut( 
+#        tab_measurements.insert(QueryTable( 
 #            page        = page,
 #            title       = 'Measurements',
 #            domid       = 'measurements-list',
@@ -268,8 +324,8 @@ class SliceView (LoginRequiredAutoLogoutView):
         # 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()