[#3536] moved from lib to hooks

diff --git a/configure.ac b/configure.ac
index f4d84bf11c5871d572dbc8e84438d6d8f991238f..03b75814336e0a4e1cb81427bd3d65da96bbaf62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1684,17 +1684,9 @@ AC_CONFIG_FILES([src/lib/log/tests/tempdir.h])
 AC_CONFIG_FILES([src/lib/mysql/Makefile])
 AC_CONFIG_FILES([src/lib/mysql/testutils/Makefile])
 AC_CONFIG_FILES([src/lib/mysql/tests/Makefile])
-AC_CONFIG_FILES([src/lib/mysql_lease_backend/Makefile])
-AC_CONFIG_FILES([src/lib/mysql_lease_backend/tests/Makefile])
-AC_CONFIG_FILES([src/lib/mysql_host_backend/Makefile])
-AC_CONFIG_FILES([src/lib/mysql_host_backend/tests/Makefile])
 AC_CONFIG_FILES([src/lib/pgsql/Makefile])
 AC_CONFIG_FILES([src/lib/pgsql/tests/Makefile])
 AC_CONFIG_FILES([src/lib/pgsql/testutils/Makefile])
-AC_CONFIG_FILES([src/lib/pgsql_lease_backend/Makefile])
-AC_CONFIG_FILES([src/lib/pgsql_lease_backend/tests/Makefile])
-AC_CONFIG_FILES([src/lib/pgsql_host_backend/Makefile])
-AC_CONFIG_FILES([src/lib/pgsql_host_backend/tests/Makefile])
 AC_CONFIG_FILES([src/lib/process/Makefile])
 AC_CONFIG_FILES([src/lib/process/cfgrpt/Makefile])
 AC_CONFIG_FILES([src/lib/process/cfgrpt/tests/Makefile])

diff --git a/src/Makefile.am b/src/Makefile.am
index 2cde2d5275dda99b08e9884dc3267f0f1c888d27..49397e2a09e865780b4dc81ebffd0d7493e88467 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = share lib bin hooks
+SUBDIRS = share lib hooks bin
 
 EXTRA_DIST = \
        cppcheck-suppress.lst           \

diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 218ab5b5dd9d60f3235f41a12643145b6eb5a475..a94639a81277a8c56899a545c3a161dd630254d2 100644 (file)
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -57,15 +57,15 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 # to be removed
 if HAVE_PGSQL
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-kea_dhcp4_LDADD += $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
-kea_dhcp4_LDADD += $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
+kea_dhcp4_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_lb/libpgsqllb.la
+kea_dhcp4_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_hb/libpgsqlhb.la
 endif
 
 # to be removed
 if HAVE_MYSQL
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-kea_dhcp4_LDADD += $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
-kea_dhcp4_LDADD += $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
+kea_dhcp4_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_lb/libmysqllb.la
+kea_dhcp4_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_hb/libmysqlhb.la
 endif
 
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/database/libkea-database.la

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index a4225b0c83badbf5e0e36627046e2ab15bf0b8b3..d05ebb1c69539f5e046c5f65bcb09d15d1c14586 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -59,10 +59,10 @@
 #include <dhcpsrv/memfile_lease_mgr.h>
 
 #ifdef HAVE_MYSQL
-#include <mysql_lease_backend/mysql_lease_mgr.h>
+#include <hooks/dhcp/mysql_lb/mysql_lease_mgr.h>
 #endif
 #ifdef HAVE_PGSQL
-#include <pgsql_lease_backend/pgsql_lease_mgr.h>
+#include <hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h>
 #endif
 
 #include <boost/algorithm/string.hpp>

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index e2de46da743da5e7526ca38aa7c29a0d95f5f60a..79dec5174a289e5bf1bfa969bbda29e97958b595 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -48,13 +48,13 @@
 #include <util/multi_threading_mgr.h>
 
 #ifdef HAVE_MYSQL
-#include <mysql_lease_backend/mysql_lease_mgr.h>
-#include <mysql_host_backend/mysql_host_data_source.h>
+#include <hooks/dhcp/mysql_lb/mysql_lease_mgr.h>
+#include <hooks/dhcp/mysql_hb/mysql_host_data_source.h>
 #endif
 
 #ifdef HAVE_PGSQL
-#include <pgsql_lease_backend/pgsql_lease_mgr.h>
-#include <pgsql_host_backend/pgsql_host_data_source.h>
+#include <hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h>
+#include <hooks/dhcp/pgsql_hb/pgsql_host_data_source.h>
 #endif
 
 #include <boost/algorithm/string.hpp>

diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index 69cb5a857ed1bc62bfb1514b6b0cf0a5a3095282..032ca7c67db46392acf11022ee5be52211ef8c18 100644 (file)
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -137,15 +137,15 @@ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 if HAVE_PGSQL
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_lb/libpgsqllb.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_hb/libpgsqlhb.la
 endif
 
 if HAVE_MYSQL
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
-dhcp4_unittests_LDADD += $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_lb/libmysqllb.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_hb/libmysqlhb.la
 endif
 
 dhcp4_unittests_LDADD += $(top_builddir)/src/lib/database/testutils/libdatabasetest.la

diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 796f29e0807e7674f075cb2bade2e7c4031104b3..2029aff25ad723226de1f5285386ab9d3b5163f5 100644 (file)
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -57,15 +57,15 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 # to be removed
 if HAVE_PGSQL
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
+kea_dhcp6_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_lb/libpgsqllb.la
+kea_dhcp6_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_hb/libpgsqlhb.la
 endif
 
 # to be removed
 if HAVE_MYSQL
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
-kea_dhcp6_LDADD += $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
+kea_dhcp6_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_lb/libmysqllb.la
+kea_dhcp6_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_hb/libmysqlhb.la
 endif
 
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/database/libkea-database.la

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 137b9087499f1b100bdfc8da05b346ed95767da1..226011395d03b964bbd75120422957d577d2bf33 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -58,10 +58,10 @@
 #include <dhcpsrv/memfile_lease_mgr.h>
 
 #ifdef HAVE_MYSQL
-#include <mysql_lease_backend/mysql_lease_mgr.h>
+#include <hooks/dhcp/mysql_lb/mysql_lease_mgr.h>
 #endif
 #ifdef HAVE_PGSQL
-#include <pgsql_lease_backend/pgsql_lease_mgr.h>
+#include <hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h>
 #endif
 
 #include <boost/tokenizer.hpp>

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 6590e8239e78fda457378a0b90639891aa08c64c..b9d26a0a1e442afa4079cb103f75d0e50bc2b1cb 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -52,13 +52,13 @@
 #include <util/triplet.h>
 
 #ifdef HAVE_MYSQL
-#include <mysql_lease_backend/mysql_lease_mgr.h>
-#include <mysql_host_backend/mysql_host_data_source.h>
+#include <hooks/dhcp/mysql_lb/mysql_lease_mgr.h>
+#include <hooks/dhcp/mysql_hb/mysql_host_data_source.h>
 #endif
 
 #ifdef HAVE_PGSQL
-#include <pgsql_lease_backend/pgsql_lease_mgr.h>
-#include <pgsql_host_backend/pgsql_host_data_source.h>
+#include <hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h>
+#include <hooks/dhcp/pgsql_hb/pgsql_host_data_source.h>
 #endif
 
 #include <boost/algorithm/string.hpp>

diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 7fd8de836cb09dc908765d113d2567008cbbf30f..c9aee1b3e57e6ebdb1a29416f195d95d9c25e358 100644 (file)
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -137,15 +137,15 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 if HAVE_PGSQL
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_lb/libpgsqllb.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_hb/libpgsqlhb.la
 endif
 
 if HAVE_MYSQL
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_lb/libmysqllb.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_hb/libmysqlhb.la
 endif
 
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/database/testutils/libdatabasetest.la

diff --git a/src/hooks/dhcp/mysql_hb/Makefile.am b/src/hooks/dhcp/mysql_hb/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..18eecd2e63a0f50277067e17cd8a22953f281e5e 100644 (file)
--- a/src/hooks/dhcp/mysql_hb/Makefile.am
+++ b/src/hooks/dhcp/mysql_hb/Makefile.am
@@ -0,0 +1,32 @@
+SUBDIRS = . tests
+
+AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(MYSQL_CPPFLAGS)
+
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+CLEANFILES = *.gcno *.gcda
+
+lib_LTLIBRARIES = libkea-mysql-host-backend.la
+
+libkea_mysql_host_backend_la_SOURCES = mysql_host_data_source.cc mysql_host_data_source.h
+
+libkea_mysql_host_backend_la_LIBADD = $(top_builddir)/src/lib/mysql/libkea-mysql.la
+libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
+libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_mysql_host_backend_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
+
+libkea_mysql_host_backend_la_LDFLAGS = $(MYSQL_LIBS)
+
+# Specify the headers for copying into the installation directory tree.
+libkea_mysql_host_backend_includedir = $(pkgincludedir)/mysql_host_backend
+
+libkea_mysql_host_backend_include_HEADERS = \
+        mysql_host_data_source.h

diff --git a/src/hooks/dhcp/mysql_hb/mysql_hb_messages.mes b/src/hooks/dhcp/mysql_hb/mysql_hb_messages.mes
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/lib/mysql_host_backend/mysql_host_data_source.cc b/src/hooks/dhcp/mysql_hb/mysql_host_data_source.cc
similarity index 100%
rename from src/lib/mysql_host_backend/mysql_host_data_source.cc
rename to src/hooks/dhcp/mysql_hb/mysql_host_data_source.cc

diff --git a/src/lib/mysql_host_backend/mysql_host_data_source.h b/src/hooks/dhcp/mysql_hb/mysql_host_data_source.h
similarity index 100%
rename from src/lib/mysql_host_backend/mysql_host_data_source.h
rename to src/hooks/dhcp/mysql_hb/mysql_host_data_source.h

diff --git a/src/hooks/dhcp/mysql_hb/tests/.gitignore b/src/hooks/dhcp/mysql_hb/tests/.gitignore
new file mode 100644 (file)
index 0000000..b408055
--- /dev/null
+++ b/src/hooks/dhcp/mysql_hb/tests/.gitignore
@@ -0,0 +1 @@
+mysql_hb_unittests

diff --git a/src/hooks/dhcp/mysql_hb/tests/Makefile.am b/src/hooks/dhcp/mysql_hb/tests/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..83f5dd87d8e4047eeee801daaad98c5f6d82f639 100644 (file)
--- a/src/hooks/dhcp/mysql_hb/tests/Makefile.am
+++ b/src/hooks/dhcp/mysql_hb/tests/Makefile.am
@@ -0,0 +1,56 @@
+SUBDIRS = .
+
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
+CLEANFILES = *.gcno *.gcda
+
+TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
+
+TESTS =
+if HAVE_GTEST
+TESTS += libmysql_host_backend_unittests
+
+libmysql_host_backend_unittests_SOURCES  = run_unittests.cc
+libmysql_host_backend_unittests_SOURCES += mysql_host_data_source_unittest.cc
+
+libmysql_host_backend_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+libmysql_host_backend_unittests_CPPFLAGS += $(MYSQL_CPPFLAGS)
+
+libmysql_host_backend_unittests_CXXFLAGS = $(AM_CXXFLAGS)
+
+libmysql_host_backend_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
+libmysql_host_backend_unittests_LDFLAGS += $(MYSQL_LIBS)
+
+libmysql_host_backend_unittests_LDADD = $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/testutils/libdhcptest.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libmysql_host_backend_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
+endif
+
+noinst_PROGRAMS = $(TESTS)

diff --git a/src/lib/mysql_host_backend/tests/mysql_host_data_source_unittest.cc b/src/hooks/dhcp/mysql_hb/tests/mysql_host_data_source_unittest.cc
similarity index 99%
rename from src/lib/mysql_host_backend/tests/mysql_host_data_source_unittest.cc
rename to src/hooks/dhcp/mysql_hb/tests/mysql_host_data_source_unittest.cc
index d1a8dc04b660c8e4982757dd8b579b6dd3bbd3fb..dbef932a09ed50244ea98d0aa7cd4193f499c53c 100644 (file)
--- a/src/lib/mysql_host_backend/tests/mysql_host_data_source_unittest.cc
+++ b/src/hooks/dhcp/mysql_hb/tests/mysql_host_data_source_unittest.cc
@@ -10,7 +10,7 @@
 #include <dhcpsrv/testutils/test_utils.h>
 #include <exceptions/exceptions.h>
 #include <dhcpsrv/host.h>
-#include <mysql_host_backend/mysql_host_data_source.h>
+#include <mysql_host_data_source.h>
 #include <dhcpsrv/testutils/generic_host_data_source_unittest.h>
 #include <dhcpsrv/testutils/host_data_source_utils.h>
 #include <dhcpsrv/host_mgr.h>

diff --git a/src/lib/mysql_host_backend/tests/run_unittests.cc b/src/hooks/dhcp/mysql_hb/tests/run_unittests.cc
similarity index 100%
rename from src/lib/mysql_host_backend/tests/run_unittests.cc
rename to src/hooks/dhcp/mysql_hb/tests/run_unittests.cc

diff --git a/src/hooks/dhcp/mysql_lb/Makefile.am b/src/hooks/dhcp/mysql_lb/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0a1ca53df36c02982a14ed1a2b4fccb20b1c22ce 100644 (file)
--- a/src/hooks/dhcp/mysql_lb/Makefile.am
+++ b/src/hooks/dhcp/mysql_lb/Makefile.am
@@ -0,0 +1,32 @@
+SUBDIRS = . tests
+
+AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(MYSQL_CPPFLAGS)
+
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+CLEANFILES = *.gcno *.gcda
+
+lib_LTLIBRARIES = libkea-mysql-lease-backend.la
+
+libkea_mysql_lease_backend_la_SOURCES = mysql_lease_mgr.cc mysql_lease_mgr.h
+
+libkea_mysql_lease_backend_la_LIBADD = $(top_builddir)/src/lib/mysql/libkea-mysql.la
+libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
+libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_mysql_lease_backend_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
+
+libkea_mysql_lease_backend_la_LDFLAGS = $(MYSQL_LIBS)
+
+# Specify the headers for copying into the installation directory tree.
+libkea_mysql_lease_backend_includedir = $(pkgincludedir)/mysql_lease_backend
+
+libkea_mysql_lease_backend_include_HEADERS = \
+        mysql_lease_mgr.h

diff --git a/src/hooks/dhcp/mysql_lb/mysql_lb_messages.mes b/src/hooks/dhcp/mysql_lb/mysql_lb_messages.mes
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/lib/mysql_lease_backend/mysql_lease_mgr.cc b/src/hooks/dhcp/mysql_lb/mysql_lease_mgr.cc
similarity index 100%
rename from src/lib/mysql_lease_backend/mysql_lease_mgr.cc
rename to src/hooks/dhcp/mysql_lb/mysql_lease_mgr.cc

diff --git a/src/lib/mysql_lease_backend/mysql_lease_mgr.h b/src/hooks/dhcp/mysql_lb/mysql_lease_mgr.h
similarity index 100%
rename from src/lib/mysql_lease_backend/mysql_lease_mgr.h
rename to src/hooks/dhcp/mysql_lb/mysql_lease_mgr.h

diff --git a/src/hooks/dhcp/mysql_lb/tests/.gitignore b/src/hooks/dhcp/mysql_lb/tests/.gitignore
new file mode 100644 (file)
index 0000000..c691613
--- /dev/null
+++ b/src/hooks/dhcp/mysql_lb/tests/.gitignore
@@ -0,0 +1 @@
+mysql_lb_unittests

diff --git a/src/hooks/dhcp/mysql_lb/tests/Makefile.am b/src/hooks/dhcp/mysql_lb/tests/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e94db7edd2c2b40f50f4843acd157a664109f633 100644 (file)
--- a/src/hooks/dhcp/mysql_lb/tests/Makefile.am
+++ b/src/hooks/dhcp/mysql_lb/tests/Makefile.am
@@ -0,0 +1,58 @@
+SUBDIRS = .
+
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
+CLEANFILES = *.gcno *.gcda
+
+TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
+
+TESTS =
+if HAVE_GTEST
+TESTS += libmysql_lease_backend_unittests
+
+libmysql_lease_backend_unittests_SOURCES  = run_unittests.cc
+libmysql_lease_backend_unittests_SOURCES += mysql_lease_mgr_unittest.cc
+libmysql_lease_backend_unittests_SOURCES += mysql_lease_extended_info_unittest.cc
+libmysql_lease_backend_unittests_SOURCES += mysql_bootp_unittest.cc
+
+libmysql_lease_backend_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+libmysql_lease_backend_unittests_CPPFLAGS += $(MYSQL_CPPFLAGS)
+
+libmysql_lease_backend_unittests_CXXFLAGS = $(AM_CXXFLAGS)
+
+libmysql_lease_backend_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
+libmysql_lease_backend_unittests_LDFLAGS += $(MYSQL_LIBS)
+
+libmysql_lease_backend_unittests_LDADD = $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/testutils/libdhcptest.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libmysql_lease_backend_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
+endif
+
+noinst_PROGRAMS = $(TESTS)

diff --git a/src/lib/mysql_lease_backend/tests/mysql_bootp_unittest.cc b/src/hooks/dhcp/mysql_lb/tests/mysql_bootp_unittest.cc
similarity index 99%
rename from src/lib/mysql_lease_backend/tests/mysql_bootp_unittest.cc
rename to src/hooks/dhcp/mysql_lb/tests/mysql_bootp_unittest.cc
index 2731d55f9988e60ff65c4e105ab05e2faa8dbd26..7884854d759873a5f828e1f4607f3366885e7abd 100644 (file)
--- a/src/lib/mysql_lease_backend/tests/mysql_bootp_unittest.cc
+++ b/src/hooks/dhcp/mysql_lb/tests/mysql_bootp_unittest.cc
@@ -10,7 +10,7 @@
 #include <dhcpsrv/testutils/alloc_engine_utils.h>
 #include <dhcpsrv/testutils/test_utils.h>
 #include <mysql/testutils/mysql_schema.h>
-#include <mysql_lease_backend/mysql_lease_mgr.h>
+#include <mysql_lease_mgr.h>
 #include <util/triplet.h>
 
 #include <gtest/gtest.h>

diff --git a/src/lib/mysql_lease_backend/tests/mysql_lease_extended_info_unittest.cc b/src/hooks/dhcp/mysql_lb/tests/mysql_lease_extended_info_unittest.cc
similarity index 99%
rename from src/lib/mysql_lease_backend/tests/mysql_lease_extended_info_unittest.cc
rename to src/hooks/dhcp/mysql_lb/tests/mysql_lease_extended_info_unittest.cc
index 458bc9d89d11536695e8790eea20d36c16156b57..48e2a7124099bfde6ac63abedd0e89732c530989 100644 (file)
--- a/src/lib/mysql_lease_backend/tests/mysql_lease_extended_info_unittest.cc
+++ b/src/hooks/dhcp/mysql_lb/tests/mysql_lease_extended_info_unittest.cc
@@ -10,7 +10,7 @@
 #include <cc/data.h>
 #include <dhcpsrv/testutils/generic_lease_extended_info_unittest.h>
 #include <mysql/testutils/mysql_schema.h>
-#include <mysql_lease_backend/mysql_lease_mgr.h>
+#include <mysql_lease_mgr.h>
 
 using namespace isc;
 using namespace isc::asiolink;

diff --git a/src/lib/mysql_lease_backend/tests/mysql_lease_mgr_unittest.cc b/src/hooks/dhcp/mysql_lb/tests/mysql_lease_mgr_unittest.cc
similarity index 99%
rename from src/lib/mysql_lease_backend/tests/mysql_lease_mgr_unittest.cc
rename to src/hooks/dhcp/mysql_lb/tests/mysql_lease_mgr_unittest.cc
index 7a372b173ef4eea2e93f26909b4face43502f718..af2f7e660efc24a72f11542ba2f7919bcf67c453 100644 (file)
--- a/src/lib/mysql_lease_backend/tests/mysql_lease_mgr_unittest.cc
+++ b/src/hooks/dhcp/mysql_lb/tests/mysql_lease_mgr_unittest.cc
@@ -8,7 +8,7 @@
 
 #include <asiolink/io_address.h>
 #include <dhcpsrv/lease_mgr_factory.h>
-#include <mysql_lease_backend/mysql_lease_mgr.h>
+#include <mysql_lease_mgr.h>
 #include <dhcpsrv/testutils/test_utils.h>
 #include <dhcpsrv/testutils/generic_lease_mgr_unittest.h>
 #include <dhcpsrv/testutils/mysql_generic_backend_unittest.h>

diff --git a/src/lib/mysql_lease_backend/tests/run_unittests.cc b/src/hooks/dhcp/mysql_lb/tests/run_unittests.cc
similarity index 100%
rename from src/lib/mysql_lease_backend/tests/run_unittests.cc
rename to src/hooks/dhcp/mysql_lb/tests/run_unittests.cc

diff --git a/src/hooks/dhcp/pgsql_hb/Makefile.am b/src/hooks/dhcp/pgsql_hb/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a181c3dc15718b4a162bdab078068a2b87459257 100644 (file)
--- a/src/hooks/dhcp/pgsql_hb/Makefile.am
+++ b/src/hooks/dhcp/pgsql_hb/Makefile.am
@@ -0,0 +1,32 @@
+SUBDIRS = . tests
+
+AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PGSQL_CPPFLAGS)
+
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+CLEANFILES = *.gcno *.gcda
+
+lib_LTLIBRARIES = libkea-pgsql-host-backend.la
+
+libkea_pgsql_host_backend_la_SOURCES = pgsql_host_data_source.cc pgsql_host_data_source.h
+
+libkea_pgsql_host_backend_la_LIBADD = $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
+libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
+libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_pgsql_host_backend_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
+
+libkea_pgsql_host_backend_la_LDFLAGS = $(PGSQL_LIBS)
+
+# Specify the headers for copying into the installation directory tree.
+libkea_pgsql_host_backend_includedir = $(pkgincludedir)/pgsql_host_backend
+
+libkea_pgsql_host_backend_include_HEADERS = \
+        pgsql_host_data_source.h

