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

Feature #2848: Always include VM info in VMware monitor probe

Browse Source
This commit is contained in:
Ruben S. Montero 2014-04-25 13:13:53 +02:00
parent 4f1ee25ddd
commit 91b1635437
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/vmm_mad/remotes/vmware/vi_driver.rb
View File

@ -104,7 +104,8 @@ def self.poll_host_and_vms
str_info = @@host.info
vms_info = @@host.all_vms_info
str_info << "\nVM_POLL=YES\n#{vms_info}" if !vms_info.empty?
str_info << "\nVM_POLL=YES\n"
str_info << "#{vms_info}" if !vms_info.empty?
rescue Exception => e
STDERR.puts e.message
@ -253,7 +254,7 @@ class VIVm
host = VIDriver::host
cpuMhz = host.cpuMhz.to_f
@used_cpu =
@used_cpu =
((@summary.quickStats.overallCpuUsage.to_f / cpuMhz) * 100).to_s
@used_cpu = sprintf('%.2f',@used_cpu).to_s
@ -474,11 +475,11 @@ def self.retrieve_free_ds(host)
free_ds_info=Hash.new
hds.datastore.each{|ds|
hds.datastore.each{|ds|
free_ds_info[datastore_props[ds]['name']]=Hash.new
free_ds_info[datastore_props[ds]['name']][:free_space] =
free_ds_info[datastore_props[ds]['name']][:free_space] =
datastore_props[ds]['summary'].freeSpace.to_i / 1024 / 1024
free_ds_info[datastore_props[ds]['name']][:capacity] =
free_ds_info[datastore_props[ds]['name']][:capacity] =
datastore_props[ds]['summary'].capacity.to_i / 1024 / 1024
}