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

feature #1483: Simplify REQUIREMENTS compatibility check

Browse Source
This commit is contained in:
Ruben S. Montero 2013-02-08 21:03:47 +01:00
parent abb62dddeb
commit f4434f00ad
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/vm/VirtualMachine.cc
View File

@ -789,25 +789,11 @@ int VirtualMachine::parse_requirements(string& error_str)
if ( num == 0 ) // Compatibility with old REQUIREMENTS attribute
{
vector<Attribute *> array_reqs_aux;
vector<Attribute*>::iterator it;
num = user_obj_template->remove("REQUIREMENTS", array_reqs_aux);
// Rename att to SCHED_REQUIREMENTS
for (it = array_reqs_aux.begin(); it != array_reqs_aux.end(); it++)
{
reqs = dynamic_cast<SingleAttribute *>(*it);
if (reqs != 0)
{
array_reqs.push_back( new SingleAttribute(
"SCHED_REQUIREMENTS",
reqs->value()) );
}
delete *it;
}
num = user_obj_template->remove("REQUIREMENTS", array_reqs);
}
else
{
user_obj_template->erase("REQUIREMENTS");
}
if ( num == 0 )
@ -838,15 +824,9 @@ int VirtualMachine::parse_requirements(string& error_str)
user_obj_template->set(reqs_parsed);
}
/* --- Delete old requirements attributes --- */
/* --- Delete old requirements attribute --- */
for (int i = 0; i < num ; i++)
{
if (array_reqs[i] != 0)
{
delete array_reqs[i];
}
}
delete array_reqs[0];
return rc;