From 916b1cb7d9115f294911d16d2ae452bda2bbf0e6 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 "B #2474 Network model is not working in vCenter" This reverts commit a2ceb4a4054f5f1417b274ac90f2b18cccdea30e. --- .../lib/vcenter_driver/virtual_machine.rb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 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 cd94c7b302..61b979e40a 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -1898,12 +1898,12 @@ class VirtualMachine < Template def calculate_add_nic_spec(nic) mac = nic["MAC"] pg_name = nic["BRIDGE"] - 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') - elsif (model.nil? || model.empty?) && !nic['MODEL'].nil? && !nic['MODEL'].empty? - model = nic['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") + elsif (model.nil? || model.empty?) && !nic["MODEL"].nil? && !nic["MODEL"].empty? + model = nic["MODEL"] else - model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL') + model = VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/MODEL") end vnet_ref = nic["VCENTER_NET_REF"] backing = nil @@ -2001,12 +2001,12 @@ class VirtualMachine < Template # Returns an array of actions to be included in :deviceChange def calculate_add_nic_spec_autogenerate_mac(nic) pg_name = nic["BRIDGE"] - 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') - elsif (model.nil? || model.empty?) && !nic['MODEL'].nil? && !nic['MODEL'].empty? - model = nic['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") + elsif (model.nil? || model.empty?) && !nic["MODEL"].nil? && !nic["MODEL"].empty? + model = nic["MODEL"] else - model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL') + model = VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/MODEL") end vnet_ref = nic["VCENTER_NET_REF"] backing = nil