From 0d5f51906cc208baf38a2a7a7066fa643fcb8735 Mon Sep 17 00:00:00 2001 From: joseangelgm Date: Wed, 17 Oct 2018 11:57:05 +0200 Subject: [PATCH] B #2474 fix retrieve info from template --- .../remotes/lib/vcenter_driver/virtual_machine.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb index 515bc46361..6177f62d6e 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -1901,13 +1901,16 @@ class VirtualMachine < Template mode = "" if !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').nil? && !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').empty? - model = one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL') + model = one_item['TEMPLATE/NIC_DEFAULT/MODEL'] + File.open("/tmp/culo", 'w') {|f| f.write("Lo pilla del nic default: #{model}\n") } elsif (model.nil? || model.empty?) && !nic['MODEL'].nil? && !nic['MODEL'].empty? model = nic['MODEL'] + File.open("/tmp/culo", 'w') {|f| f.write("Lo pilla del nic: #{model}\n") } else model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL') + File.open("/tmp/culo", 'w') {|f| f.write("Lo pilla vcenter default #{model}\n") } end vnet_ref = nic["VCENTER_NET_REF"] backing = nil @@ -2008,13 +2011,16 @@ class VirtualMachine < Template model = "" if !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').nil? && !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').empty? - model = one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL') + model = one_item['TEMPLATE/NIC_DEFAULT/MODEL'] + File.open("/tmp/culo", 'w') {|f| f.write("Lo pilla del nic default: #{model}\n") } elsif (model.nil? || model.empty?) && !nic['MODEL'].nil? && !nic['MODEL'].empty? model = nic['MODEL'] + File.open("/tmp/culo", 'w') {|f| f.write("Lo pilla del nic: #{model}\n") } else model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL') + File.open("/tmp/culo", 'w') {|f| f.write("Lo pilla del vcenter default: #{model}\n") } end vnet_ref = nic["VCENTER_NET_REF"] backing = nil