shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

Revert "B #2474 Network model is not working in vCenter"

Browse Source 
This reverts commit 5c24ab70b55ba259d26e2e3a810631c6c34a3d82.
This commit is contained in:
Tino Vázquez 2018-10-17 17:42:33 +02:00
parent 916b1cb7d9
commit 3b1b3bf0ff
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
View File

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