diff --git a/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.mes b/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.mes
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/lib/pgsql_host_backend/pgsql_host_data_source.cc b/src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.cc
similarity index 100%
rename from src/lib/pgsql_host_backend/pgsql_host_data_source.cc
rename to src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.cc

diff --git a/src/lib/pgsql_host_backend/pgsql_host_data_source.h b/src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h
similarity index 100%
rename from src/lib/pgsql_host_backend/pgsql_host_data_source.h
rename to src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h

diff --git a/src/hooks/dhcp/pgsql_hb/tests/.gitignore b/src/hooks/dhcp/pgsql_hb/tests/.gitignore
new file mode 100644 (file)
index 0000000..2ab2ed2
--- /dev/null
+++ b/src/hooks/dhcp/pgsql_hb/tests/.gitignore
@@ -0,0 +1 @@
+pgsql_hb_unittests

diff --git a/src/hooks/dhcp/pgsql_hb/tests/Makefile.am b/src/hooks/dhcp/pgsql_hb/tests/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2fd06c8a5fbcfaadffea08ffb8438e51f10512bb 100644 (file)
--- a/src/hooks/dhcp/pgsql_hb/tests/Makefile.am
+++ b/src/hooks/dhcp/pgsql_hb/tests/Makefile.am
@@ -0,0 +1,56 @@
+SUBDIRS = .
+
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
+CLEANFILES = *.gcno *.gcda
+
+TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
+
+TESTS =
+if HAVE_GTEST
+TESTS += libpgsql_host_backend_unittests
+
+libpgsql_host_backend_unittests_SOURCES  = run_unittests.cc
+libpgsql_host_backend_unittests_SOURCES += pgsql_host_data_source_unittest.cc
+
+libpgsql_host_backend_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+libpgsql_host_backend_unittests_CPPFLAGS += $(PGSQL_CPPFLAGS)
+
+libpgsql_host_backend_unittests_CXXFLAGS = $(AM_CXXFLAGS)
+
+libpgsql_host_backend_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
+libpgsql_host_backend_unittests_LDFLAGS += $(PGSQL_LIBS)
+
+libpgsql_host_backend_unittests_LDADD = $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/testutils/libdhcptest.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libpgsql_host_backend_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
+endif
+
+noinst_PROGRAMS = $(TESTS)
\ No newline at end of file

