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 #200: Homogenous insert/allocate methods

Browse Source
This commit is contained in:
Ruben S. Montero 2010-07-01 19:36:25 +02:00
parent fdc007cb46
commit 334ad65c82
4 changed files with 38 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/image/Image.cc
View File

@ -147,7 +147,6 @@ int Image::insert(SqlDB *db)
ostringstream tmp_hashstream;
ostringstream tmp_sourcestream;
// ---------------------------------------------------------------------
// Check default image attributes
// ---------------------------------------------------------------------

74
src/image/ImagePool.cc
View File

@ -91,56 +91,54 @@ int ImagePool::allocate (
const string& stemplate,
int * oid)
{
int rc;
Image * img;
int rc;
Image * img;
string name;
char * error_msg;
string name;
char * error_msg;
// ---------------------------------------------------------------------
// Build a new Image object
// ---------------------------------------------------------------------
img = new Image(uid);
// ---------------------------------------------------------------------
// Build a new Image object
// ---------------------------------------------------------------------
img = new Image(uid);
// ---------------------------------------------------------------------
// Parse template
// ---------------------------------------------------------------------
rc = img->image_template.parse(stemplate, &error_msg);
// ---------------------------------------------------------------------
// Parse template
// ---------------------------------------------------------------------
rc = img->image_template.parse(stemplate, &error_msg);
if ( rc != 0 )
{
goto error_parse;
}
if ( rc != 0 )
{
ostringstream oss;
oss << "ImagePool template parse error: " << error_msg;
NebulaLog::log("IMG", Log::ERROR, oss);
img->get_template_attribute("NAME", name);
free(error_msg);
delete img;
// ---------------------------------------------------------------------
// Insert the Object in the pool
// ---------------------------------------------------------------------
return -1;
}
*oid = PoolSQL::allocate(img);
img->get_template_attribute("NAME", name);
if ( *oid == -1 )
{
return -1;
}
// ---------------------------------------------------------------------
// Insert the Object in the pool
// ---------------------------------------------------------------------
// ---------------------------------------------------------------------
// Add the image name to the map of image_names
// ---------------------------------------------------------------------
*oid = PoolSQL::allocate(img);
image_names.insert(make_pair(name, *oid));
if ( *oid == -1 )
{
return -1;
}
return *oid;
// ---------------------------------------------------------------------
// Add the image name to the map of image_names
// ---------------------------------------------------------------------
error_parse:
ostringstream oss;
oss << "ImagePool template parse error: " << error_msg;
NebulaLog::log("IMG", Log::ERROR, oss);
free(error_msg);
delete img;
*oid = -2;
return -2;
image_names.insert(make_pair(name, *oid));
return *oid;
}
/* -------------------------------------------------------------------------- */

2
src/image/test/ImagePoolTest.cc
View File

@ -388,7 +388,7 @@ public:
"END"
};
int results[] = { -1, -1, -2 };
int results[] = { -1, -1, -1 };
int i = 0;
while( templates[i] != "END" )

7
src/vm/VirtualMachinePool.cc
View File

@ -191,7 +191,7 @@ int VirtualMachinePool::allocate (
delete vm;
return -2;
return -1;
}
// ------------------------------------------------------------------------
@ -200,11 +200,6 @@ int VirtualMachinePool::allocate (
*oid = PoolSQL::allocate(vm);
if ( *oid == -1 )
{
return -1;
}
return *oid;
}