Small changes to the node list output

This is just some cleanup of the node list output, adding pcpu/vcpu
counters, and making the display slightly nicer.

diff --git a/Ganeti/HTools/Cluster.hs b/Ganeti/HTools/Cluster.hs
index f42798c..fc5992c 100644 (file)
--- a/Ganeti/HTools/Cluster.hs
+++ b/Ganeti/HTools/Cluster.hs
@@ -783,10 +783,11 @@ printNodes nl =
         m_name = maximum . map (length . Node.name) $ snl
         helper = Node.list m_name
         header = printf
-                 "%2s %-*s %5s %5s %5s %5s %5s %5s %5s %5s %3s %3s %7s %7s %7s"
+                 "%2s %-*s %5s %5s %5s %5s %5s %5s %5s %5s %4s %4s \
+                 \%3s %3s %6s %6s %5s"
                  " F" m_name "Name"
                  "t_mem" "n_mem" "i_mem" "x_mem" "f_mem" "r_mem"
-                 "t_dsk" "f_dsk"
+                 "t_dsk" "f_dsk" "pcpu" "vcpu"
                  "pri" "sec" "p_fmem" "p_fdsk" "r_cpu"
     in unlines $ (header:map helper snl)
 

diff --git a/Ganeti/HTools/Node.hs b/Ganeti/HTools/Node.hs
index e79d5f5..e9237ae 100644 (file)
--- a/Ganeti/HTools/Node.hs
+++ b/Ganeti/HTools/Node.hs
@@ -301,8 +301,8 @@ addSec t inst pdx =
 -- | String converter for the node list functionality.
 list :: Int -> Node -> String
 list mname t =
-    let pl = plist t
-        sl = slist t
+    let pl = length $ plist t
+        sl = length $ slist t
         mp = p_mem t
         dp = p_dsk t
         cp = p_cpu t
@@ -314,10 +314,14 @@ list mname t =
         fmem = f_mem t
         imem = (truncate tmem) - nmem - xmem - fmem
     in
-      printf " %c %-*s %5.0f %5d %5d %5d %5d %5d %5.0f %5d %3d %3d\
-             \ %.5f %.5f %.5f"
+      if off
+         then printf " - %-*s %57s %3d %3d"
+              mname (name t) "" pl sl
+         else
+             printf " %c %-*s %5.0f %5d %5d %5d %5d %5d %5.0f %5d\
+                    \ %4.0f %4d %3d %3d %6.4f %6.4f %5.2f"
                  (if off then '-' else if fn then '*' else ' ')
                  mname (name t) tmem nmem imem xmem fmem (r_mem t)
                  ((t_dsk t) / 1024) ((f_dsk t) `div` 1024)
-                 (length pl) (length sl)
-                 mp dp cp
+                 (t_cpu t) (u_cpu t)
+                 pl sl mp dp cp