shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-12 21:57:23 +03:00
Code Releases Wiki Activity

feature #4320: Better disk_id/nic_id parsing

Browse Source
This commit is contained in:
Ruben S. Montero 2016-04-19 22:41:26 +02:00
parent 9c362e4e9a
commit fb3bef1b2d
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/vm/VirtualMachine.cc
View File

@ -869,35 +869,55 @@ void VirtualMachine::set_boot_order(string order)
{
vector<VectorAttribute *> * dev;
int max;
int id;
int disk_id;
size_t pos;
const char * id_name;
one_util::toupper(*i);
if ((*i).compare(0,4,"DISK") == 0 && (*i).length() == 5)
if ((*i).compare(0,4,"DISK") == 0)
{
id = (*i)[4] - '0';
pos = 4;
max = ndisk;
dev = &disk;
id_name = "DISK_ID";
}
else if ((*i).compare(0,3,"NIC") == 0 && (*i).length() == 4)
else if ((*i).compare(0,3,"NIC") == 0)
{
id = (*i)[3] - '0';
pos = 3;
max = nnic;
dev = &nic;
id_name = "NIC_ID";
}
else
{
continue;
}
if ( id < 0 || id > 9 || id >= max )
istringstream iss((*i).substr(pos, string::npos));
iss >> disk_id;
if (iss.fail())
{
continue;
}
(*dev)[id]->replace("ORDER", index++);
for (int j=0; j<max; ++j)
{
int j_disk_id;
if ( (*dev)[j]->vector_value(id_name, j_disk_id) == 0 &&
j_disk_id == disk_id )
{
(*dev)[j]->replace("ORDER", index++);
}
}
}
}