X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=8461b1a6e7bcf21331b9fe70e3f46dc9994c62f4;hb=83f3bc8abee6f1312ad9a0a24e63871fc1ee8b16;hp=44effc9ab2303eef223fefbdb146f5c36cda6d16;hpb=a1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8;p=unfold.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 44effc9a..8461b1a6 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -20,7 +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 plugins.slicestat               import SliceStat
 
 from myslice.config                  import Config
 
@@ -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)
@@ -235,7 +191,6 @@ class SliceView (LoginRequiredAutoLogoutView):
         # --------------------------------------------------------------------------
         # USERS
     
-<<<<<<< HEAD
         if do_query_users:
             tab_users = Tabs(
                 page                = page,
@@ -263,40 +218,65 @@ class SliceView (LoginRequiredAutoLogoutView):
                     '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',