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 #356 #348: Support for the DRIVER attribute in the Image repository

Browse Source 
(cherry picked from commit 317c30d7f20091bf5266d290690a6489b44566d7)
This commit is contained in:
Ruben S. Montero 2010-10-29 20:46:05 +02:00
parent 47b0cf39af
commit e8e5d2d4bf
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/image/Image.cc
View File

@ -434,9 +434,9 @@ int Image::drop(SqlDB * db)
ostream& operator<<(ostream& os, Image& image)
{
string image_str;
string image_str;
os << image.to_xml(image_str);
os << image.to_xml(image_str);
return os;
}
@ -571,20 +571,25 @@ int Image::disk_attribute( VectorAttribute * disk,
{
string bus;
string target;
string driver;
ostringstream iid;
*img_type = type;
bus = disk->vector_value("BUS");
target = disk->vector_value("TARGET");
driver = disk->vector_value("DRIVER");
iid << oid;
string template_bus;
string template_target;
string prefix;
string template_driver;
get_template_attribute("BUS", template_bus);
get_template_attribute("TARGET", template_target);
get_template_attribute("DRIVER", template_driver);
get_template_attribute("DEV_PREFIX", prefix);
//--------------------------------------------------------------------------
@ -612,7 +617,16 @@ int Image::disk_attribute( VectorAttribute * disk,
}
else if (!template_bus.empty())
{
new_disk.insert(make_pair("BUS",template_bus));
new_disk.insert(make_pair("BUS",template_bus));
}
if (!driver.empty())
{
new_disk.insert(make_pair("DRIVER",driver));
}
else if (!template_driver.empty())
{
new_disk.insert(make_pair("DRIVER",template_driver));
}
//---------------------------------------------------------------------------
@ -714,4 +728,3 @@ string Image::sha1_digest(const string& pass)
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */