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

(cherry picked from commit 5d7bdc1)
OpenNebula · Oct 17, 2018 · 696fd2c · 696fd2c
1 parent 4e8984d
commit 696fd2c
Showing 1 changed file with 22 additions and 2 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
@@ -1899,7 +1899,17 @@ def calculate_add_nic_spec(nic)
 
         mac       = nic["MAC"]
         pg_name   = nic["BRIDGE"]
-        model     = one_item.retrieve_xmlelements("TEMPLATE/NIC_DEFAULT/MODEL") || nic["VCENTER_NET_MODEL"] || VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/MODEL")
+        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']
+        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
         vnet_ref  = nic["VCENTER_NET_REF"]
         backing   = nil
 
@@ -1998,7 +2008,17 @@ def calculate_add_nic_spec(nic)
     def calculate_add_nic_spec_autogenerate_mac(nic)
 
         pg_name   = nic["BRIDGE"]
-        model     = one_item.retrieve_xmlelements("TEMPLATE/NIC_DEFAULT/MODEL") || nic["VCENTER_NET_MODEL"] || VCenterDriver::VIHelper.get_default("VM/TEMPLATE/NIC/MODEL")
+        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']
+        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
         vnet_ref  = nic["VCENTER_NET_REF"]
         backing   = nil