[master] After merge updates

diff --git a/src/lib/dhcpsrv/tests/host_mgr_unittest.cc b/src/lib/dhcpsrv/tests/host_mgr_unittest.cc
index a642d6e9ed0d3c02cd0652180ca7c9126aa47ff9..8e0c28e9e832f28decc06d5b5a21e3d11102f45a 100644 (file)
--- a/src/lib/dhcpsrv/tests/host_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/host_mgr_unittest.cc
@@ -714,7 +714,7 @@ CQLHostMgrTest::SetUp() {
 
     // Connect to the database
     try {
-        HostMgr::create(test::validCqlConnectionString());
+        HostMgr::addBackend(test::validCqlConnectionString());
     } catch (...) {
         std::cerr << "*** ERROR: unable to open database. The test\n"
             "*** environment is broken and must be fixed before\n"
@@ -727,8 +727,8 @@ CQLHostMgrTest::SetUp() {
 
 void
 CQLHostMgrTest::TearDown() {
-    HostDataSourceFactory::getHostDataSourcePtr()->rollback();
-    HostDataSourceFactory::destroy();
+    HostMgr::instance().getHostDataSource()->rollback();
+    HostMgr::delBackend("cql");
     test::destroyCqlSchema(false, true);
 }
 

diff --git a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
index 293f9e5fc1bae48638a1d045c9d4bac6ef905978..df2122d475c5d781477ea16f892312d3beed2d1c 100644 (file)
--- a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
@@ -250,7 +250,8 @@ TEST(PgSqlHostDataSource, NoCallbackOnOpenFail) {
 
     callback_called = false;
     DatabaseConnection::db_lost_callback = db_lost_callback;
-    EXPECT_THROW(HostDataSourceFactory::create(connectionString(
+    HostMgr::create();
+    EXPECT_THROW(HostMgr::addBackend(connectionString(
         PGSQL_VALID_TYPE, VALID_NAME, INVALID_HOST, VALID_USER, VALID_PASSWORD)),
                  DbOpenError);