diff --git a/src/lib/pgsql_host_backend/tests/pgsql_host_data_source_unittest.cc b/src/hooks/dhcp/pgsql_hb/tests/pgsql_host_data_source_unittest.cc
similarity index 99%
rename from src/lib/pgsql_host_backend/tests/pgsql_host_data_source_unittest.cc
rename to src/hooks/dhcp/pgsql_hb/tests/pgsql_host_data_source_unittest.cc
index 015e59484574c506d7c5edadc9625a96cda46b66..dc0eb4bae44f8752723759951488247f96b6fc24 100644 (file)
--- a/src/lib/pgsql_host_backend/tests/pgsql_host_data_source_unittest.cc
+++ b/src/hooks/dhcp/pgsql_hb/tests/pgsql_host_data_source_unittest.cc
@@ -10,7 +10,7 @@
 #include <dhcpsrv/testutils/test_utils.h>
 #include <exceptions/exceptions.h>
 #include <dhcpsrv/host.h>
-#include <pgsql_host_backend/pgsql_host_data_source.h>
+#include <pgsql_host_data_source.h>
 #include <dhcpsrv/testutils/generic_host_data_source_unittest.h>
 #include <dhcpsrv/testutils/host_data_source_utils.h>
 #include <dhcpsrv/host_mgr.h>

