shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-24 21:34:01 +03:00
Code Releases Wiki Activity

feature #559: preserve custom NIC attributes

Browse Source
This commit is contained in:
Ruben S. Montero 2011-05-06 20:36:16 +02:00
parent b7febc83da
commit 9429b0338e
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/vnm/VirtualNetwork.cc
View File

@ -571,15 +571,11 @@ int VirtualNetwork::nic_attribute(VectorAttribute *nic, int vid)
{
int rc;
string model;
string ip;
string mac;
ostringstream vnid;
map<string,string> new_nic;
model = nic->vector_value("MODEL");
ip = nic->vector_value("IP");
vnid << oid;
@ -605,18 +601,11 @@ int VirtualNetwork::nic_attribute(VectorAttribute *nic, int vid)
// NEW NIC ATTRIBUTES
//--------------------------------------------------------------------------
new_nic.insert(make_pair("NETWORK" ,name));
new_nic.insert(make_pair("MAC" ,mac));
new_nic.insert(make_pair("BRIDGE" ,bridge));
new_nic.insert(make_pair("NETWORK_ID",vnid.str()));
new_nic.insert(make_pair("IP" ,ip));
if (!model.empty())
{
new_nic.insert(make_pair("MODEL",model));
}
nic->replace(new_nic);
nic->replace("NETWORK" ,name);
nic->replace("NETWORK_ID",vnid.str());
nic->replace("BRIDGE" ,bridge);
nic->replace("MAC" ,mac);
nic->replace("IP" ,ip);
return 0;
}