[3628] Moved configuration parsers to dhcpsrv/parsers.

diff --git a/src/bin/d2/d2_config.cc b/src/bin/d2/d2_config.cc
index 62d3ce21c1c9abd976c1eca58c0fc9dacf5bac45..ba156bfd98fe8aeeac51ad52e67c5eb4b30876cc 100644 (file)
--- a/src/bin/d2/d2_config.cc
+++ b/src/bin/d2/d2_config.cc
@@ -14,7 +14,7 @@
 
 #include <d2/d2_log.h>
 #include <d2/d2_cfg_mgr.h>
-#include <dhcpsrv/dhcp_parsers.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <exceptions/exceptions.h>
 #include <asiolink/io_error.h>
 

diff --git a/src/bin/d2/d2_config.h b/src/bin/d2/d2_config.h
index bb9f7f1c92171020094ee93f80f45bd26eaa3573..bde1217b315651b71cc6a0d88f14d5ae0b6d8c0d 100644 (file)
--- a/src/bin/d2/d2_config.h
+++ b/src/bin/d2/d2_config.h
@@ -18,7 +18,7 @@
 #include <cc/data.h>
 #include <d2/d2_asio.h>
 #include <d2/d_cfg_mgr.h>
-#include <dhcpsrv/dhcp_parsers.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <dns/tsig.h>
 #include <exceptions/exceptions.h>
 

diff --git a/src/bin/d2/d_cfg_mgr.cc b/src/bin/d2/d_cfg_mgr.cc
index ec65b7b9febe320d0bf5c616f67be73f0f7aff75..e4f287a154faa261ddf276ff4d50d1f994938947 100644 (file)
--- a/src/bin/d2/d_cfg_mgr.cc
+++ b/src/bin/d2/d_cfg_mgr.cc
@@ -16,7 +16,7 @@
 #include <d2/d2_log.h>
 #include <dhcp/libdhcp++.h>
 #include <d2/d_cfg_mgr.h>
-#include <dhcpsrv/dhcp_parsers.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <util/encode/hex.h>
 #include <util/strutil.h>
 

diff --git a/src/bin/d2/d_cfg_mgr.h b/src/bin/d2/d_cfg_mgr.h
index 2317519f65609aad4c2242e7080c854682de66c5..c479f7eb5d9cda7931de161c140ac86ba4f31fb5 100644 (file)
--- a/src/bin/d2/d_cfg_mgr.h
+++ b/src/bin/d2/d_cfg_mgr.h
@@ -17,7 +17,7 @@
 
 #include <cc/data.h>
 #include <exceptions/exceptions.h>
-#include <dhcpsrv/dhcp_parsers.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 
 #include <stdint.h>
 #include <string>

diff --git a/src/bin/d2/tests/d_cfg_mgr_unittests.cc b/src/bin/d2/tests/d_cfg_mgr_unittests.cc
index ba2ccf906c40afb13760451403a18be5ecc920cb..72813dd213e631a16d4b642670e8307dd53a7f8e 100644 (file)
--- a/src/bin/d2/tests/d_cfg_mgr_unittests.cc
+++ b/src/bin/d2/tests/d_cfg_mgr_unittests.cc
@@ -14,7 +14,7 @@
 
 #include <config/ccsession.h>
 #include <config/module_spec.h>
-#include <dhcpsrv/dhcp_parsers.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <d2/d_cfg_mgr.h>
 #include <d_test_stubs.h>
 

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 91086ac7a951b01ccea16e66a51ae4ab4ef704c8..b2551ce4767c13c6bf5727f63ed8e8a3d4616836 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -19,9 +19,9 @@
 #include <dhcpsrv/cfg_option.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcp4/json_config_parser.h>
-#include <dhcpsrv/dbaccess_parser.h>
-#include <dhcpsrv/dhcp_parsers.h>
 #include <dhcpsrv/option_space_container.h>
+#include <dhcpsrv/parsers/dbaccess_parser.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <util/encode/hex.h>
 #include <util/strutil.h>
 

diff --git a/src/bin/dhcp4/json_config_parser.h b/src/bin/dhcp4/json_config_parser.h
index 3af9911f5d726a51c5d7071fcde26729566ba687..eb9c6f8150d34ab0c8b12a27298ca1b779b6204d 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.h
+++ b/src/bin/dhcp4/json_config_parser.h
@@ -13,8 +13,8 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <cc/data.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <exceptions/exceptions.h>
-#include <dhcpsrv/dhcp_parsers.h>
 
 #include <stdint.h>
 #include <string>

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 707766a780b2d76276e55a3bdf907098517879ae..a7c81fbea10793d319adc1a70843a1027aa16c5f 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -21,12 +21,12 @@
 #include <dhcp/iface_mgr.h>
 #include <dhcpsrv/cfg_option.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/dbaccess_parser.h>