diff --git a/src/lib/pgsql_host_backend/tests/run_unittests.cc b/src/hooks/dhcp/pgsql_hb/tests/run_unittests.cc
similarity index 100%
rename from src/lib/pgsql_host_backend/tests/run_unittests.cc
rename to src/hooks/dhcp/pgsql_hb/tests/run_unittests.cc

diff --git a/src/hooks/dhcp/pgsql_lb/Makefile.am b/src/hooks/dhcp/pgsql_lb/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8e7eefc8b007977845443712df8c8f3347a61fd9 100644 (file)
--- a/src/hooks/dhcp/pgsql_lb/Makefile.am
+++ b/src/hooks/dhcp/pgsql_lb/Makefile.am
@@ -0,0 +1,32 @@
+SUBDIRS = . tests
+
+AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PGSQL_CPPFLAGS)
+
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+CLEANFILES = *.gcno *.gcda
+
+lib_LTLIBRARIES = libkea-pgsql-lease-backend.la
+
+libkea_pgsql_lease_backend_la_SOURCES = pgsql_lease_mgr.cc pgsql_lease_mgr.h
+
+libkea_pgsql_lease_backend_la_LIBADD = $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
+libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
+libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
+libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
+libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libkea_pgsql_lease_backend_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
+
+libkea_pgsql_lease_backend_la_LDFLAGS = $(PGSQL_LIBS)
+
+# Specify the headers for copying into the installation directory tree.
+libkea_pgsql_lease_backend_includedir = $(pkgincludedir)/pgsql_lease_backend
+
+libkea_pgsql_lease_backend_include_HEADERS = \
+        pgsql_lease_mgr.h

