B OpenNebula#2474 Network model is not working in vCenter

joseangelgm · Oct 9, 2018 · 86def5c · 86def5c
1 parent bfdee5b
commit 86def5c
Showing 1 changed file with 10 additions and 10 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
@@ -1898,12 +1898,12 @@ def regenerate_context
     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"]
+        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")
+            model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL')
         end
         vnet_ref  = nic["VCENTER_NET_REF"]
         backing   = nil
@@ -2001,12 +2001,12 @@ def calculate_add_nic_spec(nic)
      # 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"]
+        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")
+            model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL')
         end
         vnet_ref  = nic["VCENTER_NET_REF"]
         backing   = nil