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

Feature #1483: Fix automatic requirements

Browse Source
This commit is contained in:
Carlos Martín 2013-02-07 18:34:46 +01:00
parent e0f6f13e9e
commit 650d62b6fe
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/vm/VirtualMachine.cc
View File

@ -896,8 +896,6 @@ int VirtualMachine::automatic_requirements(string& error_str)
vector<Attribute * > v_attributes;
VectorAttribute * vatt;
vector<Attribute*>::iterator it;
ostringstream oss;
string requirements;
string cluster_id = "";
@ -907,12 +905,7 @@ int VirtualMachine::automatic_requirements(string& error_str)
// Get cluster id from all DISK vector attributes (IMAGE Datastore)
num_vatts = user_obj_template->remove("DISK",v_attributes);
for (it=v_attributes.begin(); it != v_attributes.end(); it++)
{
obj_template->set(*it);
}
num_vatts = obj_template->get("DISK",v_attributes);
for(int i=0; i<num_vatts; i++)
{
@ -935,12 +928,7 @@ int VirtualMachine::automatic_requirements(string& error_str)
// Get cluster id from the KERNEL and INITRD (FILE Datastores)
v_attributes.clear();
num_vatts = user_obj_template->remove("OS",v_attributes);
for (it=v_attributes.begin(); it != v_attributes.end(); it++)
{
obj_template->set(*it);
}
num_vatts = obj_template->get("OS",v_attributes);
if ( num_vatts > 0 )
{
@ -967,12 +955,7 @@ int VirtualMachine::automatic_requirements(string& error_str)
// Get cluster id from all NIC vector attributes
v_attributes.clear();
num_vatts = user_obj_template->remove("NIC",v_attributes);
for (it=v_attributes.begin(); it != v_attributes.end(); it++)
{
obj_template->set(*it);
}
num_vatts = obj_template->get("NIC",v_attributes);
for(int i=0; i<num_vatts; i++)
{