mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-14 16:53:12 +09:00
(cherry picked from commit5d7bdc1eec) (cherry picked from commitf68b70ca27)
This commit is contained in:
1 parent
846de840af
commit
82690013e7
1 file changed
+5
-5
@@ -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']
|
||||
|
||||
Reference in new issue
Block a user