Commit fb678e63 authored by Thomas Markwalder's avatar Thomas Markwalder

[3033] Addressed review comments.

Removed configuration parameter allow-client-update.
It was deemed to really just be the inverse of override-client-update.
Renamed convenience method isDhcpDdns to ddnsEnabled.
Made enum to string converion functions case insenstive.
Updated copyright dates and other cosmetic changes.
parent 6625b4d9
......@@ -298,37 +298,38 @@
"item_type": "map",
"item_optional": false,
"item_default": {"enable-updates": false},
"item_description" : "Contains parameters pertaining DHCP-driven DDNS updates",
"map_item_spec": [
{
"item_name": "enable-updates",
"item_type": "boolean",
"item_optional": false,
"item_default": False,
"item_default": false,
"item_description" : "Enables DDNS update processing"
},
{
"item_name": "server_ip",
"item_name": "server-ip",
"item_type": "string",
"item_optional": true,
"item_default": "127.0.0.1",
"item_description" : "IP address of b10-dhcp-ddns"
"item_description" : "IP address of b10-dhcp-ddns (IPv4 or IPv6)"
},
{
"item_name": "server_port",
"item_name": "server-port",
"item_type": "integer",
"item_optional": true,
"item_default": 5301,
"item_default": 53001,
"item_description" : "port number of b10-dhcp-ddns"
},
{
"item_name": "ncr_protocol",
"item_name": "ncr-protocol",
"item_type": "string",
"item_optional": true,
"item_default": "UDP",
"item_description" : "Socket protocol to use with b10-dhcp-ddns"
},
{
"item_name": "ncr_format",
"item_name": "ncr-format",
"item_type": "string",
"item_optional": true,
"item_default": "JSON",
......@@ -339,23 +340,15 @@
"item_type": "boolean",
"item_optional": true,
"item_default": false,
"item_description": "Should server request a DNS Remove, before a DNS Update on renewals"
"item_description": "Enable requesting a DNS Remove, before a DNS Update on renewals"
},
{
"item_name": "always-include-fqdn",
"item_type": "boolean",
"item_optional": true,
"item_default": False,
"item_description": "Should server always include the FQDN option in its response"
},
{
"item_name": "allow-client-update",
"item_type": "boolean",
"item_optional": true,
"item_default": False,
"item_description": "Enable AAAA RR update delegation to the client"
"item_default": false,
"item_description": "Enable always including the FQDN option in its response"
},
{
"item_name": "override-no-update",
......@@ -368,7 +361,7 @@
"item_name": "override-client-update",
"item_type": "boolean",
"item_optional": true,
"item_default": true,
"item_default": false,
"item_description": "Server performs an update even if client requested delegation"
},
{
......
// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -64,6 +64,7 @@ std::string specfile(const std::string& name) {
/// Verifies that the BIND10 DHCP-DDNS configuration specification file
// is valid.
TEST(Dhcp4SpecTest, basicSpec) {
(isc::config::moduleSpecFromFile(specfile("dhcp4.spec")));
ASSERT_NO_THROW(isc::config::moduleSpecFromFile(specfile("dhcp4.spec")));
}
......@@ -2327,7 +2328,7 @@ TEST_F(Dhcp4ParserTest, d2ClientConfig) {
EXPECT_FALSE(d2_client_config->getEnableUpdates());
// Verify that the convenience method agrees.
ASSERT_FALSE(CfgMgr::instance().isDhcpDdnsEnabled());
ASSERT_FALSE(CfgMgr::instance().ddnsEnabled());
string config_str = "{ \"interfaces\": [ \"*\" ],"
"\"rebind-timer\": 2000, "
......@@ -2338,7 +2339,7 @@ TEST_F(Dhcp4ParserTest, d2ClientConfig) {
" \"dhcp-ddns\" : {"
" \"enable-updates\" : true, "
" \"server-ip\" : \"192.168.2.1\", "
" \"server-port\" : 5301, "
" \"server-port\" : 777, "
" \"ncr-protocol\" : \"UDP\", "
" \"ncr-format\" : \"JSON\", "
" \"remove-on-renew\" : true, "
......@@ -2362,7 +2363,7 @@ TEST_F(Dhcp4ParserTest, d2ClientConfig) {
checkResult(status, 0);
// Verify that DHCP-DDNS updating is enabled.
EXPECT_TRUE(CfgMgr::instance().isDhcpDdnsEnabled());
EXPECT_TRUE(CfgMgr::instance().ddnsEnabled());
// Verify that the D2 configuration can be retrieved.
d2_client_config = CfgMgr::instance().getD2ClientConfig();
......@@ -2371,12 +2372,11 @@ TEST_F(Dhcp4ParserTest, d2ClientConfig) {
// Verify that the configuration values are correct.
EXPECT_TRUE(d2_client_config->getEnableUpdates());
EXPECT_EQ("192.168.2.1", d2_client_config->getServerIp().toText());
EXPECT_EQ(5301, d2_client_config->getServerPort());
EXPECT_EQ(777, 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->getRemoveOnRenew());
EXPECT_TRUE(d2_client_config->getAlwaysIncludeFqdn());
EXPECT_TRUE(d2_client_config->getAllowClientUpdate());
EXPECT_TRUE(d2_client_config->getOverrideNoUpdate());
EXPECT_TRUE(d2_client_config->getOverrideClientUpdate());
EXPECT_TRUE(d2_client_config->getReplaceClientName());
......@@ -2427,7 +2427,7 @@ TEST_F(Dhcp4ParserTest, invalidD2ClientConfig) {
EXPECT_FALSE(d2_client_config->getEnableUpdates());
// Verify that the convenience method agrees.
ASSERT_FALSE(CfgMgr::instance().isDhcpDdnsEnabled());
ASSERT_FALSE(CfgMgr::instance().ddnsEnabled());
}
}
......@@ -15,16 +15,18 @@
#include <dhcp_ddns/dhcp_ddns_log.h>
#include <dhcp_ddns/ncr_io.h>
#include <boost/algorithm/string/predicate.hpp>
namespace isc {
namespace dhcp_ddns {
NameChangeProtocol stringToNcrProtocol(const std::string& protocol_str) {
if (protocol_str == "UDP") {
return NCR_UDP;
}
if (boost::iequals(protocol_str, "UDP")) {
return (NCR_UDP);
}
if (protocol_str == "TCP") {
return NCR_TCP;
if (boost::iequals(protocol_str, "TCP")) {
return (NCR_TCP);
}
isc_throw(BadValue, "Invalid NameChangeRequest protocol:" << protocol_str);
......@@ -40,7 +42,9 @@ std::string ncrProtocolToString(NameChangeProtocol protocol) {
break;
}
return ("UNKNOWN");
std::ostringstream stream;
stream << "UNKNOWN(" << protocol << ")";
return (stream.str());
}
......
......@@ -67,6 +67,10 @@ namespace isc {
namespace dhcp_ddns {
/// @brief Defines the list of socket protocols supported.
/// Currently only UDP is implemented.
/// @todo TCP is intended to be implemented prior 1.0 release.
/// @todo Give some thought to an ANY protocol which might try
/// first as UDP then as TCP, etc.
enum NameChangeProtocol {
NCR_UDP,
NCR_TCP
......
......@@ -18,16 +18,19 @@
#include <asiolink/io_error.h>
#include <cryptolink/cryptolink.h>
#include <boost/algorithm/string/predicate.hpp>
#include <botan/sha2_32.h>
#include <sstream>
#include <limits>
namespace isc {
namespace dhcp_ddns {
NameChangeFormat stringToNcrFormat(const std::string& fmt_str) {
if (fmt_str == "JSON") {
if (boost::iequals(fmt_str, "JSON")) {
return FMT_JSON;
}
......@@ -40,7 +43,9 @@ std::string ncrFormatToString(NameChangeFormat format) {
return ("JSON");
}
return ("UNKNOWN");
std::ostringstream stream;
stream << "UNKNOWN(" << format << ")";
return (stream.str());
}
/********************************* D2Dhcid ************************************/
......
......@@ -611,6 +611,7 @@ TEST(NameChangeRequestTest, ipAddresses) {
/// @brief Tests conversion of NameChangeFormat between enum and strings.
TEST(NameChangeFormatTest, formatEnumConversion){
ASSERT_EQ(stringToNcrFormat("JSON"), dhcp_ddns::FMT_JSON);
ASSERT_EQ(stringToNcrFormat("jSoN"), dhcp_ddns::FMT_JSON);
ASSERT_THROW(stringToNcrFormat("bogus"), isc::BadValue);
ASSERT_EQ(ncrFormatToString(dhcp_ddns::FMT_JSON), "JSON");
......@@ -619,7 +620,9 @@ TEST(NameChangeFormatTest, formatEnumConversion){
/// @brief Tests conversion of NameChangeProtocol between enum and strings.
TEST(NameChangeProtocolTest, protocolEnumConversion){
ASSERT_EQ(stringToNcrProtocol("UDP"), dhcp_ddns::NCR_UDP);
ASSERT_EQ(stringToNcrProtocol("udP"), dhcp_ddns::NCR_UDP);
ASSERT_EQ(stringToNcrProtocol("TCP"), dhcp_ddns::NCR_TCP);
ASSERT_EQ(stringToNcrProtocol("Tcp"), dhcp_ddns::NCR_TCP);
ASSERT_THROW(stringToNcrProtocol("bogus"), isc::BadValue);
ASSERT_EQ(ncrProtocolToString(dhcp_ddns::NCR_UDP), "UDP");
......
......@@ -354,8 +354,8 @@ CfgMgr::setD2ClientConfig(D2ClientConfigPtr& new_config) {
}
bool
CfgMgr::isDhcpDdnsEnabled() {
return (d2_client_mgr_.isDhcpDdnsEnabled());
CfgMgr::ddnsEnabled() {
return (d2_client_mgr_.ddnsEnabled());
}
const D2ClientConfigPtr&
......
......@@ -344,7 +344,7 @@ public:
/// @param Convenience method for checking if DHCP-DDNS updates are enabled.
///
/// @return True if the D2 configuration is enabled.
bool isDhcpDdnsEnabled();
bool ddnsEnabled();
/// @brief Fetches the DHCP-DDNS configuration pointer.
///
......
// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -31,7 +31,6 @@ D2ClientConfig::D2ClientConfig(const bool enable_updates,
NameChangeFormat& ncr_format,
const bool remove_on_renew,
const bool always_include_fqdn,
const bool allow_client_update,
const bool override_no_update,
const bool override_client_update,
const bool replace_client_name,
......@@ -44,29 +43,12 @@ D2ClientConfig::D2ClientConfig(const bool enable_updates,
ncr_format_(ncr_format),
remove_on_renew_(remove_on_renew),
always_include_fqdn_(always_include_fqdn),
allow_client_update_(allow_client_update),
override_no_update_(override_no_update),
override_client_update_(override_client_update),
replace_client_name_(replace_client_name),
generated_prefix_(generated_prefix),
qualifying_suffix_(qualifying_suffix) {
if (ncr_format_ != dhcp_ddns::FMT_JSON) {
isc_throw(D2ClientError, "D2ClientConfig: NCR Format:"
<< dhcp_ddns::ncrFormatToString(ncr_format)
<< " is not yet supported");
}
if (ncr_protocol_ != dhcp_ddns::NCR_UDP) {
isc_throw(D2ClientError, "D2ClientConfig: NCR Protocol:"
<< dhcp_ddns::ncrProtocolToString(ncr_protocol)
<< " is not yet supported");
}
// @todo perhaps more validation we should do yet?
// Are there any invalid combinations of options we need to test against?
// For instance are allow_client_update and override_client_update mutually
// exclusive?
// Also do we care about validating contents if it's disabled?
validateContents();
}
D2ClientConfig::D2ClientConfig()
......@@ -77,16 +59,35 @@ D2ClientConfig::D2ClientConfig()
ncr_format_(dhcp_ddns::FMT_JSON),
remove_on_renew_(false),
always_include_fqdn_(false),
allow_client_update_(false),
override_no_update_(false),
override_client_update_(false),
replace_client_name_(false),
generated_prefix_(""),
qualifying_suffix_("") {
validateContents();
}
D2ClientConfig::~D2ClientConfig(){};
void
D2ClientConfig::validateContents() {
if (ncr_format_ != dhcp_ddns::FMT_JSON) {
isc_throw(D2ClientError, "D2ClientConfig: NCR Format:"
<< dhcp_ddns::ncrFormatToString(ncr_format_)
<< " is not yet supported");
}
if (ncr_protocol_ != dhcp_ddns::NCR_UDP) {
isc_throw(D2ClientError, "D2ClientConfig: NCR Protocol:"
<< dhcp_ddns::ncrProtocolToString(ncr_protocol_)
<< " is not yet supported");
}
// @todo perhaps more validation we should do yet?
// Are there any invalid combinations of options we need to test against?
// Also do we care about validating contents if it's disabled?
}
bool
D2ClientConfig::operator == (const D2ClientConfig& other) const {
return ((enable_updates_ == other.enable_updates_) &&
......@@ -96,7 +97,6 @@ D2ClientConfig::operator == (const D2ClientConfig& other) const {
(ncr_format_ == other.ncr_format_) &&
(remove_on_renew_ == other.remove_on_renew_) &&
(always_include_fqdn_ == other.always_include_fqdn_) &&
(allow_client_update_ == other.allow_client_update_) &&
(override_no_update_ == other.override_no_update_) &&
(override_client_update_ == other.override_client_update_) &&
(replace_client_name_ == other.replace_client_name_) &&
......@@ -122,8 +122,6 @@ D2ClientConfig::toText() const {
<< ", remove_on_renew: " << (remove_on_renew_ ? "yes" : "no")
<< ", always_include_fqdn: " << (always_include_fqdn_ ?
"yes" : "no")
<< ", allow_client_update: " << (allow_client_update_ ?
"yes" : "no")
<< ", override_no_update: " << (override_no_update_ ?
"yes" : "no")
<< ", override_client_update: " << (override_client_update_ ?
......@@ -169,12 +167,12 @@ D2ClientMgr::setD2ClientConfig(D2ClientConfigPtr& new_config) {
// For now we just update the configuration.
d2_client_config_ = new_config;
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, DHCPSRV_CFGMGR_CFG_DHCP_DDNS)
.arg(!isDhcpDdnsEnabled() ? "DHCP-DDNS updates disabled" :
.arg(!ddnsEnabled() ? "DHCP-DDNS updates disabled" :
"DHCP_DDNS updates enabled");
}
bool
D2ClientMgr::isDhcpDdnsEnabled() {
D2ClientMgr::ddnsEnabled() {
return (d2_client_config_->getEnableUpdates());
}
......
// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -58,7 +58,7 @@ public:
/// @brief Constructor
///
/// @param enable_updates Enables DHCP-DDNS updates
/// @param server_ip IP address of the b10-dhcp-ddns server
/// @param server_ip IP address of the b10-dhcp-ddns server (IPv4 or IPv6)
/// @param server_port IP port of the b10-dhcp-ddns server
/// @param ncr_protocol Socket protocol to use with b10-dhcp-ddns
/// Currently only UDP is supported.
......@@ -71,7 +71,6 @@ public:
/// is unnecessary).
/// @param always_include_fqdn Enables always including the FQDN option in
/// DHCP responses.
/// @param allow_client_update Enables delegation of updates to clients
/// @param override_no_update Enables updates, even if clients request no
/// updates.
/// @param override_client_update Perform updates, even if client requested
......@@ -89,7 +88,6 @@ public:
const dhcp_ddns::NameChangeFormat& ncr_format,
const bool remove_on_renew,
const bool always_include_fqdn,
const bool allow_client_update,
const bool override_no_update,
const bool override_client_update,
const bool replace_client_name,
......@@ -108,7 +106,7 @@ public:
return(enable_updates_);
}
/// @brief Return the IP address of b10-dhcp-ddns.
/// @brief Return the IP address of b10-dhcp-ddns (IPv4 or IPv6).
const isc::asiolink::IOAddress& getServerIp() const {
return(server_ip_);
}
......@@ -138,11 +136,6 @@ public:
return(always_include_fqdn_);
}
/// @brief Return whether or not updates can be delegated to clients.
bool getAllowClientUpdate() const {
return(allow_client_update_);
}
/// @brief Return if updates are done even if clients request no updates.
bool getOverrideNoUpdate() const {
return(override_no_update_);
......@@ -177,11 +170,19 @@ public:
/// @brief Generates a string representation of the class contents.
std::string toText() const;
protected:
/// @brief Validates member values.
///
/// Method is used by the constructor to validate member contents.
///
/// @throw D2ClientError if given an invalid protocol or format.
virtual void validateContents();
private:
/// @brief Indicates whether or not DHCP DDNS updating is enabled.
bool enable_updates_;
/// @brief IP address of the b10-dhcp-ddns server.
/// @brief IP address of the b10-dhcp-ddns server (IPv4 or IPv6).
isc::asiolink::IOAddress server_ip_;
/// @brief IP port of the b10-dhcp-ddns server.
......@@ -205,9 +206,6 @@ private:
/// @brief Should Kea always include the FQDN option in its response.
bool always_include_fqdn_;
/// @brief Should Kea permit the client to do updates.
bool allow_client_update_;
/// @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_;
......@@ -236,7 +234,7 @@ typedef boost::shared_ptr<D2ClientConfig> D2ClientConfigPtr;
/// Provides services for managing the current D2ClientConfig and managing
/// communications with D2. (@todo The latter will be added once communication
/// with D2 is implemented through the integration of
/// dhcp_ddns::NameChangeSender interface(s).
/// dhcp_ddns::NameChangeSender interface(s)).
///
class D2ClientMgr {
public:
......@@ -258,7 +256,7 @@ public:
/// @brief Convenience method for checking if DHCP-DDNS is enabled.
///
/// @return True if the D2 configuration is enabled.
bool isDhcpDdnsEnabled();
bool ddnsEnabled();
/// @brief Fetches the DHCP-DDNS configuration pointer.
///
......
// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -1209,7 +1209,6 @@ D2ClientConfigParser::build(isc::data::ConstElementPtr client_config) {
bool remove_on_renew = boolean_values_->getParam("remove-on-renew");
bool always_include_fqdn = boolean_values_->getParam("always-include-fqdn");
bool allow_client_update = boolean_values_->getParam("allow-client-update");
bool override_no_update = boolean_values_->getParam("override-no-update");
bool override_client_update = boolean_values_->
getParam("override-client-update");
......@@ -1220,7 +1219,6 @@ D2ClientConfigParser::build(isc::data::ConstElementPtr client_config) {
server_port, ncr_protocol,
ncr_format, remove_on_renew,
always_include_fqdn,
allow_client_update,
override_no_update,
override_client_update,
replace_client_name,
......
// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......
// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -154,7 +154,7 @@ public:
EXPECT_TRUE(false == lease->fqdn_fwd_);
EXPECT_TRUE(false == lease->fqdn_rev_);
EXPECT_TRUE(*lease->duid_ == *duid_);
// @todo: check cltt
/// @todo: check cltt
}
/// @brief Checks if specified address is increased properly
......@@ -408,7 +408,7 @@ public:
EXPECT_TRUE(*lease->client_id_ == *clientid_);
}
EXPECT_TRUE(lease->hwaddr_ == hwaddr_->hwaddr_);
// @todo: check cltt
/// @todo: check cltt
}
virtual ~AllocEngine4Test() {
......
// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -538,7 +538,7 @@ TEST_F(CfgMgrTest, optionSpace4) {
cfg_mgr.addOptionSpace4(space3), isc::dhcp::InvalidOptionSpace
);
// @todo decode if a duplicate vendor space is allowed.
/// @todo decode if a duplicate vendor space is allowed.
}
// This test verifies that new DHCPv6 option spaces can be added to
......@@ -571,7 +571,7 @@ TEST_F(CfgMgrTest, optionSpace6) {
cfg_mgr.addOptionSpace6(space3), isc::dhcp::InvalidOptionSpace
);
// @todo decide if a duplicate vendor space is allowed.
/// @todo decide if a duplicate vendor space is allowed.
}
// This test verifies that it is possible to specify interfaces that server
......@@ -679,7 +679,7 @@ TEST_F(CfgMgrTest, d2ClientConfig) {
EXPECT_FALSE(original_config->getEnableUpdates());
// Make sure convenience method agrees.
EXPECT_FALSE(CfgMgr::instance().isDhcpDdnsEnabled());
EXPECT_FALSE(CfgMgr::instance().ddnsEnabled());
// Verify that we cannot set the configuration to an empty pointer.
D2ClientConfigPtr new_cfg;
......@@ -689,7 +689,7 @@ TEST_F(CfgMgrTest, d2ClientConfig) {
ASSERT_NO_THROW(new_cfg.reset(new D2ClientConfig(true,
isc::asiolink::IOAddress("127.0.0.1"), 477,
dhcp_ddns::NCR_UDP, dhcp_ddns::FMT_JSON,
true, true, true, true, true, true,
true, true, true, true, true,
"pre-fix", "suf-fix")));
// Verify that we can assign a new, non-empty configuration.
......@@ -701,7 +701,7 @@ TEST_F(CfgMgrTest, d2ClientConfig) {
EXPECT_TRUE(updated_config->getEnableUpdates());
// Make sure convenience method agrees with updated configuration.
EXPECT_TRUE(CfgMgr::instance().isDhcpDdnsEnabled());
EXPECT_TRUE(CfgMgr::instance().ddnsEnabled());
// Make sure the configuration we fetched is the one we assigned,
// and not the original configuration.
......
// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -26,7 +26,7 @@ using namespace isc;
namespace {
// brief Checks constructors and accessors of D2ClientConfig.
/// @brief Checks constructors and accessors of D2ClientConfig.
TEST(D2ClientConfigTest, constructorsAndAccessors) {
D2ClientConfigPtr d2_client_config;
......@@ -43,7 +43,6 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) {
dhcp_ddns::NameChangeFormat ncr_format = dhcp_ddns::FMT_JSON;
bool remove_on_renew = true;
bool always_include_fqdn = true;
bool allow_client_update = true;
bool override_no_update = true;
bool override_client_update = true;
bool replace_client_name = true;
......@@ -59,7 +58,6 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) {
ncr_format,
remove_on_renew,
always_include_fqdn,
allow_client_update,
override_no_update,
override_client_update,
replace_client_name,
......@@ -77,7 +75,6 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) {
EXPECT_EQ(d2_client_config->getNcrFormat(), ncr_format);
EXPECT_EQ(d2_client_config->getRemoveOnRenew(), remove_on_renew);
EXPECT_EQ(d2_client_config->getAlwaysIncludeFqdn(), always_include_fqdn);
EXPECT_EQ(d2_client_config->getAllowClientUpdate(), allow_client_update);
EXPECT_EQ(d2_client_config->getOverrideNoUpdate(), override_no_update);
EXPECT_EQ(d2_client_config->getOverrideClientUpdate(),
override_client_update);
......@@ -90,7 +87,7 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) {
*d2_client_config << std::endl);
// Verify that constructor does not allow use of NCR_TCP.
// @todo obviously this becomes invalid once TCP is supported.
/// @todo obviously this becomes invalid once TCP is supported.
ASSERT_THROW(d2_client_config.reset(new
D2ClientConfig(enable_updates,
server_ip,
......@@ -99,7 +96,6 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) {
ncr_format,
remove_on_renew,
always_include_fqdn,
allow_client_update,
override_no_update,
override_client_update,
replace_client_name,
......@@ -107,11 +103,11 @@ TEST(D2ClientConfigTest, constructorsAndAccessors) {
qualifying_suffix)),
D2ClientError);
// @todo if additional validation is added to ctor, this test needs to
// expand accordingly.
/// @todo if additional validation is added to ctor, this test needs to
/// expand accordingly.