gnt-instance info prints information about spindles

For each disk, the number of requested spindles (if present) is shown.

Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>

diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 07db3a6..4d26aac 100644 (file)
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -1027,6 +1027,8 @@ def _FormatBlockDevInfo(idx, top_level, dev, roman):
     nice_size = str(dev["size"])
   data = [(txt, "%s, size %s" % (dev["dev_type"], nice_size))]
   if top_level:
+    if dev["spindles"] is not None:
+      data.append(("spindles", dev["spindles"]))
     data.append(("access mode", dev["mode"]))
   if dev["logical_id"] is not None:
     try:

diff --git a/lib/cmdlib/instance_query.py b/lib/cmdlib/instance_query.py
index d8c5363..24b5613 100644 (file)
--- a/lib/cmdlib/instance_query.py
+++ b/lib/cmdlib/instance_query.py
@@ -355,6 +355,7 @@ class LUInstanceQueryData(NoHooksLU):
       "children": dev_children,
       "mode": dev.mode,
       "size": dev.size,
+      "spindles": dev.spindles,
       "name": dev.name,
       "uuid": dev.uuid,
       }