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

B #1520: Saved MAC into attribute VROUTER_MAC for can detach nic

Browse Source
This commit is contained in:
juanmont 2017-11-28 15:11:37 +01:00 committed by Ruben S. Montero
parent c4980894b4
commit 5ed8aaa47b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/vrouter/VirtualRouter.cc
View File

@ -409,7 +409,7 @@ int VirtualRouter::release_network_leases(const VectorAttribute * nic)
return -1;
}
mac = nic->vector_value("MAC");
mac = nic->vector_value("VROUTER_MAC");
vn = vnpool->get(vnid, true);
@ -457,8 +457,7 @@ static void prepare_nic_vm(VectorAttribute * nic)
if (floating)
{
nic->remove("MAC");
vrouter_prefix(nic, "MAC");
vrouter_prefix(nic, "IP");
vrouter_prefix(nic, "IP6_LINK");
vrouter_prefix(nic, "IP6_ULA");
@ -659,10 +658,10 @@ int VirtualRouter::detach_nic(int nic_id)
return -1;
}
obj_template->remove(nic);
release_network_leases(nic);
obj_template->remove(nic);
// Update quotas
tmpl.set(nic);