shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-28 17:57:22 +03:00
Code Releases Wiki Activity

F #1518: Support for Ruby < 2.1, minor improvements (#2104)

Browse Source
This commit is contained in:
Sergio Semedi Barranco 2018-05-18 11:23:21 +02:00 committed by Tino Vázquez
parent f96db2f55d
commit 41a167e24f
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
View File

@ -709,7 +709,23 @@ class Template
end
def get_vcenter_nics
parse_live = ->(inets_raw) {
h = nil
begin
h = inets_raw.to_h
rescue NoMethodError
h = {}
inets_raw.each do |nic_dev|
h[nic_dev[0]] = nic_dev[1]
end
end
return h
}
nics = []
inets_raw = nil
inets = {}
num_device = 0
@item["config.hardware.device"].each do |device|
next unless is_nic?(device)
@ -718,7 +734,9 @@ class Template
nic[:mac] = device.macAddress rescue nil
if wild?
if online?
inets = @item["guest.net"].map.with_index { |x,i| [x.macAddress, x] }.to_h
inets_raw = @item["guest.net"].map.with_index { |x,i| [x.macAddress, x] } unless inets_raw
inets = parse_live.call(inets_raw) if inets.empty?
ipAddresses = inets[nic[:mac]].ipConfig.ipAddress
if !ipAddresses.nil? && !ipAddresses.empty?
nic[:ipv4], nic[:ipv4_additionals] = nil
@ -729,6 +747,7 @@ class Template
end
nics << nic
end
return nics
end