From: Thomas Markwalder Date: Tue, 20 Nov 2018 19:28:39 +0000 (-0500) Subject: [#260,!120] More post-rebase changes X-Git-Tag: 204-move-models-base~4^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a658ade5f2f46005458d7f3c2c100edbbd9bcec0;p=thirdparty%2Fkea.git [#260,!120] More post-rebase changes modified: src/bin/dhcp4/dhcp4_messages.mes modified: src/bin/dhcp4/tests/config_parser_unittest.cc modified: src/bin/dhcp4/tests/get_config_unittest.cc modified: src/bin/dhcp6/tests/get_config_unittest.cc --- a658ade5f2f46005458d7f3c2c100edbbd9bcec0 diff --cc src/bin/dhcp4/dhcp4_messages.mes index b1e504f566,3ab07cb592..7b6d455e0f --- a/src/bin/dhcp4/dhcp4_messages.mes +++ b/src/bin/dhcp4/dhcp4_messages.mes @@@ -120,11 -120,11 +120,6 @@@ new configuration. It is output during configuration is committed by the administrator. Additional information may be provided. --% DHCP4_CONFIG_PACKET_QUEUE DHCPv4 packet queue info after configuration: %1 --This informational message is emitted during DHCPv4 server configuration, --immediately after configuring the DHCPv4 packet queue. The information --shown depends upon the packet queue type selected. -- % DHCP4_CONFIG_LOAD_FAIL configuration error using file: %1, reason: %2 This error message indicates that the DHCPv4 configuration has failed. If this is an initial configuration (during server's startup) the server @@@ -140,11 -140,6 +135,11 @@@ This warning message is issued on an at with the same option code for a particular subnet. Adding multiple options is uncommon for DHCPv4, but is not prohibited. +% DHCP4_CONFIG_PACKET_QUEUE DHCPv4 packet queue info after configuration: %1 - This debug message is emitted during DHCPv4 server configuration, immediately - after configuring the DHCPv4 packet queue. The information shown depends - upon the packet queue type selected. ++This informational message is emitted during DHCPv4 server configuration, ++immediately after configuring the DHCPv4 packet queue. The information ++shown depends upon the packet queue type selected. + % DHCP4_CONFIG_RECEIVED received configuration %1 A debug message listing the configuration received by the DHCPv4 server. The source of that configuration depends on used configuration backend. diff --cc src/bin/dhcp4/tests/config_parser_unittest.cc index 7ba870597c,99da01dfd1..95ed455551 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@@ -6547,10 -6496,10 +6547,8 @@@ TEST_F(Dhcp4ParserTest, dhcpQueueContro // Fetch the queue control info. staged_control = CfgMgr::instance().getStagingCfg()->getDHCPQueueControl(); -- // Make sure the staged queue config exists. ASSERT_TRUE(staged_control); -- // Now build the expected queue control content. if (scenario.json_.empty()) { exp_control = Element::createMap(); diff --cc src/bin/dhcp4/tests/get_config_unittest.cc index 203bac50a9,bdd0f2e969..9be8afaac4 --- a/src/bin/dhcp4/tests/get_config_unittest.cc +++ b/src/bin/dhcp4/tests/get_config_unittest.cc @@@ -7078,55 -7046,9 +7078,60 @@@ const char* UNPARSED_CONFIGS[] = " }\n", // CONFIGURATION 52 "{\n" +" \"decline-probation-period\": 12345,\n" +" \"dhcp-ddns\": {\n" +" \"enable-updates\": false,\n" +" \"generated-prefix\": \"myhost\",\n" +" \"hostname-char-replacement\": \"\",\n" +" \"hostname-char-set\": \"\",\n" +" \"max-queue-size\": 1024,\n" +" \"ncr-format\": \"JSON\",\n" +" \"ncr-protocol\": \"UDP\",\n" +" \"override-client-update\": false,\n" +" \"override-no-update\": false,\n" +" \"qualifying-suffix\": \"\",\n" +" \"replace-client-name\": \"never\",\n" +" \"sender-ip\": \"0.0.0.0\",\n" +" \"sender-port\": 0,\n" +" \"server-ip\": \"127.0.0.1\",\n" +" \"server-port\": 53001\n" +" },\n" ++" \"dhcp-queue-control\": {\n" ++" \"capacity\": 500,\n" ++" \"enable-queue\": false,\n" ++" \"queue-type\": \"kea-ring4\"\n" ++" },\n" +" \"dhcp4o6-port\": 0,\n" +" \"echo-client-id\": true,\n" +" \"expired-leases-processing\": {\n" +" \"flush-reclaimed-timer-wait-time\": 25,\n" +" \"hold-reclaimed-time\": 3600,\n" +" \"max-reclaim-leases\": 100,\n" +" \"max-reclaim-time\": 250,\n" +" \"reclaim-timer-wait-time\": 10,\n" +" \"unwarned-reclaim-cycles\": 5\n" +" },\n" +" \"hooks-libraries\": [ ],\n" +" \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n" +" \"interfaces-config\": {\n" +" \"interfaces\": [ \"*\" ],\n" +" \"re-detect\": false\n" +" },\n" +" \"lease-database\": {\n" +" \"type\": \"memfile\"\n" +" },\n" +" \"option-data\": [ ],\n" +" \"option-def\": [ ],\n" +" \"sanity-checks\": {\n" +" \"lease-checks\": \"warn\"\n" +" },\n" +" \"shared-networks\": [ ],\n" +" \"subnet4\": [ ]\n" +" }\n", + // CONFIGURATION 53 +"{\n" " \"decline-probation-period\": 86400,\n" " \"dhcp-ddns\": {\n" -" \"always-include-fqdn\": false,\n" " \"enable-updates\": false,\n" " \"generated-prefix\": \"myhost\",\n" " \"hostname-char-replacement\": \"\",\n" diff --cc src/bin/dhcp6/tests/get_config_unittest.cc index 9375c3321a,63052124a7..810576f275 --- a/src/bin/dhcp6/tests/get_config_unittest.cc +++ b/src/bin/dhcp6/tests/get_config_unittest.cc @@@ -6125,112 -6140,7 +6125,117 @@@ const char* UNPARSED_CONFIGS[] = "{\n" " \"decline-probation-period\": 86400,\n" " \"dhcp-ddns\": {\n" -" \"always-include-fqdn\": false,\n" +" \"enable-updates\": false,\n" +" \"generated-prefix\": \"myhost\",\n" +" \"hostname-char-replacement\": \"\",\n" +" \"hostname-char-set\": \"\",\n" +" \"max-queue-size\": 1024,\n" +" \"ncr-format\": \"JSON\",\n" +" \"ncr-protocol\": \"UDP\",\n" +" \"override-client-update\": false,\n" +" \"override-no-update\": false,\n" +" \"qualifying-suffix\": \"\",\n" +" \"replace-client-name\": \"never\",\n" +" \"sender-ip\": \"0.0.0.0\",\n" +" \"sender-port\": 0,\n" +" \"server-ip\": \"127.0.0.1\",\n" +" \"server-port\": 53001\n" +" },\n" ++" \"dhcp-queue-control\": {\n" ++" \"capacity\": 500,\n" ++" \"enable-queue\": false,\n" ++" \"queue-type\": \"kea-ring6\"\n" ++" },\n" +" \"dhcp4o6-port\": 0,\n" +" \"expired-leases-processing\": {\n" +" \"flush-reclaimed-timer-wait-time\": 25,\n" +" \"hold-reclaimed-time\": 3600,\n" +" \"max-reclaim-leases\": 100,\n" +" \"max-reclaim-time\": 250,\n" +" \"reclaim-timer-wait-time\": 10,\n" +" \"unwarned-reclaim-cycles\": 5\n" +" },\n" +" \"hooks-libraries\": [ ],\n" +" \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n" +" \"interfaces-config\": {\n" +" \"interfaces\": [ ],\n" +" \"re-detect\": false\n" +" },\n" +" \"lease-database\": {\n" +" \"type\": \"memfile\"\n" +" },\n" +" \"mac-sources\": [ \"any\" ],\n" +" \"option-data\": [ ],\n" +" \"option-def\": [ ],\n" +" \"preferred-lifetime\": 3000,\n" +" \"rebind-timer\": 2000,\n" +" \"relay-supplied-options\": [ \"65\" ],\n" +" \"renew-timer\": 1000,\n" +" \"reservation-mode\": \"out-of-pool\",\n" +" \"sanity-checks\": {\n" +" \"lease-checks\": \"warn\"\n" +" },\n" +" \"server-id\": {\n" +" \"enterprise-id\": 0,\n" +" \"htype\": 0,\n" +" \"identifier\": \"\",\n" +" \"persist\": true,\n" +" \"time\": 0,\n" +" \"type\": \"LLT\"\n" +" },\n" +" \"shared-networks\": [ ],\n" +" \"subnet6\": [\n" +" {\n" +" \"id\": 1,\n" +" \"option-data\": [ ],\n" +" \"pd-pools\": [ ],\n" +" \"pools\": [\n" +" {\n" +" \"option-data\": [ ],\n" +" \"pool\": \"2001:db8:1::/64\"\n" +" }\n" +" ],\n" +" \"preferred-lifetime\": 3000,\n" +" \"rapid-commit\": false,\n" +" \"rebind-timer\": 2000,\n" +" \"relay\": {\n" +" \"ip-addresses\": [ ]\n" +" },\n" +" \"renew-timer\": 1000,\n" +" \"reservation-mode\": \"all\",\n" +" \"reservations\": [ ],\n" +" \"subnet\": \"2001:db8:1::/48\",\n" +" \"valid-lifetime\": 4000\n" +" },\n" +" {\n" +" \"id\": 2,\n" +" \"option-data\": [ ],\n" +" \"pd-pools\": [ ],\n" +" \"pools\": [\n" +" {\n" +" \"option-data\": [ ],\n" +" \"pool\": \"2001:db8:2::/64\"\n" +" }\n" +" ],\n" +" \"preferred-lifetime\": 3000,\n" +" \"rapid-commit\": false,\n" +" \"rebind-timer\": 2000,\n" +" \"relay\": {\n" +" \"ip-addresses\": [ ]\n" +" },\n" +" \"renew-timer\": 1000,\n" +" \"reservation-mode\": \"out-of-pool\",\n" +" \"reservations\": [ ],\n" +" \"subnet\": \"2001:db8:2::/48\",\n" +" \"valid-lifetime\": 4000\n" +" }\n" +" ],\n" +" \"valid-lifetime\": 4000\n" +" }\n", + // CONFIGURATION 42 +"{\n" +" \"decline-probation-period\": 86400,\n" +" \"dhcp-ddns\": {\n" " \"enable-updates\": false,\n" " \"generated-prefix\": \"myhost\",\n" " \"hostname-char-replacement\": \"\",\n"