From 902abbaeb62005d7c79441fb20282816b6037501 Mon Sep 17 00:00:00 2001 From: joseangelgm Date: Wed, 10 Oct 2018 09:55:23 +0200 Subject: [PATCH] B #2474 Network model is not working in vCenter --- .../remotes/lib/vcenter_driver/virtual_machine.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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..5436c2630e 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -1898,9 +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? + 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? + elsif (model.nil? || model.empty?) && + !nic['MODEL'].nil? && + !nic['MODEL'].empty? model = nic['MODEL'] else model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL') @@ -2001,9 +2004,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? + 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? + elsif (model.nil? || model.empty?) && + !nic['MODEL'].nil? && + !nic['MODEL'].empty? model = nic['MODEL'] else model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL')