From 7d798e54b34fa7db7d63101d2022f349c0655cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Wed, 17 Oct 2018 17:42:33 +0200 Subject: [PATCH] Revert "Update virtual_machine.rb" This reverts commit 658a3d4daf619121bd41c73e501e0da9c281292a. --- src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb | 6 ++++++ 1 file changed, 6 insertions(+) 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 13291ae1c3..6177f62d6e 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -1902,12 +1902,15 @@ class VirtualMachine < Template if !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').nil? && !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').empty? 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 @@ -2009,12 +2012,15 @@ class VirtualMachine < Template if !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').nil? && !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').empty? 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