shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

feature #1285: Use same units in onevm show as in onevm list

Browse Source
This commit is contained in:
Tino Vazquez 2012-07-03 19:08:36 +02:00
parent 989b1d1fbc
commit 12ed90eb5c
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cli/etc/onevm.yaml
View File

@ -22,11 +22,11 @@
:desc: Actual status
:size: 4
:CPU:
:UCPU:
:desc: CPU percentage used by the VM
:size: 3
:MEM:
:UMEM:
:desc: Memory used by the VM
:size: 7
@ -44,7 +44,7 @@
- :GROUP
- :NAME
- :STAT
- :CPU
- :MEM
- :UCPU
- :UMEM
- :HOST
- :TIME

17
src/cli/one_helper/onevm_helper.rb
View File

@ -111,11 +111,11 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
OneVMHelper.state_to_str(d["STATE"], d["LCM_STATE"])
end
column :CPU, "CPU percentage used by the VM", :size=>3 do |d|
column :UCPU, "CPU percentage used by the VM", :size=>3 do |d|
d["CPU"]
end
column :MEM, "Memory used by the VM", :size=>7 do |d|
column :UMEM, "Memory used by the VM", :size=>7 do |d|
OpenNebulaHelper.unit_to_str(d["MEMORY"].to_i, options)
end
@ -135,7 +135,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
OpenNebulaHelper.period_to_str(dtime)
end
default :ID, :USER, :GROUP, :NAME, :STAT, :CPU, :MEM, :HOST,
default :ID, :USER, :GROUP, :NAME, :STAT, :UCPU, :UMEM, :HOST,
:TIME
end
@ -188,8 +188,17 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
"USED CPU" => "CPU",
"NET_TX" => "NET_TX",
"NET_RX" => "NET_RX"
}
poll_attrs.each { |k,v|
if k == "USED CPU"
puts str % [k,vm[v]]
elsif k == "USED MEMORY"
puts str % [k, OpenNebulaHelper.unit_to_str(vm[v].to_i, {})]
else
puts str % [k, OpenNebulaHelper.unit_to_str(vm[v].to_i/1024, {})]
end
}
poll_attrs.each { |k,v| puts str % [k,vm[v]] }
puts
CLIHelper.print_header(str_h1 % "PERMISSIONS",false)