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

feature #1678: Adjust VMware datastore space monitoring to agreed format

Browse Source
This commit is contained in:
Tino Vazquez 2013-10-21 14:32:17 +02:00
parent 7a02a4cf96
commit 2301fd516a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,7 +371,7 @@ class VIHost
@net_tx = 0 if @net_tx.to_i < 0
# Check free datastore space
@free_ds_info = VIDriver::retrieve_free_ds_space(@host)
@free_ds_info = VIDriver::retrieve_free_ds(@host)
end
########################################################################
@ -398,8 +398,10 @@ class VIHost
# Datastores
@free_ds_info.each{|k,v|
str_info << "DS_#{k}_FREE_MB=" << v[:free_space] << "\n"
str_info << "DS_#{k}_TOTAL_MB=" << v[:capacity] << "\n"
used_space = v[:capacity].to_i - v[:free_space].to_i
str_info << "DS=[ID=#{k},USED_MB=#{used_space},"
str_info << "TOTAL_MB=#{v[:capacity]},"
str_info << "FREE_MB=#{v[:free_space]}]\n"
}
str_info.strip
@ -473,10 +475,11 @@ def self.retrieve_free_ds(host)
free_ds_info=Hash.new
hds.datastore.each{|ds|
free_ds_info[datastore_props[ds]['name']]=Hash.new
free_ds_info[datastore_props[ds]['name']][:free_space] =
datastore_props[ds]['summary'].freeSpace
datastore_props[ds]['summary'].freeSpace.to_i / 1024 / 1024
free_ds_info[datastore_props[ds]['name']][:capacity] =
datastore_props[ds]['summary'].capacity
datastore_props[ds]['summary'].capacity.to_i / 1024 / 1024
}
free_ds_info