Commit 2332e5d1 authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[3328] Updated Kea6 to support new values

Updated spec file and unit tests with new dhcp-ddns values:
server-ip, server-port, and max-queue-size
parent 8424bc7b
......@@ -382,7 +382,7 @@
"item_name": "server-ip",
"item_type": "string",
"item_optional": true,
"item_default": "127.0.0.1",
"item_default": "::1",
"item_description" : "IP address of b10-dhcp-ddns (IPv4 or IPv6)"
},
{
......@@ -392,6 +392,27 @@
"item_default": 53001,
"item_description" : "port number of b10-dhcp-ddns"
},
{
"item_name": "sender-ip",
"item_type": "string",
"item_optional": true,
"item_default": "",
"item_description" : "IP address from which to send to b10-dhcp-ddns (IPv4 or IPv6)"
},
{
"item_name": "sender-port",
"item_type": "integer",
"item_optional": true,
"item_default": 0,
"item_description" : "port number from which to send to b10-dhcp-ddns"
},
{
"item_name": "max-queue-size",
"item_type": "integer",
"item_optional": true,
"item_default": 1024,
"item_description" : "maximum number of requests allowed in the send queue"
},
{
"item_name": "ncr-protocol",
"item_type": "string",
......
......@@ -3213,8 +3213,11 @@ TEST_F(Dhcp6ParserTest, d2ClientConfig) {
" \"subnet\": \"2001:db8:1::/64\" } ], "
" \"dhcp-ddns\" : {"
" \"enable-updates\" : true, "
" \"server-ip\" : \"192.168.2.1\", "
" \"server-ip\" : \"3001::1\", "
" \"server-port\" : 777, "
" \"sender-ip\" : \"3001::2\", "
" \"sender-port\" : 778, "
" \"max-queue-size\" : 2048, "
" \"ncr-protocol\" : \"UDP\", "
" \"ncr-format\" : \"JSON\", "
" \"always-include-fqdn\" : true, "
......@@ -3245,8 +3248,11 @@ TEST_F(Dhcp6ParserTest, 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("3001::1", d2_client_config->getServerIp().toText());
EXPECT_EQ(777, d2_client_config->getServerPort());
EXPECT_EQ("3001::2", d2_client_config->getSenderIp().toText());
EXPECT_EQ(778, d2_client_config->getSenderPort());
EXPECT_EQ(2048, d2_client_config->getMaxQueueSize());
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());
......
......@@ -109,7 +109,9 @@ public:
D2ClientConfigPtr cfg;
ASSERT_NO_THROW(cfg.reset(new D2ClientConfig(true,
isc::asiolink::IOAddress("127.0.0.1"), 53001,
isc::asiolink::IOAddress("::1"), 53001,
isc::asiolink::IOAddress("::"), 0,
1024,
dhcp_ddns::NCR_UDP, dhcp_ddns::FMT_JSON,
(mask & ALWAYS_INCLUDE_FQDN),
(mask & OVERRIDE_NO_UPDATE),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment