From 368f31a02d94d2695ffa033737e8a9d2b58d42e6 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 10 Jul 2015 10:58:52 +0200
Subject: [PATCH] Feature #3718: Add units to the onevm show disk and snapshot
 size columns

---
 src/cli/one_helper/onevm_helper.rb | 44 +++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index ceebd43786..ae09f8c5b9 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -594,8 +594,26 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 end
 
                 column :SIZE, "", :left, :size=>16 do |d|
-                    size         = d["SIZE"] || "-"
-                    monitor_size = d["MONITOR_SIZE"] || "-"
+                    if d["SIZE"]
+                        size = OpenNebulaHelper.unit_to_str(
+                                    d['SIZE'].to_i,
+                                    {},
+                                    "M"
+                                )
+                    else
+                        size = "-"
+                    end
+
+                    if d["MONITOR_SIZE"]
+                        monitor_size = OpenNebulaHelper.unit_to_str(
+                                    d['MONITOR_SIZE'].to_i,
+                                    {},
+                                    "M"
+                                )
+                    else
+                        monitor_size = "-"
+                    end
+
                     "#{monitor_size}/#{size}"
                 end
 
@@ -983,8 +1001,26 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end
 
             column :SIZE, "", :left, :size=>16 do |d|
-                size         = d["SIZE"] || "-"
-                monitor_size = d["MONITOR_SIZE"] || "-"
+                if d["SIZE"]
+                    size = OpenNebulaHelper.unit_to_str(
+                                d['SIZE'].to_i,
+                                {},
+                                "M"
+                            )
+                else
+                    size = "-"
+                end
+
+                if d["MONITOR_SIZE"]
+                    monitor_size = OpenNebulaHelper.unit_to_str(
+                                d['MONITOR_SIZE'].to_i,
+                                {},
+                                "M"
+                            )
+                else
+                    monitor_size = "-"
+                end
+
                 "#{monitor_size}/#{size}"
             end