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

feature #4400: Regenerate network context support for updateconf

Browse Source
This commit is contained in:
Ruben S. Montero 2016-04-26 11:47:03 +02:00
parent 09317da03e
commit bb9d4a99b5
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/VirtualMachine.h
View File

@ -1908,19 +1908,22 @@ private:
* Parse and generate the ETH_ network attributed of a NIC
* @param context attribute
* @param nic attribute
* @param replace attributes if the exist
*
* @return 0 on success
*/
void parse_nic_context(VectorAttribute * context, VectorAttribute * nic);
void parse_nic_context(VectorAttribute * context, VectorAttribute * nic,
bool replace);
/**
* Generate the NETWORK related CONTEXT setions, i.e. ETH_*. This function
* is invoked when ever the context is prepared for the VM to capture
* netowrking updates.
* @param context attribute of the VM
* @param replace attributes if the exist
* @return true if the net context was generated.
*/
bool generate_network_context(VectorAttribute * context);
bool generate_network_context(VectorAttribute * context, bool replace);
/**
* Parse the "NIC_DEFAULT" attribute

26
src/vm/VirtualMachine.cc
View File

@ -1021,7 +1021,7 @@ int VirtualMachine::parse_context(string& error_str)
// -------------------------------------------------------------------------
// Add network context and parse variables
// -------------------------------------------------------------------------
generate_network_context(context);
generate_network_context(context, false);
if (parse_context_variables(&context, error_str) == -1)
{
@ -3322,7 +3322,7 @@ int VirtualMachine::generate_context(string &files, int &disk_id,
}
//Generate dynamic context attributes
if ( generate_network_context(context) )
if ( generate_network_context(context, false) )
{
string error;
@ -4720,7 +4720,7 @@ void VirtualMachine::delete_non_persistent_disk_snapshots(Template **vm_quotas,
/* -------------------------------------------------------------------------- */
static void parse_context_network(const char* vars[][2], int num_vars,
VectorAttribute * context, VectorAttribute * nic)
VectorAttribute * context, VectorAttribute * nic, bool replace)
{
string nic_id = nic->vector_value("NIC_ID");
@ -4733,7 +4733,7 @@ static void parse_context_network(const char* vars[][2], int num_vars,
cval = context->vector_value(cvar.str().c_str());
if (!cval.empty())
if (!cval.empty() && !replace)
{
continue;
}
@ -4754,21 +4754,22 @@ static void parse_context_network(const char* vars[][2], int num_vars,
/* -------------------------------------------------------------------------- */
void VirtualMachine::parse_nic_context(VectorAttribute * c, VectorAttribute * n)
void VirtualMachine::parse_nic_context(VectorAttribute * c, VectorAttribute * n,
bool rpl)
{
parse_context_network(NETWORK_CONTEXT, NUM_NETWORK_CONTEXT, c, n);
parse_context_network(NETWORK_CONTEXT, NUM_NETWORK_CONTEXT, c, n, rpl);
if (!n->vector_value("IP6_GLOBAL").empty())
{
parse_context_network(NETWORK6_CONTEXT, NUM_NETWORK6_CONTEXT, c, n);
parse_context_network(NETWORK6_CONTEXT, NUM_NETWORK6_CONTEXT, c, n, rpl);
}
}
/* -------------------------------------------------------------------------- */
bool VirtualMachine::generate_network_context(VectorAttribute * context)
bool VirtualMachine::generate_network_context(VectorAttribute * context, bool r)
{
bool net_context;
bool net_context;
context->vector_value("NETWORK", net_context);
@ -4783,7 +4784,7 @@ bool VirtualMachine::generate_network_context(VectorAttribute * context)
for(int i=0; i<num_vatts; i++)
{
parse_nic_context(context, vatts[i]);
parse_nic_context(context, vatts[i], r);
}
return net_context;
@ -4912,7 +4913,6 @@ int VirtualMachine::updateconf(VirtualMachineTemplate& tmpl, string &err)
// -------------------------------------------------------------------------
// Update OS
// -------------------------------------------------------------------------
string os_names[] = {"ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER",
"BOOT"};
@ -4960,7 +4960,9 @@ int VirtualMachine::updateconf(VirtualMachineTemplate& tmpl, string &err)
if ( context != 0 )
{
rc = parse_context_variables(&context, err);
generate_network_context(context, true);
rc = parse_context_variables(&context, err);
}
return rc;