1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00

Revert "B #2474 nic model"

This reverts commit a7e44a2b4f30c0829b21536e1e231c9de13f8c07.
This commit is contained in:
Tino Vázquez 2018-10-17 17:42:33 +02:00
parent 7eee49b352
commit 2866841eaa
2 changed files with 0 additions and 3315 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1898,7 +1898,6 @@ class VirtualMachine < Template
def calculate_add_nic_spec(nic)
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.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL')
@ -2005,7 +2004,6 @@ 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"]
model = ""
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')