shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-02 10:50:07 +03:00
Code Releases Wiki Activity

bug #1492: Check if max_mem/max_cpu is 0

Browse Source
This commit is contained in:
Daniel Molina 2012-10-18 14:04:04 +02:00
parent 28e9fec89c
commit 16b8e86d46
2 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,19 +43,19 @@
:ALLOCATED_CPU:
:desc: Allocated CPU
:size: 20
:size: 18
:REAL_CPU:
:desc: Real CPU
:size: 20
:size: 18
:ALLOCATED_MEM:
:desc: Allocated MEM
:size: 20
:size: 18
:REAL_MEM:
:desc: Real MEM
:size: 20
:size: 18
:STAT:
:desc: Host status

63
src/cli/one_helper/onehost_helper.rb
View File

@ -87,45 +87,54 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
OpenNebulaHelper.unit_to_str(acpu,options)
end
column :REAL_CPU, "Real CPU", :size=>15 do |d|
column :REAL_CPU, "Real CPU", :size=>18 do |d|
max_cpu = d["HOST_SHARE"]["MAX_CPU"].to_i
used_cpu = d["HOST_SHARE"]["USED_CPU"].to_i
ratio = (used_cpu*100) / max_cpu
"#{used_cpu} / #{max_cpu} (#{ratio}%)"
if max_cpu != 0
used_cpu = d["HOST_SHARE"]["USED_CPU"].to_i
ratio = (used_cpu*100) / max_cpu
"#{used_cpu} / #{max_cpu} (#{ratio}%)"
else
'-'
end
end
column :ALLOCATED_CPU, "Allocated CPU)", :size=>15 do |d|
column :ALLOCATED_CPU, "Allocated CPU)", :size=>18 do |d|
max_cpu = d["HOST_SHARE"]["MAX_CPU"].to_i
cpu_usage = d["HOST_SHARE"]["CPU_USAGE"].to_i
ratio = (cpu_usage*100) / max_cpu
"#{cpu_usage} / #{max_cpu} (#{ratio}%)"
if max_cpu != 0
cpu_usage = d["HOST_SHARE"]["CPU_USAGE"].to_i
ratio = (cpu_usage*100) / max_cpu
"#{cpu_usage} / #{max_cpu} (#{ratio}%)"
else
'-'
end
end
column :REAL_MEM, "Real MEM", :size=>15 do |d|
column :REAL_MEM, "Real MEM", :size=>18 do |d|
max_mem = d["HOST_SHARE"]["MAX_MEM"].to_i
used_mem = d["HOST_SHARE"]["USED_MEM"].to_i
ratio = (used_mem*100) / max_mem
"#{OpenNebulaHelper.unit_to_str(used_mem,options)} / #{OpenNebulaHelper.unit_to_str(max_mem,options)} (#{ratio}%)"
if max_mem != 0
used_mem = d["HOST_SHARE"]["USED_MEM"].to_i
ratio = (used_mem*100) / max_mem
"#{OpenNebulaHelper.unit_to_str(used_mem,options)} / #{OpenNebulaHelper.unit_to_str(max_mem,options)} (#{ratio}%)"
else
'-'
end
end
column :ALLOCATED_MEM, "Allocated MEM", :size=>15 do |d|
column :ALLOCATED_MEM, "Allocated MEM", :size=>18 do |d|
max_mem = d["HOST_SHARE"]["MAX_MEM"].to_i
mem_usage = d["HOST_SHARE"]["MEM_USAGE"].to_i
ratio = (mem_usage*100) / max_mem
"#{OpenNebulaHelper.unit_to_str(mem_usage,options)} / #{OpenNebulaHelper.unit_to_str(max_mem,options)} (#{ratio}%)"
if max_mem != 0
mem_usage = d["HOST_SHARE"]["MEM_USAGE"].to_i
ratio = (mem_usage*100) / max_mem
"#{OpenNebulaHelper.unit_to_str(mem_usage,options)} / #{OpenNebulaHelper.unit_to_str(max_mem,options)} (#{ratio}%)"
else
'-'
end
end
column :STAT, "Host status", :left, :size=>6 do |d|
OneHostHelper.state_to_str(d["STATE"])
end