Return human sizes in 2^10 units (gibi, mebi etc)

Label them as such.

Return more info for Block storage objects too.

Signed-off-by: Andy Grover <agrover@redhat.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py
index 5c93516..95682b8 100644
--- a/targetcli/ui_backstore.py
+++ b/targetcli/ui_backstore.py
@@ -64,8 +64,9 @@ def human_to_bytes(hsize, kilo=1024):
 
     return size * (int(kilo) ** power)
 
-def bytes_to_human(size, kilo=1024.0):
-    for x in ['bytes','K','M','G','T']:
+def bytes_to_human(size):
+    kilo = 1024.0
+    for x in ['bytes','KiB','MiB','GiB','TiB', 'PiB']:
         if size < kilo:
             return "%3.1f%s" % (size, x)
         size /= kilo
@@ -389,4 +390,11 @@ class UIFileioStorageObject(UIStorageObject):
 class UIBlockStorageObject(UIStorageObject):
     def summary(self):
         so = self.rtsnode
-        return ("%s %s" % (so.udev_path, so.status), True)
+
+        if so.write_back:
+            wb_str = "write-back"
+        else:
+            wb_str = "write-thru"
+
+        return ("%s (%s) %s %s" % (so.udev_path, bytes_to_human(so.size),
+                                   wb_str, so.status), True)