From 379ec3ec0aeaed216a3786d569dc5cb157468de8 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Fri, 13 Sep 2024 21:16:17 +0300 Subject: [PATCH] [#3536] moved from lib to hooks --- configure.ac | 8 --- src/Makefile.am | 2 +- src/bin/dhcp4/Makefile.am | 8 +-- src/bin/dhcp4/dhcp4_srv.cc | 4 +- src/bin/dhcp4/json_config_parser.cc | 8 +-- src/bin/dhcp4/tests/Makefile.am | 8 +-- src/bin/dhcp6/Makefile.am | 8 +-- src/bin/dhcp6/dhcp6_srv.cc | 4 +- src/bin/dhcp6/json_config_parser.cc | 8 +-- src/bin/dhcp6/tests/Makefile.am | 8 +-- src/hooks/dhcp/mysql_hb/Makefile.am | 32 ++++++++++ src/hooks/dhcp/mysql_hb/mysql_hb_messages.mes | 0 .../dhcp/mysql_hb}/mysql_host_data_source.cc | 0 .../dhcp/mysql_hb}/mysql_host_data_source.h | 0 src/hooks/dhcp/mysql_hb/tests/.gitignore | 1 + src/hooks/dhcp/mysql_hb/tests/Makefile.am | 56 ++++++++++++++++++ .../tests/mysql_host_data_source_unittest.cc | 2 +- .../dhcp/mysql_hb}/tests/run_unittests.cc | 0 src/hooks/dhcp/mysql_lb/Makefile.am | 32 ++++++++++ src/hooks/dhcp/mysql_lb/mysql_lb_messages.mes | 0 .../dhcp/mysql_lb}/mysql_lease_mgr.cc | 0 .../dhcp/mysql_lb}/mysql_lease_mgr.h | 0 src/hooks/dhcp/mysql_lb/tests/.gitignore | 1 + src/hooks/dhcp/mysql_lb/tests/Makefile.am | 58 +++++++++++++++++++ .../mysql_lb}/tests/mysql_bootp_unittest.cc | 2 +- .../mysql_lease_extended_info_unittest.cc | 2 +- .../tests/mysql_lease_mgr_unittest.cc | 2 +- .../dhcp/mysql_lb}/tests/run_unittests.cc | 0 src/hooks/dhcp/pgsql_hb/Makefile.am | 32 ++++++++++ src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.mes | 0 .../dhcp/pgsql_hb}/pgsql_host_data_source.cc | 0 .../dhcp/pgsql_hb}/pgsql_host_data_source.h | 0 src/hooks/dhcp/pgsql_hb/tests/.gitignore | 1 + src/hooks/dhcp/pgsql_hb/tests/Makefile.am | 56 ++++++++++++++++++ .../tests/pgsql_host_data_source_unittest.cc | 2 +- .../dhcp/pgsql_hb}/tests/run_unittests.cc | 0 src/hooks/dhcp/pgsql_lb/Makefile.am | 32 ++++++++++ src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.mes | 0 .../dhcp/pgsql_lb}/pgsql_lease_mgr.cc | 0 .../dhcp/pgsql_lb}/pgsql_lease_mgr.h | 0 src/hooks/dhcp/pgsql_lb/tests/.gitignore | 1 + src/hooks/dhcp/pgsql_lb/tests/Makefile.am | 58 +++++++++++++++++++ .../pgsql_lb}/tests/pgsql_bootp_unittest.cc | 2 +- .../pgsql_lease_extended_info_unittest.cc | 2 +- .../tests/pgsql_lease_mgr_unittest.cc | 2 +- .../dhcp/pgsql_lb}/tests/run_unittests.cc | 0 src/lib/Makefile.am | 11 ---- src/lib/mysql_host_backend/Makefile.am | 32 ---------- src/lib/mysql_host_backend/tests/.gitignore | 1 - src/lib/mysql_host_backend/tests/Makefile.am | 56 ------------------ src/lib/mysql_lease_backend/Makefile.am | 32 ---------- src/lib/mysql_lease_backend/tests/.gitignore | 1 - src/lib/mysql_lease_backend/tests/Makefile.am | 58 ------------------- src/lib/pgsql_host_backend/Makefile.am | 32 ---------- src/lib/pgsql_host_backend/tests/.gitignore | 1 - src/lib/pgsql_host_backend/tests/Makefile.am | 56 ------------------ src/lib/pgsql_lease_backend/Makefile.am | 32 ---------- src/lib/pgsql_lease_backend/tests/.gitignore | 1 - src/lib/pgsql_lease_backend/tests/Makefile.am | 58 ------------------- 59 files changed, 397 insertions(+), 416 deletions(-) create mode 100644 src/hooks/dhcp/mysql_hb/mysql_hb_messages.mes rename src/{lib/mysql_host_backend => hooks/dhcp/mysql_hb}/mysql_host_data_source.cc (100%) rename src/{lib/mysql_host_backend => hooks/dhcp/mysql_hb}/mysql_host_data_source.h (100%) create mode 100644 src/hooks/dhcp/mysql_hb/tests/.gitignore rename src/{lib/mysql_host_backend => hooks/dhcp/mysql_hb}/tests/mysql_host_data_source_unittest.cc (99%) rename src/{lib/mysql_host_backend => hooks/dhcp/mysql_hb}/tests/run_unittests.cc (100%) create mode 100644 src/hooks/dhcp/mysql_lb/mysql_lb_messages.mes rename src/{lib/mysql_lease_backend => hooks/dhcp/mysql_lb}/mysql_lease_mgr.cc (100%) rename src/{lib/mysql_lease_backend => hooks/dhcp/mysql_lb}/mysql_lease_mgr.h (100%) create mode 100644 src/hooks/dhcp/mysql_lb/tests/.gitignore rename src/{lib/mysql_lease_backend => hooks/dhcp/mysql_lb}/tests/mysql_bootp_unittest.cc (99%) rename src/{lib/mysql_lease_backend => hooks/dhcp/mysql_lb}/tests/mysql_lease_extended_info_unittest.cc (99%) rename src/{lib/mysql_lease_backend => hooks/dhcp/mysql_lb}/tests/mysql_lease_mgr_unittest.cc (99%) rename src/{lib/mysql_lease_backend => hooks/dhcp/mysql_lb}/tests/run_unittests.cc (100%) create mode 100644 src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.mes rename src/{lib/pgsql_host_backend => hooks/dhcp/pgsql_hb}/pgsql_host_data_source.cc (100%) rename src/{lib/pgsql_host_backend => hooks/dhcp/pgsql_hb}/pgsql_host_data_source.h (100%) create mode 100644 src/hooks/dhcp/pgsql_hb/tests/.gitignore rename src/{lib/pgsql_host_backend => hooks/dhcp/pgsql_hb}/tests/pgsql_host_data_source_unittest.cc (99%) rename src/{lib/pgsql_host_backend => hooks/dhcp/pgsql_hb}/tests/run_unittests.cc (100%) create mode 100644 src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.mes rename src/{lib/pgsql_lease_backend => hooks/dhcp/pgsql_lb}/pgsql_lease_mgr.cc (100%) rename src/{lib/pgsql_lease_backend => hooks/dhcp/pgsql_lb}/pgsql_lease_mgr.h (100%) create mode 100644 src/hooks/dhcp/pgsql_lb/tests/.gitignore rename src/{lib/pgsql_lease_backend => hooks/dhcp/pgsql_lb}/tests/pgsql_bootp_unittest.cc (99%) rename src/{lib/pgsql_lease_backend => hooks/dhcp/pgsql_lb}/tests/pgsql_lease_extended_info_unittest.cc (99%) rename src/{lib/pgsql_lease_backend => hooks/dhcp/pgsql_lb}/tests/pgsql_lease_mgr_unittest.cc (99%) rename src/{lib/pgsql_lease_backend => hooks/dhcp/pgsql_lb}/tests/run_unittests.cc (100%) delete mode 100644 src/lib/mysql_host_backend/Makefile.am delete mode 100644 src/lib/mysql_host_backend/tests/.gitignore delete mode 100644 src/lib/mysql_host_backend/tests/Makefile.am delete mode 100644 src/lib/mysql_lease_backend/Makefile.am delete mode 100644 src/lib/mysql_lease_backend/tests/.gitignore delete mode 100644 src/lib/mysql_lease_backend/tests/Makefile.am delete mode 100644 src/lib/pgsql_host_backend/Makefile.am delete mode 100644 src/lib/pgsql_host_backend/tests/.gitignore delete mode 100644 src/lib/pgsql_host_backend/tests/Makefile.am delete mode 100644 src/lib/pgsql_lease_backend/Makefile.am delete mode 100644 src/lib/pgsql_lease_backend/tests/.gitignore delete mode 100644 src/lib/pgsql_lease_backend/tests/Makefile.am diff --git a/configure.ac b/configure.ac index f4d84bf11c..03b7581433 100644 --- 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 2cde2d5275..49397e2a09 100644 --- 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 218ab5b5dd..a94639a812 100644 --- 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 a4225b0c83..d05ebb1c69 100644 --- a/src/bin/dhcp4/dhcp4_srv.cc +++ b/src/bin/dhcp4/dhcp4_srv.cc @@ -59,10 +59,10 @@ #include #ifdef HAVE_MYSQL -#include +#include #endif #ifdef HAVE_PGSQL -#include +#include #endif #include diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc index e2de46da74..79dec5174a 100644 --- a/src/bin/dhcp4/json_config_parser.cc +++ b/src/bin/dhcp4/json_config_parser.cc @@ -48,13 +48,13 @@ #include #ifdef HAVE_MYSQL -#include -#include +#include +#include #endif #ifdef HAVE_PGSQL -#include -#include +#include +#include #endif #include diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am index 69cb5a857e..032ca7c67d 100644 --- 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 796f29e080..2029aff25a 100644 --- 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 137b908749..226011395d 100644 --- a/src/bin/dhcp6/dhcp6_srv.cc +++ b/src/bin/dhcp6/dhcp6_srv.cc @@ -58,10 +58,10 @@ #include #ifdef HAVE_MYSQL -#include +#include #endif #ifdef HAVE_PGSQL -#include +#include #endif #include diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc index 6590e8239e..b9d26a0a1e 100644 --- a/src/bin/dhcp6/json_config_parser.cc +++ b/src/bin/dhcp6/json_config_parser.cc @@ -52,13 +52,13 @@ #include #ifdef HAVE_MYSQL -#include -#include +#include +#include #endif #ifdef HAVE_PGSQL -#include -#include +#include +#include #endif #include diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am index 7fd8de836c..c9aee1b3e5 100644 --- 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 e69de29bb2..18eecd2e63 100644 --- 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 index 0000000000..e69de29bb2 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 index 0000000000..b40805512c --- /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 e69de29bb2..83f5dd87d8 100644 --- 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 d1a8dc04b6..dbef932a09 100644 --- 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 #include #include -#include +#include #include #include #include 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 e69de29bb2..0a1ca53df3 100644 --- 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 index 0000000000..e69de29bb2 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 index 0000000000..c6916138e2 --- /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 e69de29bb2..e94db7edd2 100644 --- 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 2731d55f99..7884854d75 100644 --- 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 #include #include -#include +#include #include #include 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 458bc9d89d..48e2a71240 100644 --- 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 #include #include -#include +#include 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 7a372b173e..af2f7e660e 100644 --- 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 #include -#include +#include #include #include #include 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 e69de29bb2..a181c3dc15 100644 --- 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 index 0000000000..e69de29bb2 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 index 0000000000..2ab2ed23b5 --- /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 e69de29bb2..2fd06c8a5f 100644 --- 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 015e594845..dc0eb4bae4 100644 --- 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 #include #include -#include +#include #include #include #include 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 e69de29bb2..8e7eefc8b0 100644 --- 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 index 0000000000..e69de29bb2 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 index 0000000000..16bd90552d --- /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 e69de29bb2..b49947d7b5 100644 --- 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 f80324e6e5..33e06eb405 100644 --- 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 #include #include -#include +#include #include #include 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 a0cd296e22..2d185874ce 100644 --- 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 #include #include -#include +#include 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 c34c9ef626..2551870d14 100644 --- 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 #include -#include +#include #include #include #include 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 0f77fc48da..f69bf37d18 100644 --- 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 index 18eecd2e63..0000000000 --- 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 index 8b96f60333..0000000000 --- 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 index 83f5dd87d8..0000000000 --- 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 index 0a1ca53df3..0000000000 --- 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 index b48dc34053..0000000000 --- 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 index e94db7edd2..0000000000 --- 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 index a181c3dc15..0000000000 --- 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 index efb5bce039..0000000000 --- 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 index 2fd06c8a5f..0000000000 --- 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 index 8e7eefc8b0..0000000000 --- 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 index 01778b1368..0000000000 --- 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 index b49947d7b5..0000000000 --- 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)