From: Francis Dupont Date: Sat, 17 Nov 2018 13:37:42 +0000 (+0100) Subject: [182-remove-always-include-fqdn-configuration-parameter-from-d2clientconfig] Removed... X-Git-Tag: 204-move-models-base~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e773c34fbfba61a3d24b50e855ea2e2ab256b744;p=thirdparty%2Fkea.git [182-remove-always-include-fqdn-configuration-parameter-from-d2clientconfig] Removed always-include-fqdn --- diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll index eb1f0f3cfd..c4b5c26f83 100644 --- a/src/bin/dhcp4/dhcp4_lexer.ll +++ b/src/bin/dhcp4/dhcp4_lexer.ll @@ -1340,15 +1340,6 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} } } -\"always-include-fqdn\" { - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::DHCP_DDNS: - return isc::dhcp::Dhcp4Parser::make_ALWAYS_INCLUDE_FQDN(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("always-include-fqdn", driver.loc_); - } -} - \"override-no-update\" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy index e18fc66584..a3add7ff85 100644 --- a/src/bin/dhcp4/dhcp4_parser.yy +++ b/src/bin/dhcp4/dhcp4_parser.yy @@ -183,7 +183,6 @@ using namespace std; MAX_QUEUE_SIZE "max-queue-size" NCR_PROTOCOL "ncr-protocol" NCR_FORMAT "ncr-format" - ALWAYS_INCLUDE_FQDN "always-include-fqdn" OVERRIDE_NO_UPDATE "override-no-update" OVERRIDE_CLIENT_UPDATE "override-client-update" REPLACE_CLIENT_NAME "replace-client-name" @@ -1891,7 +1890,6 @@ dhcp_ddns_param: enable_updates | max_queue_size | ncr_protocol | ncr_format - | always_include_fqdn | override_no_update | override_client_update | replace_client_name @@ -1967,11 +1965,6 @@ ncr_format: NCR_FORMAT { ctx.leave(); }; -always_include_fqdn: ALWAYS_INCLUDE_FQDN COLON BOOLEAN { - ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); - ctx.stack_.back()->set("always-include-fqdn", b); -}; - override_no_update: OVERRIDE_NO_UPDATE COLON BOOLEAN { ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); ctx.stack_.back()->set("override-no-update", b); diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index 4c8ba4148d..c4191183fa 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -4121,7 +4121,6 @@ TEST_F(Dhcp4ParserTest, d2ClientConfig) { " \"max-queue-size\" : 2048, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " @@ -4185,7 +4184,6 @@ TEST_F(Dhcp4ParserTest, invalidD2ClientConfig) { " \"server-port\" : 5301, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " diff --git a/src/bin/dhcp4/tests/d2_unittest.cc b/src/bin/dhcp4/tests/d2_unittest.cc index 8d71f6023a..f5ebbdb9da 100644 --- a/src/bin/dhcp4/tests/d2_unittest.cc +++ b/src/bin/dhcp4/tests/d2_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -108,7 +108,6 @@ Dhcp4SrvD2Test::configureD2(bool enable_d2, const bool exp_result, " \"max-queue-size\" : " << max_queue_size << ", " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " @@ -406,7 +405,6 @@ TEST_F(Dhcp4SrvD2Test, badTCP) { " \"max-queue-size\" : 1024, " " \"ncr-protocol\" : \"TCP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " @@ -446,7 +444,6 @@ TEST_F(Dhcp4SrvD2Test, badFamily) { " \"max-queue-size\" : 1024, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " @@ -486,7 +483,6 @@ TEST_F(Dhcp4SrvD2Test, senderEqServer) { " \"max-queue-size\" : 1024, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll index f355160c56..dd9d789208 100644 --- a/src/bin/dhcp6/dhcp6_lexer.ll +++ b/src/bin/dhcp6/dhcp6_lexer.ll @@ -268,15 +268,6 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} } } -\"always-include-fqdn\" { - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::DHCP_DDNS: - return isc::dhcp::Dhcp6Parser::make_ALWAYS_INCLUDE_FQDN(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("always-include-fqdn", driver.loc_); - } -} - \"override-no-update\" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy index 2328636e6f..1b88046c0a 100644 --- a/src/bin/dhcp6/dhcp6_parser.yy +++ b/src/bin/dhcp6/dhcp6_parser.yy @@ -185,7 +185,6 @@ using namespace std; MAX_QUEUE_SIZE "max-queue-size" NCR_PROTOCOL "ncr-protocol" NCR_FORMAT "ncr-format" - ALWAYS_INCLUDE_FQDN "always-include-fqdn" OVERRIDE_NO_UPDATE "override-no-update" OVERRIDE_CLIENT_UPDATE "override-client-update" REPLACE_CLIENT_NAME "replace-client-name" @@ -1980,7 +1979,6 @@ dhcp_ddns_param: enable_updates | max_queue_size | ncr_protocol | ncr_format - | always_include_fqdn | override_no_update | override_client_update | replace_client_name @@ -2056,11 +2054,6 @@ ncr_format: NCR_FORMAT { ctx.leave(); }; -always_include_fqdn: ALWAYS_INCLUDE_FQDN COLON BOOLEAN { - ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); - ctx.stack_.back()->set("always-include-fqdn", b); -}; - override_no_update: OVERRIDE_NO_UPDATE COLON BOOLEAN { ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); ctx.stack_.back()->set("override-no-update", b); diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc index 027afcd498..8aa6d6213c 100644 --- a/src/bin/dhcp6/tests/config_parser_unittest.cc +++ b/src/bin/dhcp6/tests/config_parser_unittest.cc @@ -4575,7 +4575,6 @@ TEST_F(Dhcp6ParserTest, d2ClientConfig) { " \"max-queue-size\" : 2048, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " @@ -4640,7 +4639,6 @@ TEST_F(Dhcp6ParserTest, invalidD2ClientConfig) { " \"server-port\" : 5301, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " diff --git a/src/bin/dhcp6/tests/d2_unittest.cc b/src/bin/dhcp6/tests/d2_unittest.cc index d1f1c26b7e..79b1d94846 100644 --- a/src/bin/dhcp6/tests/d2_unittest.cc +++ b/src/bin/dhcp6/tests/d2_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -113,7 +113,6 @@ Dhcp6SrvD2Test::configureD2(bool enable_d2, const bool exp_result, " \"max-queue-size\" : " << max_queue_size << ", " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " diff --git a/src/lib/dhcpsrv/d2_client_cfg.cc b/src/lib/dhcpsrv/d2_client_cfg.cc index 6eae3b2b74..8aa262b951 100644 --- a/src/lib/dhcpsrv/d2_client_cfg.cc +++ b/src/lib/dhcpsrv/d2_client_cfg.cc @@ -30,7 +30,6 @@ const size_t D2ClientConfig::DFT_SENDER_PORT = 0; const size_t D2ClientConfig::DFT_MAX_QUEUE_SIZE = 1024; const char* D2ClientConfig::DFT_NCR_PROTOCOL = "UDP"; const char* D2ClientConfig::DFT_NCR_FORMAT = "JSON"; -const bool D2ClientConfig::DFT_ALWAYS_INCLUDE_FQDN = false; const bool D2ClientConfig::DFT_OVERRIDE_NO_UPDATE = false; const bool D2ClientConfig::DFT_OVERRIDE_CLIENT_UPDATE = false; const char* D2ClientConfig::DFT_REPLACE_CLIENT_NAME_MODE = "NEVER"; @@ -90,7 +89,6 @@ D2ClientConfig::D2ClientConfig(const bool enable_updates, NameChangeProtocol& ncr_protocol, const dhcp_ddns:: NameChangeFormat& ncr_format, - const bool always_include_fqdn, const bool override_no_update, const bool override_client_update, const ReplaceClientNameMode replace_client_name_mode, @@ -106,7 +104,6 @@ D2ClientConfig::D2ClientConfig(const bool enable_updates, max_queue_size_(max_queue_size), ncr_protocol_(ncr_protocol), ncr_format_(ncr_format), - always_include_fqdn_(always_include_fqdn), override_no_update_(override_no_update), override_client_update_(override_client_update), replace_client_name_mode_(replace_client_name_mode), @@ -127,7 +124,6 @@ D2ClientConfig::D2ClientConfig() max_queue_size_(DFT_MAX_QUEUE_SIZE), ncr_protocol_(dhcp_ddns::stringToNcrProtocol(DFT_NCR_PROTOCOL)), ncr_format_(dhcp_ddns::stringToNcrFormat(DFT_NCR_FORMAT)), - always_include_fqdn_(DFT_ALWAYS_INCLUDE_FQDN), override_no_update_(DFT_OVERRIDE_NO_UPDATE), override_client_update_(DFT_OVERRIDE_CLIENT_UPDATE), replace_client_name_mode_(stringToReplaceClientNameMode(DFT_REPLACE_CLIENT_NAME_MODE)), @@ -198,7 +194,6 @@ D2ClientConfig::operator == (const D2ClientConfig& other) const { (max_queue_size_ == other.max_queue_size_) && (ncr_protocol_ == other.ncr_protocol_) && (ncr_format_ == other.ncr_format_) && - (always_include_fqdn_ == other.always_include_fqdn_) && (override_no_update_ == other.override_no_update_) && (override_client_update_ == other.override_client_update_) && (replace_client_name_mode_ == other.replace_client_name_mode_) && @@ -226,8 +221,6 @@ D2ClientConfig::toText() const { << ", max-queue-size: " << max_queue_size_ << ", ncr-protocol: " << ncrProtocolToString(ncr_protocol_) << ", ncr-format: " << ncrFormatToString(ncr_format_) - << ", always-include-fqdn: " << (always_include_fqdn_ ? - "yes" : "no") << ", override-no-update: " << (override_no_update_ ? "yes" : "no") << ", override-client-update: " << (override_client_update_ ? @@ -266,8 +259,6 @@ D2ClientConfig::toElement() const { result->set("ncr-protocol", Element::create(dhcp_ddns::ncrProtocolToString(ncr_protocol_))); // Set ncr-format result->set("ncr-format", Element::create(dhcp_ddns::ncrFormatToString(ncr_format_))); - // Set always-include-fqdn - result->set("always-include-fqdn", Element::create(always_include_fqdn_)); // Set override-no-update result->set("override-no-update", Element::create(override_no_update_)); // Set override-client-update diff --git a/src/lib/dhcpsrv/d2_client_cfg.h b/src/lib/dhcpsrv/d2_client_cfg.h index 2c00a9237f..d8e001e60f 100644 --- a/src/lib/dhcpsrv/d2_client_cfg.h +++ b/src/lib/dhcpsrv/d2_client_cfg.h @@ -61,7 +61,6 @@ public: static const size_t DFT_MAX_QUEUE_SIZE; static const char* DFT_NCR_PROTOCOL; static const char* DFT_NCR_FORMAT; - static const bool DFT_ALWAYS_INCLUDE_FQDN; static const bool DFT_OVERRIDE_NO_UPDATE; static const bool DFT_OVERRIDE_CLIENT_UPDATE; static const char* DFT_REPLACE_CLIENT_NAME_MODE; @@ -89,8 +88,6 @@ public: /// Currently only UDP is supported. /// @param ncr_format Format of the kea-dhcp-ddns requests. /// Currently only JSON format is supported. - /// @param always_include_fqdn Enables always including the FQDN option in - /// DHCP responses. /// @param override_no_update Enables updates, even if clients request no /// updates. /// @param override_client_update Perform updates, even if client requested @@ -116,7 +113,6 @@ public: const size_t max_queue_size, const dhcp_ddns::NameChangeProtocol& ncr_protocol, const dhcp_ddns::NameChangeFormat& ncr_format, - const bool always_include_fqdn, const bool override_no_update, const bool override_client_update, const ReplaceClientNameMode replace_client_name_mode, @@ -173,11 +169,6 @@ public: return(ncr_format_); } - /// @brief Return whether or not FQDN is always included in DHCP responses. - bool getAlwaysIncludeFqdn() const { - return(always_include_fqdn_); - } - /// @brief Return if updates are done even if clients request no updates. bool getOverrideNoUpdate() const { return(override_no_update_); @@ -297,9 +288,6 @@ private: /// Currently only JSON format is supported. dhcp_ddns::NameChangeFormat ncr_format_; - /// @brief Should Kea always include the FQDN option in its response. - bool always_include_fqdn_; - /// @brief Should Kea perform updates, even if client requested no updates. /// Overrides the client request for no updates via the N flag. bool override_no_update_; diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc index 0b124fc7ee..28f8c57958 100644 --- a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc +++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc @@ -1310,9 +1310,6 @@ D2ClientConfigParser::parse(isc::data::ConstElementPtr client_config) { dhcp_ddns::NameChangeFormat ncr_format = getFormat(client_config, "ncr-format"); - bool always_include_fqdn = - getBoolean(client_config, "always-include-fqdn"); - bool override_no_update = getBoolean(client_config, "override-no-update"); @@ -1407,7 +1404,6 @@ D2ClientConfigParser::parse(isc::data::ConstElementPtr client_config) { max_queue_size, ncr_protocol, ncr_format, - always_include_fqdn, override_no_update, override_client_update, replace_client_name_mode, @@ -1441,7 +1437,6 @@ const SimpleDefaults D2ClientConfigParser::D2_CLIENT_CONFIG_DEFAULTS = { { "max-queue-size", Element::integer, "1024" }, { "ncr-protocol", Element::string, "UDP" }, { "ncr-format", Element::string, "JSON" }, - { "always-include-fqdn", Element::boolean, "false" }, { "override-no-update", Element::boolean, "false" }, { "override-client-update", Element::boolean, "false" }, { "replace-client-name", Element::string, "never" }, diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.h b/src/lib/dhcpsrv/parsers/dhcp_parsers.h index 5fd98e38d6..92e1937cf3 100644 --- a/src/lib/dhcpsrv/parsers/dhcp_parsers.h +++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.h @@ -798,7 +798,6 @@ public: /// -# max-queue-size /// -# ncr-protocol /// -# ncr-format - /// -# always-include-fqdn /// -# override-no-update /// -# override-client-update /// -# replace-client-name diff --git a/src/lib/dhcpsrv/tests/d2_client_unittest.cc b/src/lib/dhcpsrv/tests/d2_client_unittest.cc index bf3a3d826c..0c68a6c38a 100644 --- a/src/lib/dhcpsrv/tests/d2_client_unittest.cc +++ b/src/lib/dhcpsrv/tests/d2_client_unittest.cc @@ -77,7 +77,6 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) { size_t max_queue_size = 2048; dhcp_ddns::NameChangeProtocol ncr_protocol = dhcp_ddns::NCR_UDP; dhcp_ddns::NameChangeFormat ncr_format = dhcp_ddns::FMT_JSON; - bool always_include_fqdn = true; bool override_no_update = true; bool override_client_update = true; D2ClientConfig::ReplaceClientNameMode replace_client_name_mode = D2ClientConfig:: @@ -97,7 +96,6 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) { max_queue_size, ncr_protocol, ncr_format, - always_include_fqdn, override_no_update, override_client_update, replace_client_name_mode, @@ -122,7 +120,6 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) { EXPECT_EQ(d2_client_config->getMaxQueueSize(), max_queue_size); EXPECT_EQ(d2_client_config->getNcrProtocol(), ncr_protocol); EXPECT_EQ(d2_client_config->getNcrFormat(), ncr_format); - EXPECT_EQ(d2_client_config->getAlwaysIncludeFqdn(), always_include_fqdn); EXPECT_EQ(d2_client_config->getOverrideNoUpdate(), override_no_update); EXPECT_EQ(d2_client_config->getOverrideClientUpdate(), override_client_update); @@ -152,7 +149,6 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) { "\"max-queue-size\": 2048,\n" "\"ncr-protocol\": \"UDP\",\n" "\"ncr-format\": \"JSON\",\n" - "\"always-include-fqdn\": true,\n" "\"override-no-update\": true,\n" "\"override-client-update\": true,\n" "\"replace-client-name\": \"when-present\",\n" @@ -175,7 +171,6 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) { max_queue_size, dhcp_ddns::NCR_TCP, ncr_format, - always_include_fqdn, override_no_update, override_client_update, replace_client_name_mode, @@ -275,16 +270,6 @@ TEST(D2ClientConfigTest, equalityOperator) { EXPECT_FALSE(*ref_config == *test_config); EXPECT_TRUE(*ref_config != *test_config); - // Check a configuration that differs only by always_include_fqdn. - ASSERT_NO_THROW(test_config.reset(new D2ClientConfig(true, - ref_address, 477, ref_address, 478, 1024, - dhcp_ddns::NCR_UDP, dhcp_ddns::FMT_JSON, - false, true, true, D2ClientConfig::RCM_WHEN_PRESENT, - "pre-fix", "suf-fix", "[^A-Z]", "*"))); - ASSERT_TRUE(test_config); - EXPECT_FALSE(*ref_config == *test_config); - EXPECT_TRUE(*ref_config != *test_config); - // Check a configuration that differs only by override_no_update. ASSERT_NO_THROW(test_config.reset(new D2ClientConfig(true, ref_address, 477, ref_address, 478, 1024, diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc index 8a4791ae46..c750b6866f 100644 --- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc +++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc @@ -1864,7 +1864,6 @@ TEST_F(ParseConfigTest, validD2Config) { " \"max-queue-size\" : 2048, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"when-present\", " @@ -1892,7 +1891,6 @@ TEST_F(ParseConfigTest, validD2Config) { EXPECT_EQ(3432, d2_client_config->getServerPort()); EXPECT_EQ(dhcp_ddns::NCR_UDP, d2_client_config->getNcrProtocol()); EXPECT_EQ(dhcp_ddns::FMT_JSON, d2_client_config->getNcrFormat()); - EXPECT_TRUE(d2_client_config->getAlwaysIncludeFqdn()); EXPECT_TRUE(d2_client_config->getOverrideNoUpdate()); EXPECT_TRUE(d2_client_config->getOverrideClientUpdate()); EXPECT_EQ(D2ClientConfig::RCM_WHEN_PRESENT, d2_client_config->getReplaceClientNameMode()); @@ -1921,7 +1919,6 @@ TEST_F(ParseConfigTest, validD2Config) { " \"max-queue-size\" : 2048, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : false, " " \"override-no-update\" : false, " " \"override-client-update\" : false, " " \"replace-client-name\" : \"never\", " @@ -1948,7 +1945,6 @@ TEST_F(ParseConfigTest, validD2Config) { EXPECT_EQ(43567, d2_client_config->getServerPort()); EXPECT_EQ(dhcp_ddns::NCR_UDP, d2_client_config->getNcrProtocol()); EXPECT_EQ(dhcp_ddns::FMT_JSON, d2_client_config->getNcrFormat()); - EXPECT_FALSE(d2_client_config->getAlwaysIncludeFqdn()); EXPECT_FALSE(d2_client_config->getOverrideNoUpdate()); EXPECT_FALSE(d2_client_config->getOverrideClientUpdate()); EXPECT_EQ(D2ClientConfig::RCM_NEVER, d2_client_config->getReplaceClientNameMode()); @@ -2023,8 +2019,6 @@ TEST_F(ParseConfigTest, parserDefaultsD2Config) { d2_client_config->getNcrProtocol()); EXPECT_EQ(dhcp_ddns::stringToNcrFormat(D2ClientConfig::DFT_NCR_FORMAT), d2_client_config->getNcrFormat()); - EXPECT_EQ(D2ClientConfig::DFT_ALWAYS_INCLUDE_FQDN, - d2_client_config->getAlwaysIncludeFqdn()); EXPECT_EQ(D2ClientConfig::DFT_OVERRIDE_NO_UPDATE, d2_client_config->getOverrideNoUpdate()); EXPECT_EQ(D2ClientConfig::DFT_OVERRIDE_CLIENT_UPDATE, @@ -2057,7 +2051,6 @@ TEST_F(ParseConfigTest, invalidD2Config) { " \"server-port\" : 53001, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : true, " @@ -2073,7 +2066,6 @@ TEST_F(ParseConfigTest, invalidD2Config) { " \"server-port\" : 53001, " " \"ncr-protocol\" : \"Bogus\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : true, " @@ -2089,7 +2081,6 @@ TEST_F(ParseConfigTest, invalidD2Config) { " \"server-port\" : 53001, " " \"ncr-protocol\" : \"TCP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : true, " @@ -2105,7 +2096,6 @@ TEST_F(ParseConfigTest, invalidD2Config) { " \"server-port\" : 53001, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"Bogus\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : true, " @@ -2121,7 +2111,6 @@ TEST_F(ParseConfigTest, invalidD2Config) { " \"server-port\" : \"bogus\", " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : true, " @@ -2140,7 +2129,6 @@ TEST_F(ParseConfigTest, invalidD2Config) { " \"max-queue-size\" : 2048, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : true, " @@ -2159,7 +2147,6 @@ TEST_F(ParseConfigTest, invalidD2Config) { " \"max-queue-size\" : 2048, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : true, " @@ -2178,7 +2165,6 @@ TEST_F(ParseConfigTest, invalidD2Config) { " \"max-queue-size\" : 2048, " " \"ncr-protocol\" : \"UDP\", " " \"ncr-format\" : \"JSON\", " - " \"always-include-fqdn\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " " \"replace-client-name\" : \"BOGUS\", "