diff --git a/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.mes b/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.mes
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/lib/pgsql_lease_backend/pgsql_lease_mgr.cc b/src/hooks/dhcp/pgsql_lb/pgsql_lease_mgr.cc
similarity index 100%
rename from src/lib/pgsql_lease_backend/pgsql_lease_mgr.cc
rename to src/hooks/dhcp/pgsql_lb/pgsql_lease_mgr.cc

diff --git a/src/lib/pgsql_lease_backend/pgsql_lease_mgr.h b/src/hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h
similarity index 100%
rename from src/lib/pgsql_lease_backend/pgsql_lease_mgr.h
rename to src/hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h

diff --git a/src/hooks/dhcp/pgsql_lb/tests/.gitignore b/src/hooks/dhcp/pgsql_lb/tests/.gitignore
new file mode 100644 (file)
index 0000000..16bd905
--- /dev/null
+++ b/src/hooks/dhcp/pgsql_lb/tests/.gitignore
@@ -0,0 +1 @@
+pgsql_lb_unittests

diff --git a/src/hooks/dhcp/pgsql_lb/tests/Makefile.am b/src/hooks/dhcp/pgsql_lb/tests/Makefile.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b49947d7b594fe001101eeb861aadd44af6ebe75 100644 (file)
--- a/src/hooks/dhcp/pgsql_lb/tests/Makefile.am
+++ b/src/hooks/dhcp/pgsql_lb/tests/Makefile.am
@@ -0,0 +1,58 @@
+SUBDIRS = .
+
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
+CLEANFILES = *.gcno *.gcda
+
+TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
+
+TESTS =
+if HAVE_GTEST
+TESTS += libpgsql_lease_backend_unittests
+
+libpgsql_lease_backend_unittests_SOURCES  = run_unittests.cc
+libpgsql_lease_backend_unittests_SOURCES += pgsql_lease_mgr_unittest.cc
+libpgsql_lease_backend_unittests_SOURCES += pgsql_lease_extended_info_unittest.cc
+libpgsql_lease_backend_unittests_SOURCES += pgsql_bootp_unittest.cc
+
+libpgsql_lease_backend_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+libpgsql_lease_backend_unittests_CPPFLAGS += $(PGSQL_CPPFLAGS)
+
+libpgsql_lease_backend_unittests_CXXFLAGS = $(AM_CXXFLAGS)
+
+libpgsql_lease_backend_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
+libpgsql_lease_backend_unittests_LDFLAGS += $(PGSQL_LIBS)
+
+libpgsql_lease_backend_unittests_LDADD = $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/testutils/libdhcptest.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
+libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
+libpgsql_lease_backend_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
+endif
+
+noinst_PROGRAMS = $(TESTS)

