feature #4320: CONTEXT can now be updated in poweroff related states

This commit is contained in:
Ruben S. Montero committed 2016-04-22 11:31:47 +02:00
1 parent 88a66d53f2
commit 759e645821
7 files changed
+51 -20

No files matched your search

+33 -9
View File
@@ -4820,20 +4820,39 @@ static void replace_vector_values(Template *old_tmpl, Template *new_tmpl,
old_tmpl->set(old_attr);
}
for (int i=0; i < num; i++)
if ( num > 0 && vnames != 0 )
{
if ( new_attr->vector_value(vnames[i].c_str(), value) == -1 )
for (int i=0; i < num; i++)
{
continue;
if ( new_attr->vector_value(vnames[i], value) == -1 )
{
continue;
}
else if (value.empty())
{
old_attr->remove(vnames[i]);
}
else
{
old_attr->replace(vnames[i], value);
}
}
}
else //replace all
{
const map<string, string> contents = new_attr->value();
map<string, string>::const_iterator it;
if (value.empty())
for ( it = contents.begin() ; it != contents.end() ; ++it )
{
old_attr->remove(vnames[i].c_str());
}
else
{
old_attr->replace(vnames[i].c_str(), value);
if ( it->second.empty() )
{
old_attr->remove(it->first);
}
else
{
old_attr->replace(it->first, it->second);
}
}
}
};
@@ -4936,5 +4955,10 @@ int VirtualMachine::updateconf(VirtualMachineTemplate& tmpl, string &err)
replace_vector_values(obj_template, &tmpl, "RAW", raw_names, 3);
// -------------------------------------------------------------------------
// Update CONTEXT: any value
// -------------------------------------------------------------------------
replace_vector_values(obj_template, &tmpl, "CONTEXT", 0, -1);
return 0;
}