shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

#176: merge back NIC model patch to trunk

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@943 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Rubén S. Montero 2009-12-15 17:01:26 +00:00
parent fc4f60822a
commit 126bb99f8b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vm/VirtualMachine.cc
View File

@ -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());