diff --git a/src/lib/pgsql_lease_backend/tests/pgsql_bootp_unittest.cc b/src/hooks/dhcp/pgsql_lb/tests/pgsql_bootp_unittest.cc
similarity index 99%
rename from src/lib/pgsql_lease_backend/tests/pgsql_bootp_unittest.cc
rename to src/hooks/dhcp/pgsql_lb/tests/pgsql_bootp_unittest.cc
index f80324e6e5398c770333cab28ee785e65addfb06..33e06eb4058fd03a23d41cdadd38ffec37fc83e9 100644 (file)
--- a/src/lib/pgsql_lease_backend/tests/pgsql_bootp_unittest.cc
+++ b/src/hooks/dhcp/pgsql_lb/tests/pgsql_bootp_unittest.cc
@@ -10,7 +10,7 @@
 #include <dhcpsrv/testutils/alloc_engine_utils.h>
 #include <dhcpsrv/testutils/test_utils.h>
 #include <pgsql/testutils/pgsql_schema.h>
-#include <pgsql_lease_backend/pgsql_lease_mgr.h>
+#include <pgsql_lease_mgr.h>
 #include <util/triplet.h>
 
 #include <gtest/gtest.h>

diff --git a/src/lib/pgsql_lease_backend/tests/pgsql_lease_extended_info_unittest.cc b/src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_extended_info_unittest.cc
similarity index 99%
rename from src/lib/pgsql_lease_backend/tests/pgsql_lease_extended_info_unittest.cc
rename to src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_extended_info_unittest.cc
index a0cd296e22f1bc603207d26e607de4ced471c7db..2d185874ce80b62e61842503c895bfd2b6d747c9 100644 (file)
--- a/src/lib/pgsql_lease_backend/tests/pgsql_lease_extended_info_unittest.cc
+++ b/src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_extended_info_unittest.cc
@@ -10,7 +10,7 @@
 #include <cc/data.h>
 #include <dhcpsrv/testutils/generic_lease_extended_info_unittest.h>
 #include <pgsql/testutils/pgsql_schema.h>
-#include <pgsql_lease_backend/pgsql_lease_mgr.h>
+#include <pgsql_lease_mgr.h>
 
 using namespace isc;
 using namespace isc::asiolink;

diff --git a/src/lib/pgsql_lease_backend/tests/pgsql_lease_mgr_unittest.cc b/src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_mgr_unittest.cc
similarity index 99%
rename from src/lib/pgsql_lease_backend/tests/pgsql_lease_mgr_unittest.cc
rename to src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_mgr_unittest.cc
index c34c9ef626f82dfb4ee23017262dc7f7b570a47e..2551870d14e071b4dd28ebf31a28c431ea47c014 100644 (file)
--- a/src/lib/pgsql_lease_backend/tests/pgsql_lease_mgr_unittest.cc
+++ b/src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_mgr_unittest.cc
@@ -8,7 +8,7 @@
 
 #include <asiolink/io_address.h>
 #include <dhcpsrv/lease_mgr_factory.h>
-#include <pgsql_lease_backend/pgsql_lease_mgr.h>
+#include <pgsql_lease_mgr.h>
 #include <dhcpsrv/testutils/test_utils.h>
 #include <dhcpsrv/testutils/generic_lease_mgr_unittest.h>
 #include <dhcpsrv/testutils/pgsql_generic_backend_unittest.h>

diff --git a/src/lib/pgsql_lease_backend/tests/run_unittests.cc b/src/hooks/dhcp/pgsql_lb/tests/run_unittests.cc
similarity index 100%
rename from src/lib/pgsql_lease_backend/tests/run_unittests.cc
rename to src/hooks/dhcp/pgsql_lb/tests/run_unittests.cc

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0f77fc48dac53fb49585ccffd7d55d4d8400ab8a..f69bf37d1840ddcf23a1a49706e80579395ec6ea 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -22,14 +22,3 @@ SUBDIRS += yang
 endif
 
 SUBDIRS += asiodns dhcp_ddns eval process dhcpsrv d2srv
-
-if HAVE_MYSQL
-SUBDIRS += mysql_lease_backend
-SUBDIRS += mysql_host_backend
-endif
-
-if HAVE_PGSQL
-SUBDIRS += pgsql_lease_backend
-SUBDIRS += pgsql_host_backend
-endif
-

