Skip to content

B #8214: Do not clear ETHx_* context variables on NIC detach if NETWORK is not YES #8215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mcanevet wants to merge 1 commit into from
Closed

B #8214: Do not clear ETHx_* context variables on NIC detach if NETWORK is not YES #8215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/vm/VirtualMachineContext.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,11 +888,24 @@ static void clear_context_network(const std::vector<ContextVariable>& cvars,

/* -------------------------------------------------------------------------- */

// The ETHx_* variables are only generated (and so only owned) by OpenNebula when
// NETWORK=YES. Otherwise they are defined by the user and must not be removed.
static bool network_context_enabled(const VectorAttribute * context)
{
bool net_context;

context->vector_value("NETWORK", net_context);

return net_context;
}

/* -------------------------------------------------------------------------- */

void VirtualMachine::clear_nic_context(int nicid)
{
VectorAttribute * context = obj_template->get("CONTEXT");

if (context == 0)
if (context == 0 || !network_context_enabled(context))
{
return;
}
Expand Down Expand Up @@ -926,7 +939,7 @@ void VirtualMachine::clear_nic_alias_context(int nicid, int aliasidx)
{
VectorAttribute * context = obj_template->get("CONTEXT");

if (context == 0)
if (context == 0 || !network_context_enabled(context))
{
return;
}
Expand Down
Loading