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

(cherry picked from commit 5d7bdc1)
(cherry picked from commit f68b70c)

src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb

@@ -1309,10 +1309,10 @@ def regenerate_context
 
     # 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 @@ 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"]
+        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']