#176: merge back NIC model patch to trunk

git-svn-id: http://svn.opennebula.org/one/trunk@943 3034c82b-c49b-4eb3-8279-a7acafdc01c0
fairchild · Dec 15, 2009 · 0278832 · 0278832
1 parent 71c7bbf
commit 0278832
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
@@ -634,6 +634,7 @@ int VirtualMachine::get_network_leases()
     string                     mac;
     string                     bridge;
     string                     network;
+    string                     model;
 
     ostringstream              vnid;
 
@@ -703,6 +704,13 @@ int VirtualMachine::get_network_leases()
         new_nic.insert(make_pair("VNID"   ,vnid.str()));
         new_nic.insert(make_pair("IP"     ,ip));
 
+        model = nic->vector_value("MODEL");
+
+        if ( !model.empty() )
+        {
+		    new_nic.insert(make_pair("MODEL",model));
+        }
+
         nic->replace(new_nic);
 
         new_nic.erase(new_nic.begin(),new_nic.end());