diff --git a/src/lib/mysql_host_backend/Makefile.am b/src/lib/mysql_host_backend/Makefile.am
deleted file mode 100644 (file)
index 18eecd2..0000000
--- a/src/lib/mysql_host_backend/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-SUBDIRS = . tests
-
-AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(MYSQL_CPPFLAGS)
-
-AM_CXXFLAGS = $(KEA_CXXFLAGS)
-
-CLEANFILES = *.gcno *.gcda
-
-lib_LTLIBRARIES = libkea-mysql-host-backend.la
-
-libkea_mysql_host_backend_la_SOURCES = mysql_host_data_source.cc mysql_host_data_source.h
-
-libkea_mysql_host_backend_la_LIBADD = $(top_builddir)/src/lib/mysql/libkea-mysql.la
-libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
-libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
-libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
-libkea_mysql_host_backend_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_mysql_host_backend_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
-
-libkea_mysql_host_backend_la_LDFLAGS = $(MYSQL_LIBS)
-
-# Specify the headers for copying into the installation directory tree.
-libkea_mysql_host_backend_includedir = $(pkgincludedir)/mysql_host_backend
-
-libkea_mysql_host_backend_include_HEADERS = \
-        mysql_host_data_source.h

diff --git a/src/lib/mysql_host_backend/tests/.gitignore b/src/lib/mysql_host_backend/tests/.gitignore
deleted file mode 100644 (file)
index 8b96f60..0000000
--- a/src/lib/mysql_host_backend/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libmysql_host_backend_unittests

diff --git a/src/lib/mysql_host_backend/tests/Makefile.am b/src/lib/mysql_host_backend/tests/Makefile.am
deleted file mode 100644 (file)
index 83f5dd8..0000000
--- a/src/lib/mysql_host_backend/tests/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-SUBDIRS = .
-
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CXXFLAGS = $(KEA_CXXFLAGS)
-
-if USE_STATIC_LINK
-AM_LDFLAGS = -static
-endif
-
-CLEANFILES = *.gcno *.gcda
-
-TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
-
-TESTS =
-if HAVE_GTEST
-TESTS += libmysql_host_backend_unittests
-
-libmysql_host_backend_unittests_SOURCES  = run_unittests.cc
-libmysql_host_backend_unittests_SOURCES += mysql_host_data_source_unittest.cc
-
-libmysql_host_backend_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-libmysql_host_backend_unittests_CPPFLAGS += $(MYSQL_CPPFLAGS)
-
-libmysql_host_backend_unittests_CXXFLAGS = $(AM_CXXFLAGS)
-
-libmysql_host_backend_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
-libmysql_host_backend_unittests_LDFLAGS += $(MYSQL_LIBS)
-
-libmysql_host_backend_unittests_LDADD = $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/testutils/libdhcptest.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-libmysql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libmysql_host_backend_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
-endif
-
-noinst_PROGRAMS = $(TESTS)

diff --git a/src/lib/mysql_lease_backend/Makefile.am b/src/lib/mysql_lease_backend/Makefile.am
deleted file mode 100644 (file)
index 0a1ca53..0000000
--- a/src/lib/mysql_lease_backend/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-SUBDIRS = . tests
-
-AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(MYSQL_CPPFLAGS)
-
-AM_CXXFLAGS = $(KEA_CXXFLAGS)
-
-CLEANFILES = *.gcno *.gcda
-
-lib_LTLIBRARIES = libkea-mysql-lease-backend.la
-
-libkea_mysql_lease_backend_la_SOURCES = mysql_lease_mgr.cc mysql_lease_mgr.h
-
-libkea_mysql_lease_backend_la_LIBADD = $(top_builddir)/src/lib/mysql/libkea-mysql.la
-libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
-libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
-libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
-libkea_mysql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_mysql_lease_backend_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
-
-libkea_mysql_lease_backend_la_LDFLAGS = $(MYSQL_LIBS)
-
-# Specify the headers for copying into the installation directory tree.
-libkea_mysql_lease_backend_includedir = $(pkgincludedir)/mysql_lease_backend
-
-libkea_mysql_lease_backend_include_HEADERS = \
-        mysql_lease_mgr.h

diff --git a/src/lib/mysql_lease_backend/tests/.gitignore b/src/lib/mysql_lease_backend/tests/.gitignore
deleted file mode 100644 (file)
index b48dc34..0000000
--- a/src/lib/mysql_lease_backend/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libmysql_lease_backend_unittests

diff --git a/src/lib/mysql_lease_backend/tests/Makefile.am b/src/lib/mysql_lease_backend/tests/Makefile.am
deleted file mode 100644 (file)
index e94db7e..0000000
--- a/src/lib/mysql_lease_backend/tests/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-SUBDIRS = .
-
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CXXFLAGS = $(KEA_CXXFLAGS)
-
-if USE_STATIC_LINK
-AM_LDFLAGS = -static
-endif
-
-CLEANFILES = *.gcno *.gcda
-
-TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
-
-TESTS =
-if HAVE_GTEST
-TESTS += libmysql_lease_backend_unittests
-
-libmysql_lease_backend_unittests_SOURCES  = run_unittests.cc
-libmysql_lease_backend_unittests_SOURCES += mysql_lease_mgr_unittest.cc
-libmysql_lease_backend_unittests_SOURCES += mysql_lease_extended_info_unittest.cc
-libmysql_lease_backend_unittests_SOURCES += mysql_bootp_unittest.cc
-
-libmysql_lease_backend_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-libmysql_lease_backend_unittests_CPPFLAGS += $(MYSQL_CPPFLAGS)
-
-libmysql_lease_backend_unittests_CXXFLAGS = $(AM_CXXFLAGS)
-
-libmysql_lease_backend_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
-libmysql_lease_backend_unittests_LDFLAGS += $(MYSQL_LIBS)
-
-libmysql_lease_backend_unittests_LDADD = $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/testutils/libdhcptest.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-libmysql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libmysql_lease_backend_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
-endif
-
-noinst_PROGRAMS = $(TESTS)

