From 82690013e7e952fb722a409d911807ca070242d6 Mon Sep 17 00:00:00 2001 From: Jose Angel Garrido Montoya Date: Wed, 17 Oct 2018 17:52:34 +0200 Subject: [PATCH] B #2474 Network model is not working in vCenter (#2519) (cherry picked from commit 5d7bdc1eec5d164d8ae86d3d3d03c15c1918ec34) (cherry picked from commit f68b70ca27da088c93e54c4be48643a98c081461) --- .../remotes/lib/vcenter_driver/virtual_machine.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 eb7a3a918f..468e34acca 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -1309,10 +1309,10 @@ class VirtualMachine < VCenterDriver::Template # Returns an array of actions to be included in :deviceChange def calculate_add_nic_spec(nic) + mac = nic["MAC"] + pg_name = nic["BRIDGE"] + model = '' - mac = nic["MAC"] - pg_name = nic["BRIDGE"] - mode = '' 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'] @@ -1419,9 +1419,9 @@ class VirtualMachine < VCenterDriver::Template # Returns an array of actions to be included in :deviceChange def calculate_add_nic_spec_autogenerate_mac(nic) + pg_name = nic["BRIDGE"] + model = '' - pg_name = nic["BRIDGE"] - mode = '' 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']