-#include <dhcpsrv/dhcp_config_parser.h>
-#include <dhcpsrv/dhcp_parsers.h>
 #include <dhcpsrv/pool.h>
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/triplet.h>
+#include <dhcpsrv/parsers/dbaccess_parser.h>
+#include <dhcpsrv/parsers/dhcp_config_parser.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <log/logger_support.h>
 #include <util/encode/hex.h>
 #include <util/strutil.h>

diff --git a/src/bin/dhcp6/json_config_parser.h b/src/bin/dhcp6/json_config_parser.h
index bd571af0bd578bf129cdfdefc499b53305b2ea36..d3c1b27f3fc795b948e9a81950502355e084b703 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.h
+++ b/src/bin/dhcp6/json_config_parser.h
@@ -19,8 +19,8 @@
 /// DHCPv4 and DHCPv6. They should be merged. See ticket #2355.
 
 #include <cc/data.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <exceptions/exceptions.h>
-#include <dhcpsrv/dhcp_parsers.h>
 
 #include <string>
 

diff --git a/src/bin/dhcp6/kea_controller.cc b/src/bin/dhcp6/kea_controller.cc
index 5fc59aec187a3fe21524f11ee88f260bfaf58816..e28fd41205186041cd3b2d6a1fa8489e4de5c6ac 100644 (file)
--- a/src/bin/dhcp6/kea_controller.cc
+++ b/src/bin/dhcp6/kea_controller.cc
@@ -15,8 +15,8 @@
 #include <config.h>
 
 #include <asiolink/asiolink.h>
-#include <dhcpsrv/dhcp_config_parser.h>
 #include <dhcpsrv/cfgmgr.h>
+#include <dhcpsrv/parsers/dhcp_config_parser.h>
 #include <dhcp6/json_config_parser.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
 #include <dhcp6/dhcp6_log.h>

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index 781f6bd020d3b0ffcb4234ed3d0bcd7677e22858..c85f83a4a9f1a4e9bcc1c929917b4b4af89d185c 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SUBDIRS = . testutils tests
 
 dhcp_data_dir = @localstatedir@/@PACKAGE@
@@ -14,6 +16,17 @@ endif
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
+# The files in the subfolder must be explicitly specified here so
+# as they are copied to the distribution. The other option would
+# be to specify a whole 'parsers' folder here but that would also
+# copy all other files, e.g. gitignore, .git etc.
+# Whenever new file is added to the parsers folder, it must be
+# added here.
+EXTRA_DIST =
+EXTRA_DIST += dbaccess_parser.cc dbaccess_parser.h
+EXTRA_DIST += dhcp_parsers.cc dhcp_parsers.h
+EXTRA_DIST += host_reservation_parser.cc host_reservation_parser.h
+
 # Define rule to build logging source files from message file
 dhcpsrv_messages.h dhcpsrv_messages.cc: s-messages
 
@@ -58,13 +71,9 @@ libkea_dhcpsrv_la_SOURCES += csv_lease_file6.cc csv_lease_file6.h
 libkea_dhcpsrv_la_SOURCES += d2_client_cfg.cc d2_client_cfg.h
 libkea_dhcpsrv_la_SOURCES += d2_client_mgr.cc d2_client_mgr.h
 libkea_dhcpsrv_la_SOURCES += daemon.cc daemon.h
-libkea_dhcpsrv_la_SOURCES += dbaccess_parser.cc dbaccess_parser.h
 libkea_dhcpsrv_la_SOURCES += dhcpsrv_log.cc dhcpsrv_log.h
-libkea_dhcpsrv_la_SOURCES += dhcp_config_parser.h
-libkea_dhcpsrv_la_SOURCES += dhcp_parsers.cc dhcp_parsers.h
 libkea_dhcpsrv_la_SOURCES += host.cc host.h
 libkea_dhcpsrv_la_SOURCES += host_container.h
-libkea_dhcpsrv_la_SOURCES += host_reservation_parser.cc host_reservation_parser.h
 libkea_dhcpsrv_la_SOURCES += key_from_key.h
 libkea_dhcpsrv_la_SOURCES += lease.cc lease.h
 libkea_dhcpsrv_la_SOURCES += lease_mgr.cc lease_mgr.h
@@ -88,6 +97,15 @@ libkea_dhcpsrv_la_SOURCES += subnet_selector.h
 libkea_dhcpsrv_la_SOURCES += triplet.h
 libkea_dhcpsrv_la_SOURCES += utils.h
 
