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 #457: Upgraded LCM tests to the new HostPool and MySQL classes

Browse Source
This commit is contained in:
Ruben S. Montero 2010-12-27 00:01:29 +01:00
parent 289e0610c7
commit 4d56271c7f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lcm/test/LifeCycleManagerTest.h
View File

@ -311,7 +311,8 @@ public:
if (mysql)
{
SqlDB * db;
db = new MySqlDB("localhost","oneadmin","oneadmin",NULL);
db = new MySqlDB("localhost",0,"oneadmin","oneadmin",db_name.c_str());
ostringstream oss;
oss << "DROP DATABASE IF EXISTS " << db_name;

10
src/lcm/test/Nebula.cc
View File

@ -163,7 +163,7 @@ void Nebula::start()
{
ostringstream oss;
db = new MySqlDB(server,user,passwd,0);
db = new MySqlDB(server,0,user,passwd,"");
oss << "DROP DATABASE IF EXISTS " << db_name;
db->exec(oss);
@ -208,10 +208,10 @@ void Nebula::start()
string default_image_type;
string default_device_prefix;
vector<const Attribute *> vm_hooks;
vector<const Attribute *> hooks;
vmpool = new VirtualMachinePool(db, vm_hooks,hook_location);
hpool = new HostPool(db);
vmpool = new VirtualMachinePool(db, hooks,hook_location);
hpool = new HostPool(db, hooks, hook_location);
vnpool = new VirtualNetworkPool(db,mac_prefix,size);
upool = new UserPool(db);
ipool = new ImagePool(db,
@ -304,7 +304,6 @@ void Nebula::start()
// ---- Life-cycle Manager ----
try
{
// lcm = new LifeCycleManager(vmpool,hpool,vmm,tm,dm);
lcm = new LifeCycleManager(vmpool,hpool);
}
catch (bad_alloc&)
@ -327,4 +326,3 @@ void Nebula::start()
vmm->load_mads(0);
};