From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 19 Oct 2018 13:12:25 +0000 (-0400)
Subject: [#101,!87] Disable config-control in kea-dhcp4 until CB work resumes
X-Git-Tag: 180-address-some-doxygen-warnings-errors_base~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6e628c91e1daf0a6cd94f4554571fc24d24fd59;p=thirdparty%2Fkea.git

[#101,!87] Disable config-control in kea-dhcp4 until CB work resumes
---

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 654a0c4f68..2b8ad3cdbf 100644
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -596,8 +596,10 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
                 CfgMgr::instance().getStagingCfg()->getHooksConfig();
             libraries.loadLibraries();
 
+#ifdef CONFIG_BACKEND // Disabled until we restart CB work
             // If there are config backends, fetch and merge into staging config
             databaseConfigFetch(srv_cfg, mutable_cfg);
+#endif
         }
         catch (const isc::Exception& ex) {
             LOG_ERROR(dhcp4_logger, DHCP4_PARSER_COMMIT_FAIL).arg(ex.what());
diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index 4168b309d4..fbb8599e21 100644
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -6259,6 +6259,9 @@ TEST_F(Dhcp4ParserTest, globalReservations) {
     EXPECT_FALSE(hosts_cfg->get4(542, Host::IDENT_DUID, &duid[0], duid.size()));
 }
 
+// Rather than disable these tests they are compiled out.  This avoids them
+// reporting as disbabled and thereby drawing attention to them.
+#ifdef CONFIG_BACKEND
 // This test verifies that configuration control with unsupported type fails
 TEST_F(Dhcp4ParserTest, configControlInfoNoFactory) {
     string config = PARSER_CONFIGS[6];
@@ -6336,5 +6339,6 @@ TEST_F(Dhcp4ParserTest, serverTag) {
     // Make sure a invalid server-tag fails to parse.
     ASSERT_THROW(parseDHCP4(bad_tag), std::exception);
 }
+#endif // CONFIG_BACKEND
 
 }