diff --git a/src/lcm/test/LifeCycleManagerTest.h b/src/lcm/test/LifeCycleManagerTest.h index 93395d6960..cb0769c6e9 100644 --- a/src/lcm/test/LifeCycleManagerTest.h +++ b/src/lcm/test/LifeCycleManagerTest.h @@ -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; diff --git a/src/lcm/test/Nebula.cc b/src/lcm/test/Nebula.cc index dc8f16994b..311d3bc22e 100644 --- a/src/lcm/test/Nebula.cc +++ b/src/lcm/test/Nebula.cc @@ -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 vm_hooks; + vector 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); }; -