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

F #3112: Bugs fixed (#3312)

Browse Source
This commit is contained in:
sergiojvg 2019-05-08 04:41:02 -05:00 committed by Tino Vázquez
parent 27e0a16a25
commit 46e0adb5cd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb
View File

@ -389,8 +389,8 @@ class Template
end
def find_ips_in_network(network, vm_object)
ipv4 = ipv6 = ""
if vm?
ipv4 = ipv6 = String.new
return if !vm_object.is_a?(VCenterDriver::VirtualMachine)
network.info
@ -400,7 +400,7 @@ class Template
if nic[:mac] == mac
net.ipConfig.ipAddress.each do |ip_config|
ip = IPAddr.new(ip_config.ipAddress)
ar_array = network_found.to_hash['VNET']['AR_POOL']['AR']
ar_array = network.to_hash['VNET']['AR_POOL']['AR']
ar_array = [ar_array] if ar_array.is_a?(Hash)
ipv4, ipv6 = find_ip_in_ar(ip, ar_array) if ar_array
end
@ -467,7 +467,7 @@ class Template
nic_tmp = "NIC=[\n"
nic_tmp << "NETWORK_ID=\"#{network_found["ID"]}\",\n"
ipv4, ipv6 = find_ips_in_network(network_found, vm_object) if vm?
ipv4, ipv6 = find_ips_in_network(network_found, vm_object, nic)
ar_tmp = create_ar(nic)
network_found.add_ar(ar_tmp)