+# Configuration parsers
+libkea_dhcpsrv_la_SOURCES += parsers/dhcp_config_parser.h
+libkea_dhcpsrv_la_SOURCES += parsers/dbaccess_parser.cc
+libkea_dhcpsrv_la_SOURCES += parsers/dbaccess_parser.h
+libkea_dhcpsrv_la_SOURCES += parsers/dhcp_parsers.cc
+libkea_dhcpsrv_la_SOURCES += parsers/dhcp_parsers.h
+libkea_dhcpsrv_la_SOURCES += parsers/host_reservation_parser.cc
+libkea_dhcpsrv_la_SOURCES += parsers/host_reservation_parser.h
+
 nodist_libkea_dhcpsrv_la_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc
 
 libkea_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS)
@@ -117,7 +135,7 @@ libkea_dhcpsrv_la_CXXFLAGS += -Wno-unused-parameter
 endif
 
 # The message file should be in the distribution
-EXTRA_DIST = dhcpsrv_messages.mes
+EXTRA_DIST += dhcpsrv_messages.mes
 
 # Distribute MySQL schema creation script and backend documentation
 EXTRA_DIST += dhcpdb_create.mysql dhcpdb_create.pgsql database_backends.dox libdhcpsrv.dox

diff --git a/src/lib/dhcpsrv/dbaccess_parser.cc b/src/lib/dhcpsrv/parsers/dbaccess_parser.cc
similarity index 99%
rename from src/lib/dhcpsrv/dbaccess_parser.cc
rename to src/lib/dhcpsrv/parsers/dbaccess_parser.cc
index 4fdcbfd3b8addfc4f5c89bb55bd4a74d3eb9af97..c6ec802acf3c617ccfa10137f07e011b6ef692a6 100644 (file)
--- a/src/lib/dhcpsrv/dbaccess_parser.cc
+++ b/src/lib/dhcpsrv/parsers/dbaccess_parser.cc
@@ -13,9 +13,9 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <dhcp/option.h>
-#include <dhcpsrv/dbaccess_parser.h>
 #include <dhcpsrv/dhcpsrv_log.h>
 #include <dhcpsrv/lease_mgr_factory.h>
+#include <dhcpsrv/parsers/dbaccess_parser.h>
 
 #include <boost/foreach.hpp>
 

diff --git a/src/lib/dhcpsrv/dbaccess_parser.h b/src/lib/dhcpsrv/parsers/dbaccess_parser.h
similarity index 98%
rename from src/lib/dhcpsrv/dbaccess_parser.h
rename to src/lib/dhcpsrv/parsers/dbaccess_parser.h
index 824fd272cb8f5ecc7d1073126da964bf81380aba..fd6cc7b715b7d13f8d37af1b090f858d90e36225 100644 (file)
--- a/src/lib/dhcpsrv/dbaccess_parser.h
+++ b/src/lib/dhcpsrv/parsers/dbaccess_parser.h
@@ -16,8 +16,8 @@
 #define DBACCESS_PARSER_H
 
 #include <cc/data.h>
-#include <dhcpsrv/dhcp_config_parser.h>
-#include <dhcpsrv/dhcp_parsers.h>
+#include <dhcpsrv/parsers/dhcp_config_parser.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <exceptions/exceptions.h>
 
 #include <string>

diff --git a/src/lib/dhcpsrv/dhcp_config_parser.h b/src/lib/dhcpsrv/parsers/dhcp_config_parser.h
similarity index 100%
rename from src/lib/dhcpsrv/dhcp_config_parser.h
rename to src/lib/dhcpsrv/parsers/dhcp_config_parser.h

diff --git a/src/lib/dhcpsrv/dhcp_parsers.cc b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
similarity index 99%
rename from src/lib/dhcpsrv/dhcp_parsers.cc
rename to src/lib/dhcpsrv/parsers/dhcp_parsers.cc
index ab083b97e2314eb59c84f09c75f57660c2140f1a..0b1e94e5103200dcc0bd9b011a24a7882824e947 100644 (file)
--- a/src/lib/dhcpsrv/dhcp_parsers.cc
+++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
@@ -16,7 +16,7 @@
 #include <dhcp/libdhcp++.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/cfg_option.h>
-#include <dhcpsrv/dhcp_parsers.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <hooks/hooks_manager.h>
 #include <util/encode/hex.h>
 #include <util/strutil.h>

diff --git a/src/lib/dhcpsrv/dhcp_parsers.h b/src/lib/dhcpsrv/parsers/dhcp_parsers.h
similarity index 99%
rename from src/lib/dhcpsrv/dhcp_parsers.h
rename to src/lib/dhcpsrv/parsers/dhcp_parsers.h
index 92af0b9b7646ed7b411d45d6da3d952ccdd01338..fc5b8142e9763b7514432f0225cc29100e11b23c 100644 (file)
--- a/src/lib/dhcpsrv/dhcp_parsers.h
+++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.h
@@ -19,11 +19,11 @@
 #include <cc/data.h>
 #include <dhcp/option_definition.h>
 #include <dhcpsrv/d2_client_cfg.h>
