From 3b1b3bf0ffa0dc8f76eee7d1b4199b074cc3d626 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 5c24ab70b55ba259d26e2e3a810631c6c34a3d82. --- .../lib/vcenter_driver/virtual_machine.rb | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 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 61b979e40a..1ca14ea7bd 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -1896,17 +1896,13 @@ class VirtualMachine < Template # Returns an array of actions to be included in :deviceChange 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"] - else - model = VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/MODEL") - end + model = one_item.retrieve_xmlelements("TEMPLATE/NIC_DEFAULT/MODEL") || nic["VCENTER_NET_MODEL"] || VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/MODEL") vnet_ref = nic["VCENTER_NET_REF"] backing = nil + limit_in = nic["INBOUND_PEAK_BW"] || VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/INBOUND_PEAK_BW") limit_out = nic["OUTBOUND_PEAK_BW"] || VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/OUTBOUND_PEAK_BW") limit = nil @@ -2000,14 +1996,9 @@ 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"] - else - model = VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/MODEL") - end + model = one_item.retrieve_xmlelements("TEMPLATE/NIC_DEFAULT/MODEL") || nic["VCENTER_NET_MODEL"] || VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/MODEL") vnet_ref = nic["VCENTER_NET_REF"] backing = nil