diff --git a/src/cli/client_utilities.rb b/src/cli/client_utilities.rb index f35d7189ca..033e9ecba7 100644 --- a/src/cli/client_utilities.rb +++ b/src/cli/client_utilities.rb @@ -20,6 +20,24 @@ require 'OpenNebula' # CONSOLE UTILITIES # ##################### +BinarySufix = ["K", "M", "G", "T" ] + +def humanize_size(value) + i=0 + + while value > 1024 && i < 3 do + value /= 1024.0 + i+=1 + end + + value = (value * 10).round / 10.0 + + value = value.to_i if value - value.round == 0 + st = value.to_s + BinarySufix[i] + + return st +end + # Sets bold font def scr_bold print "\33[1m" @@ -122,6 +140,8 @@ class ShowTable dat=d[c] col=@columns[c] + dat = humanize_size( Float(dat) ) if( @table[col][:kbytes] ) + format_data(col, dat) if @table[col] }.join(' ') }.join("\n") diff --git a/src/cli/onehost b/src/cli/onehost index 7d49757a36..c05c18fd32 100755 --- a/src/cli/onehost +++ b/src/cli/onehost @@ -87,12 +87,14 @@ ShowTableHost={ :name => "TMEM", :desc => "Total memory", :size => 7, + :kbytes => true, :proc => lambda {|d,e| d["HOST_SHARE/MAX_MEM"] } }, :fmem => { :name => "FMEM", :desc => "Free memory", :size => 7, + :kbytes => true, :proc => lambda {|d,e| d["HOST_SHARE/FREE_MEM"] } }, :stat => { diff --git a/src/cli/onevm b/src/cli/onevm index 255e7772dd..955b3b6c43 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -75,6 +75,7 @@ ShowTableVM={ :name => "MEM", :desc => "Memory used by the VM", :size => 7, + :kbytes => true, :proc => lambda {|d,e| d["MEMORY"] } }, :hostname => {