1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-23 21:57:43 +03:00

B #2474 Network model is not working in vCenter (#2519)

(cherry picked from commit 5d7bdc1eec5d164d8ae86d3d3d03c15c1918ec34)
(cherry picked from commit f68b70ca27da088c93e54c4be48643a98c081461)
This commit is contained in:
Jose Angel Garrido Montoya 2018-10-17 17:52:34 +02:00 committed by Ruben S. Montero
parent 846de840af
commit 82690013e7

View File

@ -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']