diff --git a/src/lib/pgsql_host_backend/Makefile.am b/src/lib/pgsql_host_backend/Makefile.am
deleted file mode 100644 (file)
index a181c3d..0000000
--- a/src/lib/pgsql_host_backend/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-SUBDIRS = . tests
-
-AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(PGSQL_CPPFLAGS)
-
-AM_CXXFLAGS = $(KEA_CXXFLAGS)
-
-CLEANFILES = *.gcno *.gcda
-
-lib_LTLIBRARIES = libkea-pgsql-host-backend.la
-
-libkea_pgsql_host_backend_la_SOURCES = pgsql_host_data_source.cc pgsql_host_data_source.h
-
-libkea_pgsql_host_backend_la_LIBADD = $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
-libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
-libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
-libkea_pgsql_host_backend_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_pgsql_host_backend_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
-
-libkea_pgsql_host_backend_la_LDFLAGS = $(PGSQL_LIBS)
-
-# Specify the headers for copying into the installation directory tree.
-libkea_pgsql_host_backend_includedir = $(pkgincludedir)/pgsql_host_backend
-
-libkea_pgsql_host_backend_include_HEADERS = \
-        pgsql_host_data_source.h

diff --git a/src/lib/pgsql_host_backend/tests/.gitignore b/src/lib/pgsql_host_backend/tests/.gitignore
deleted file mode 100644 (file)
index efb5bce..0000000
--- a/src/lib/pgsql_host_backend/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libpgsql_host_backend_unittests

diff --git a/src/lib/pgsql_host_backend/tests/Makefile.am b/src/lib/pgsql_host_backend/tests/Makefile.am
deleted file mode 100644 (file)
index 2fd06c8..0000000
--- a/src/lib/pgsql_host_backend/tests/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-SUBDIRS = .
-
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CXXFLAGS = $(KEA_CXXFLAGS)
-
-if USE_STATIC_LINK
-AM_LDFLAGS = -static
-endif
-
-CLEANFILES = *.gcno *.gcda
-
-TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
-
-TESTS =
-if HAVE_GTEST
-TESTS += libpgsql_host_backend_unittests
-
-libpgsql_host_backend_unittests_SOURCES  = run_unittests.cc
-libpgsql_host_backend_unittests_SOURCES += pgsql_host_data_source_unittest.cc
-
-libpgsql_host_backend_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-libpgsql_host_backend_unittests_CPPFLAGS += $(PGSQL_CPPFLAGS)
-
-libpgsql_host_backend_unittests_CXXFLAGS = $(AM_CXXFLAGS)
-
-libpgsql_host_backend_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
-libpgsql_host_backend_unittests_LDFLAGS += $(PGSQL_LIBS)
-
-libpgsql_host_backend_unittests_LDADD = $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/testutils/libdhcptest.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-libpgsql_host_backend_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libpgsql_host_backend_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
-endif
-
-noinst_PROGRAMS = $(TESTS)
\ No newline at end of file

diff --git a/src/lib/pgsql_lease_backend/Makefile.am b/src/lib/pgsql_lease_backend/Makefile.am
deleted file mode 100644 (file)
index 8e7eefc..0000000
--- a/src/lib/pgsql_lease_backend/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-SUBDIRS = . tests
-
-AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CPPFLAGS += $(PGSQL_CPPFLAGS)
-
-AM_CXXFLAGS = $(KEA_CXXFLAGS)
-
-CLEANFILES = *.gcno *.gcda
-
-lib_LTLIBRARIES = libkea-pgsql-lease-backend.la
-
-libkea_pgsql_lease_backend_la_SOURCES = pgsql_lease_mgr.cc pgsql_lease_mgr.h
-
-libkea_pgsql_lease_backend_la_LIBADD = $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la
-libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
-libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
-libkea_pgsql_lease_backend_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_pgsql_lease_backend_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
-
-libkea_pgsql_lease_backend_la_LDFLAGS = $(PGSQL_LIBS)
-
-# Specify the headers for copying into the installation directory tree.
-libkea_pgsql_lease_backend_includedir = $(pkgincludedir)/pgsql_lease_backend
-
-libkea_pgsql_lease_backend_include_HEADERS = \
-        pgsql_lease_mgr.h

diff --git a/src/lib/pgsql_lease_backend/tests/.gitignore b/src/lib/pgsql_lease_backend/tests/.gitignore
deleted file mode 100644 (file)
index 01778b1..0000000
--- a/src/lib/pgsql_lease_backend/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libpgsql_lease_backend_unittests

diff --git a/src/lib/pgsql_lease_backend/tests/Makefile.am b/src/lib/pgsql_lease_backend/tests/Makefile.am
deleted file mode 100644 (file)
index b49947d..0000000
--- a/src/lib/pgsql_lease_backend/tests/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-SUBDIRS = .
-
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CXXFLAGS = $(KEA_CXXFLAGS)
-
-if USE_STATIC_LINK
-AM_LDFLAGS = -static
-endif
-
-CLEANFILES = *.gcno *.gcda
-
-TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
-
-TESTS =
-if HAVE_GTEST
-TESTS += libpgsql_lease_backend_unittests
-
-libpgsql_lease_backend_unittests_SOURCES  = run_unittests.cc
-libpgsql_lease_backend_unittests_SOURCES += pgsql_lease_mgr_unittest.cc
-libpgsql_lease_backend_unittests_SOURCES += pgsql_lease_extended_info_unittest.cc
-libpgsql_lease_backend_unittests_SOURCES += pgsql_bootp_unittest.cc
-
-libpgsql_lease_backend_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-libpgsql_lease_backend_unittests_CPPFLAGS += $(PGSQL_CPPFLAGS)
-
-libpgsql_lease_backend_unittests_CXXFLAGS = $(AM_CXXFLAGS)
-
-libpgsql_lease_backend_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
-libpgsql_lease_backend_unittests_LDFLAGS += $(PGSQL_LIBS)
-
-libpgsql_lease_backend_unittests_LDADD = $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/testutils/libdhcptest.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-libpgsql_lease_backend_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libpgsql_lease_backend_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
-endif
-
-noinst_PROGRAMS = $(TESTS)