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

feature #4014: Change use same name for code and info

Browse Source 
(cherry picked from commit d63ecb8752036f321d2cf6db1351b93158779b87)
This commit is contained in:
Javi Fontan 2015-10-05 17:03:17 +02:00
parent bdf1e54f74
commit 2933cd6b85
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/vcenter/vcenter_driver.rb
View File

@ -1106,15 +1106,15 @@ class VCenterVm
@vmtools_ver = @vm.guest.toolsVersion
@vmtools_verst = @vm.guest.toolsVersionStatus
ip_addresses = []
guest_ip_addresses = []
@vm.guest.net.each do |net|
net.ipConfig.ipAddress.each do |ip|
ip_addresses << ip.ipAddress
guest_ip_addresses << ip.ipAddress
end if net.ipConfig && net.ipConfig.ipAddress
end if @vm.guest.net
@ip_addresses = ip_addresses.join(',')
@guest_ip_addresses = guest_ip_addresses.join(',')
end
########################################################################
@ -1126,8 +1126,9 @@ class VCenterVm
str_info = ""
str_info << "GUEST_IP=" << @guest_ip.to_s << " " if @guest_ip
if @ip_addresses && !@ip_addresses.empty?
str_info << "GUEST_IP_ADDRESSES=\\\"" << @ip_addresses.to_s << "\\\" "
if @guest_ip_addresses && !@guest_ip_addresses.empty?
str_info << "GUEST_IP_ADDRESSES=\\\"" <<
@guest_ip_addresses.to_s << "\\\" "
end
str_info << "STATE=" << @state << " "
str_info << "CPU=" << @used_cpu.to_s << " "