From 04c09dd963f4e1d0a0d9793357ecbcb93ff35a91 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Fri, 5 Oct 2018 11:16:44 +0200 Subject: [PATCH] Fix minor vnet bug in vcenter --- src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb index 0987468e66..a0420a6594 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb @@ -660,10 +660,13 @@ class Template nic[:mac] = device.macAddress rescue nil if wild? if online? - inets_raw = @item["guest.net"].map.with_index { |x,i| [x.macAddress, x] } unless inets_raw + inets_raw ||= @item["guest.net"].map.with_index { |x,i| [x.macAddress, x] } inets = parse_live.call(inets_raw) if inets.empty? - ipAddresses = inets[nic[:mac]].ipConfig.ipAddress + if !inets[nic[:mac]] + ipAddresses = inets[nic[:mac]].ipConfig.ipAddress + end + if !ipAddresses.nil? && !ipAddresses.empty? nic[:ipv4], nic[:ipv4_additionals] = nil nic[:ipv6], nic[:ipv6_ula], nic[:ipv6_global], nic[:ipv6_additionals] = nil