-#include <dhcpsrv/dhcp_config_parser.h>
 #include <dhcpsrv/cfg_iface.h>
 #include <dhcpsrv/cfg_option.h>
 #include <dhcpsrv/option_space_container.h>
 #include <dhcpsrv/subnet.h>
+#include <dhcpsrv/parsers/dhcp_config_parser.h>
 #include <exceptions/exceptions.h>
 
 #include <boost/shared_ptr.hpp>

diff --git a/src/lib/dhcpsrv/host_reservation_parser.cc b/src/lib/dhcpsrv/parsers/host_reservation_parser.cc
similarity index 99%
rename from src/lib/dhcpsrv/host_reservation_parser.cc
rename to src/lib/dhcpsrv/parsers/host_reservation_parser.cc
index a60629777dce0e4665a543a33b8e19e622d51118..9dfd05c7ac00e45463190eb2f0df280b681aef6f 100644 (file)
--- a/src/lib/dhcpsrv/host_reservation_parser.cc
+++ b/src/lib/dhcpsrv/parsers/host_reservation_parser.cc
@@ -14,7 +14,7 @@
 
 #include <asiolink/io_address.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/host_reservation_parser.h>
+#include <dhcpsrv/parsers/host_reservation_parser.h>
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <string>

diff --git a/src/lib/dhcpsrv/host_reservation_parser.h b/src/lib/dhcpsrv/parsers/host_reservation_parser.h
similarity index 98%
rename from src/lib/dhcpsrv/host_reservation_parser.h
rename to src/lib/dhcpsrv/parsers/host_reservation_parser.h
index 269acf0d1f53b568daffa673e5ee9a16b8ebc4c9..f8b8200d0b2659bb4376e16b9810395c46d77d3e 100644 (file)
--- a/src/lib/dhcpsrv/host_reservation_parser.h
+++ b/src/lib/dhcpsrv/parsers/host_reservation_parser.h
@@ -16,8 +16,8 @@
 #define HOST_RESERVATION_PARSER_H
 
 #include <cc/data.h>
-#include <dhcpsrv/dhcp_config_parser.h>
 #include <dhcpsrv/host.h>
+#include <dhcpsrv/parsers/dhcp_config_parser.h>
 
 namespace isc {
 namespace dhcp {

diff --git a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
index cdce00572dc75f81c2069d63f5567ebdd970fed7..bf007b91b27f2599dbfe3b8d1ebdd71e4bf039ff 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
@@ -18,8 +18,8 @@
 #include <dhcp/dhcp6.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/dhcp_parsers.h>
 #include <dhcpsrv/subnet_id.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 
 #include <gtest/gtest.h>
 

diff --git a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
index ac5837fa658e8ebeed46c82e4f908dfe8ad64638..54fcf99fa91804a4caa53587da94fcd3deeeb411 100644 (file)
--- a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
@@ -15,9 +15,8 @@
 #include <config.h>
 
 #include <config/ccsession.h>
-#include <dhcpsrv/dbaccess_parser.h>
-#include <dhcpsrv/dhcp_parsers.h>
 #include <dhcpsrv/lease_mgr_factory.h>
+#include <dhcpsrv/parsers/dbaccess_parser.h>
 #include <log/logger_support.h>
 
 #include <gtest/gtest.h>

diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
index d92886fd728bc515bcc333e757c13e9df8adce6b..e86523355623fa3a7c10e274c7f2bffbc64a20a1 100644 (file)
--- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
@@ -21,7 +21,7 @@
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/subnet.h>
-#include <dhcpsrv/dhcp_parsers.h>
+#include <dhcpsrv/parsers/dhcp_parsers.h>
 #include <dhcpsrv/tests/test_libraries.h>
 #include <dhcpsrv/testutils/config_result_check.h>
 #include <exceptions/exceptions.h>

diff --git a/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc b/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc
index 70e74a2bd57eadabf4abebc6cda447175474a0b3..82dc6cdb36be411ad0160d2daacd0cec79b8eb0d 100644 (file)
--- a/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc
+++ b/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc
@@ -20,7 +20,7 @@
 #include <dhcp/hwaddr.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/host.h>
-#include <dhcpsrv/host_reservation_parser.h>
+#include <dhcpsrv/parsers/host_reservation_parser.h>
 #include <dhcpsrv/testutils/config_result_check.h>
 #include <gtest/gtest.h>
 #include <iterator>