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

Feature : remove total disk size from onevm and calculate it for oneacct

Browse Source
This commit is contained in:
Jaime Melis 2015-06-30 12:26:11 +02:00
parent 7c30cbbb38
commit 979aa0d00a
2 changed files with 19 additions and 5 deletions

19
src/cli/one_helper/oneacct_helper.rb

@ -167,7 +167,24 @@ class AcctHelper < OpenNebulaHelper::OneHelper
column :TOTAL_DISK_SIZE, "Total disk size used", :size=>6 do |d|
# DISK size is measured in mb, unit_to_str expects KBytes
OpenNebulaHelper.unit_to_str(d["VM"]["MONITORING/TOTAL_DISK_SIZE"].to_i * 1024.0, {})
total_disk_size = 0
vm_id = d["VM"]["ID"].to_i
disks_all = [d["VM"]["TEMPLATE"]["DISK"]].flatten.compact rescue []
disks_all.each do |disk|
total_disk_size += disk["SIZE"].to_i
end
snapshots_all = [d["VM"]["SNAPSHOTS"]].flatten.compact rescue []
snapshots_all.each do |snapshot|
snapshot_disk = [snapshot["SNAPSHOT"]].flatten.compact rescue []
snapshot_disk.each do |snapshot|
total_disk_size += snapshot["SIZE"].to_i
end
end
OpenNebulaHelper.unit_to_str(total_disk_size * 1024.0, {})
end
default :VID, :HOSTNAME, :ACTION, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NETRX, :NETTX, :TOTAL_DISK_SIZE

5
src/cli/one_helper/onevm_helper.rb

@ -506,8 +506,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
"MEMORY" => "MONITORING/MEMORY",
"CPU" => "MONITORING/CPU",
"NETTX" => "MONITORING/NETTX",
"NETRX" => "MONITORING/NETRX",
"TOTAL DISK SIZE" => "MONITORING/TOTAL_DISK_SIZE"
"NETRX" => "MONITORING/NETRX"
}
poll_attrs.each { |k,v|
@ -515,8 +514,6 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
puts str % [k,vm[v]]
elsif k == "MEMORY"
puts str % [k, OpenNebulaHelper.unit_to_str(vm[v].to_i, {})]
elsif k =~ /DISK/
puts str % [k, OpenNebulaHelper.unit_to_str(vm[v].to_i*1024, {})]
else
puts str % [k, OpenNebulaHelper.unit_to_str(vm[v].to_i/1024, {})]
end