From: Francis Dupont Date: Wed, 7 Jun 2023 12:22:46 +0000 (+0200) Subject: [#2866] Chased last occurrences X-Git-Tag: Kea-2.4.0~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eba40063dabb1a79712c715b2009a9641788ffc;p=thirdparty%2Fkea.git [#2866] Chased last occurrences --- diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index 24e6bf81fa..54c65f8db9 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -2139,6 +2139,7 @@ TEST_F(Dhcp4ParserTest, poolPrefixLen) { "\"rebind-timer\": 2000, " "\"renew-timer\": 1000, " "\"subnet4\": [ { " + " \"id\": 1," " \"pools\": [ { \"pool\": \"192.0.2.128/28\" } ]," " \"subnet\": \"192.0.2.0/24\" } ]," "\"valid-lifetime\": 4000 }"; diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc index 285c177e1f..06852023df 100644 --- a/src/bin/dhcp4/tests/get_config_unittest.cc +++ b/src/bin/dhcp4/tests/get_config_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2017-2023 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2017-2022 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 @@ -89,6 +89,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"rebind-timer\": 2000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -108,6 +109,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -130,6 +132,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -150,51 +153,6 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" -" \"pools\": [\n" -" {\n" -" \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" -" }\n" -" ],\n" -" \"subnet\": \"192.0.2.0/24\"\n" -" },\n" -" {\n" -" \"id\": 0,\n" -" \"pools\": [\n" -" {\n" -" \"pool\": \"192.0.3.101 - 192.0.3.150\"\n" -" }\n" -" ],\n" -" \"subnet\": \"192.0.3.0/24\"\n" -" },\n" -" {\n" -" \"pools\": [\n" -" {\n" -" \"pool\": \"192.0.4.101 - 192.0.4.150\"\n" -" }\n" -" ],\n" -" \"subnet\": \"192.0.4.0/24\"\n" -" },\n" -" {\n" -" \"pools\": [\n" -" {\n" -" \"pool\": \"192.0.5.101 - 192.0.5.150\"\n" -" }\n" -" ],\n" -" \"subnet\": \"192.0.5.0/24\"\n" -" }\n" -" ],\n" -" \"valid-lifetime\": 4000\n" -" }\n", - // CONFIGURATION 5 -"{\n" -" \"interfaces-config\": {\n" -" \"interfaces\": [ \"*\" ],\n" -" \"re-detect\": false\n" -" },\n" -" \"rebind-timer\": 2000,\n" -" \"renew-timer\": 1000,\n" -" \"subnet4\": [\n" -" {\n" " \"id\": 1024,\n" " \"pools\": [\n" " {\n" @@ -233,7 +191,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 6 + // CONFIGURATION 5 "{\n" " \"boot-file-name\": \"bar\",\n" " \"interfaces-config\": {\n" @@ -246,6 +204,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"server-hostname\": \"foo\",\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -256,7 +215,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 7 + // CONFIGURATION 6 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -267,6 +226,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet4\": [\n" " {\n" " \"boot-file-name\": \"bar\",\n" +" \"id\": 1,\n" " \"next-server\": \"1.2.3.4\",\n" " \"pools\": [\n" " {\n" @@ -279,7 +239,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 8 + // CONFIGURATION 7 "{\n" " \"boot-file-name\": \"nofile\",\n" " \"interfaces-config\": {\n" @@ -293,6 +253,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet4\": [\n" " {\n" " \"boot-file-name\": \"bootfile.efi\",\n" +" \"id\": 1,\n" " \"next-server\": \"1.2.3.4\",\n" " \"pools\": [\n" " {\n" @@ -305,7 +266,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 9 + // CONFIGURATION 8 "{\n" " \"echo-client-id\": false,\n" " \"interfaces-config\": {\n" @@ -316,6 +277,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -326,7 +288,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 10 + // CONFIGURATION 9 "{\n" " \"echo-client-id\": true,\n" " \"interfaces-config\": {\n" @@ -337,6 +299,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -347,7 +310,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 11 + // CONFIGURATION 10 "{\n" " \"compatibility\": {\n" " \"exclude-first-last-24\": true,\n" @@ -363,6 +326,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -373,7 +337,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 12 + // CONFIGURATION 11 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -383,6 +347,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"match-client-id\": true,\n" " \"pools\": [\n" " {\n" @@ -392,6 +357,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.2.0/24\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"match-client-id\": false,\n" " \"pools\": [\n" " {\n" @@ -403,7 +369,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 13 + // CONFIGURATION 12 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -414,6 +380,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"match-client-id\": false,\n" " \"pools\": [\n" " {\n" @@ -423,6 +390,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.2.0/24\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.3.1 - 192.0.3.100\"\n" @@ -433,7 +401,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 14 + // CONFIGURATION 13 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -444,6 +412,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet4\": [\n" " {\n" " \"authoritative\": true,\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -453,6 +422,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " {\n" " \"authoritative\": false,\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.3.1 - 192.0.3.100\"\n" @@ -463,7 +433,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 15 + // CONFIGURATION 14 "{\n" " \"authoritative\": true,\n" " \"interfaces-config\": {\n" @@ -475,6 +445,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet4\": [\n" " {\n" " \"authoritative\": false,\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -483,6 +454,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.2.0/24\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.3.1 - 192.0.3.100\"\n" @@ -493,7 +465,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 16 + // CONFIGURATION 15 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -505,6 +477,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"max-valid-lifetime\": 5,\n" " \"min-valid-lifetime\": 3,\n" " \"pools\": [\n" @@ -520,7 +493,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 17 + // CONFIGURATION 16 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -530,6 +503,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.0/28\"\n" @@ -541,6 +515,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.2.0/24\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.3.0/25\"\n" @@ -554,7 +529,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 18 + // CONFIGURATION 17 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -564,6 +539,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.128/28\"\n" @@ -574,7 +550,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 19 + // CONFIGURATION 18 "{\n" " \"option-def\": [\n" " {\n" @@ -585,7 +561,7 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ]\n" " }\n", - // CONFIGURATION 20 + // CONFIGURATION 19 "{\n" " \"option-def\": [\n" " {\n" @@ -597,7 +573,7 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ]\n" " }\n", - // CONFIGURATION 21 + // CONFIGURATION 20 "{\n" " \"option-def\": [\n" " {\n" @@ -614,7 +590,7 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ]\n" " }\n", - // CONFIGURATION 22 + // CONFIGURATION 21 "{\n" " \"option-def\": [\n" " {\n" @@ -626,7 +602,7 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ]\n" " }\n", - // CONFIGURATION 23 + // CONFIGURATION 22 "{\n" " \"option-def\": [\n" " {\n" @@ -638,7 +614,7 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ]\n" " }\n", - // CONFIGURATION 24 + // CONFIGURATION 23 "{\n" " \"option-def\": [\n" " {\n" @@ -649,7 +625,7 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ]\n" " }\n", - // CONFIGURATION 25 + // CONFIGURATION 24 "{\n" " \"option-def\": [\n" " {\n" @@ -660,7 +636,7 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ]\n" " }\n", - // CONFIGURATION 26 + // CONFIGURATION 25 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -682,6 +658,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -692,7 +669,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 27 + // CONFIGURATION 26 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -702,6 +679,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"option-data\": [\n" " {\n" " \"csv-format\": false,\n" @@ -724,7 +702,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 28 + // CONFIGURATION 27 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -754,6 +732,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -764,7 +743,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 29 + // CONFIGURATION 28 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -800,7 +779,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 30 + // CONFIGURATION 29 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -847,6 +826,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -857,7 +837,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 3000\n" " }\n", - // CONFIGURATION 31 + // CONFIGURATION 30 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -874,6 +854,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"option-data\": [\n" " {\n" " \"csv-format\": false,\n" @@ -896,7 +877,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 32 + // CONFIGURATION 31 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -906,6 +887,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"option-data\": [\n" " {\n" " \"csv-format\": false,\n" @@ -921,6 +903,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.2.0/24\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"option-data\": [\n" " {\n" " \"csv-format\": false,\n" @@ -938,7 +921,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 33 + // CONFIGURATION 32 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -948,6 +931,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"option-data\": [\n" @@ -970,7 +954,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 34 + // CONFIGURATION 33 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -980,6 +964,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"option-data\": [\n" @@ -1007,7 +992,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 35 + // CONFIGURATION 34 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1027,6 +1012,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1037,7 +1023,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 36 + // CONFIGURATION 35 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1073,7 +1059,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 37 + // CONFIGURATION 36 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1115,6 +1101,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1125,7 +1112,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 3000\n" " }\n", - // CONFIGURATION 38 + // CONFIGURATION 37 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1151,6 +1138,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1-192.0.2.10\"\n" @@ -1161,7 +1149,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 39 + // CONFIGURATION 38 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1187,6 +1175,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1197,7 +1186,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 40 + // CONFIGURATION 39 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"eth0\", \"eth1\" ],\n" @@ -1207,7 +1196,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 41 + // CONFIGURATION 40 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"eth0\", \"*\", \"eth1\" ],\n" @@ -1217,7 +1206,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 42 + // CONFIGURATION 41 "{\n" " \"dhcp-ddns\": {\n" " \"enable-updates\": true,\n" @@ -1237,6 +1226,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1247,7 +1237,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 43 + // CONFIGURATION 42 "{\n" " \"dhcp-ddns\": {\n" " \"enable-updates\": true,\n" @@ -1274,6 +1264,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1284,7 +1275,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 44 + // CONFIGURATION 43 "{\n" " \"ddns-generated-prefix\": \"global.prefix\",\n" " \"ddns-override-client-update\": true,\n" @@ -1319,6 +1310,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1329,7 +1321,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 45 + // CONFIGURATION 44 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1339,6 +1331,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1355,7 +1348,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 46 + // CONFIGURATION 45 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1365,6 +1358,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1381,7 +1375,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 47 + // CONFIGURATION 46 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1392,6 +1386,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet4\": [\n" " {\n" " \"client-class\": \"alpha\",\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1401,6 +1396,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " {\n" " \"client-class\": \"beta\",\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.3.101 - 192.0.3.150\"\n" @@ -1410,6 +1406,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " {\n" " \"client-class\": \"gamma\",\n" +" \"id\": 3,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.4.101 - 192.0.4.150\"\n" @@ -1418,6 +1415,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.4.0/24\"\n" " },\n" " {\n" +" \"id\": 4,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.5.101 - 192.0.5.150\"\n" @@ -1428,7 +1426,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 48 + // CONFIGURATION 47 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1438,6 +1436,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"client-class\": \"alpha\",\n" @@ -1460,7 +1459,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 49 + // CONFIGURATION 48 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1559,7 +1558,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 50 + // CONFIGURATION 49 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1601,12 +1600,13 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 51 + // CONFIGURATION 50 "{\n" " \"rebind-timer\": 2000,\n" " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.1.0/24\"\n" @@ -1618,6 +1618,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.1.0/24\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.0/24\"\n" @@ -1629,6 +1630,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.2.0/24\"\n" " },\n" " {\n" +" \"id\": 3,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.3.0/24\"\n" @@ -1639,6 +1641,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.3.0/24\"\n" " },\n" " {\n" +" \"id\": 4,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.4.0/24\"\n" @@ -1649,6 +1652,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.4.0/24\"\n" " },\n" " {\n" +" \"id\": 5,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.5.0/24\"\n" @@ -1657,6 +1661,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.5.0/24\"\n" " },\n" " {\n" +" \"id\": 6,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.6.0/24\"\n" @@ -1668,6 +1673,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.6.0/24\"\n" " },\n" " {\n" +" \"id\": 7,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.7.0/24\"\n" @@ -1681,7 +1687,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 52 + // CONFIGURATION 51 "{\n" " \"rebind-timer\": 2000,\n" " \"renew-timer\": 1000,\n" @@ -1690,6 +1696,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"reservations-out-of-pool\": true,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.0/24\"\n" @@ -1701,6 +1708,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.2.0/24\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.3.0/24\"\n" @@ -1711,7 +1719,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 53 + // CONFIGURATION 52 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1719,7 +1727,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " \"subnet4\": [ ]\n" " }\n", - // CONFIGURATION 54 + // CONFIGURATION 53 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1727,7 +1735,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " \"subnet4\": [ ]\n" " }\n", - // CONFIGURATION 55 + // CONFIGURATION 54 "{\n" " \"decline-probation-period\": 12345,\n" " \"interfaces-config\": {\n" @@ -1736,7 +1744,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " \"subnet4\": [ ]\n" " }\n", - // CONFIGURATION 56 + // CONFIGURATION 55 "{\n" " \"expired-leases-processing\": {\n" " \"flush-reclaimed-timer-wait-time\": 35,\n" @@ -1752,7 +1760,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " \"subnet4\": [ ]\n" " }\n", - // CONFIGURATION 57 + // CONFIGURATION 56 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1762,6 +1770,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1772,7 +1781,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 58 + // CONFIGURATION 57 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1783,6 +1792,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet4\": [\n" " {\n" " \"4o6-subnet\": \"2001:db8::123/45\",\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1793,7 +1803,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 59 + // CONFIGURATION 58 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1804,6 +1814,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"ethX\",\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1814,7 +1825,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 60 + // CONFIGURATION 59 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1826,6 +1837,7 @@ const char* EXTRACTED_CONFIGS[] = { " {\n" " \"4o6-interface\": \"ethX\",\n" " \"4o6-subnet\": \"2001:db8::543/21\",\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1836,7 +1848,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 61 + // CONFIGURATION 60 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1847,6 +1859,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet4\": [\n" " {\n" " \"4o6-interface-id\": \"vlan123\",\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1857,7 +1870,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 62 + // CONFIGURATION 61 "{\n" " \"client-classes\": [\n" " {\n" @@ -1878,6 +1891,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1888,7 +1902,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 63 + // CONFIGURATION 62 "{\n" " \"client-classes\": [\n" " {\n" @@ -1907,6 +1921,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1916,7 +1931,7 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ]\n" " }\n", - // CONFIGURATION 64 + // CONFIGURATION 63 "{\n" " \"client-classes\": [\n" " {\n" @@ -1937,6 +1952,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -1946,7 +1962,7 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ]\n" " }\n", - // CONFIGURATION 65 + // CONFIGURATION 64 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1956,6 +1972,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.0/28\"\n" @@ -1966,7 +1983,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 66 + // CONFIGURATION 65 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1976,6 +1993,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.0/28\",\n" @@ -1987,7 +2005,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 67 + // CONFIGURATION 66 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -1997,6 +2015,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.0/28\",\n" @@ -2012,7 +2031,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 68 + // CONFIGURATION 67 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -2022,6 +2041,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.0 - 192.0.2.15\",\n" @@ -2037,7 +2057,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 69 + // CONFIGURATION 68 "{\n" " \"hosts-databases\": [\n" " {\n" @@ -2061,7 +2081,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 70 + // CONFIGURATION 69 "{\n" " \"client-classes\": [\n" " {\n" @@ -2170,7 +2190,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"comment\": \"A DHCPv4 server\"\n" " }\n" " }\n", - // CONFIGURATION 71 + // CONFIGURATION 70 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -2232,7 +2252,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 72 + // CONFIGURATION 71 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -2282,7 +2302,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 73 + // CONFIGURATION 72 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -2292,6 +2312,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -2301,6 +2322,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.2.0/24\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.3.1 - 192.0.3.100\"\n" @@ -2312,7 +2334,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 74 + // CONFIGURATION 73 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -2323,6 +2345,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"store-extended-info\": true,\n" " \"subnet4\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.2.1 - 192.0.2.100\"\n" @@ -2332,6 +2355,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"192.0.2.0/24\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"192.0.3.1 - 192.0.3.100\"\n" @@ -2342,7 +2366,7 @@ const char* EXTRACTED_CONFIGS[] = { " ],\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 75 + // CONFIGURATION 74 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -2354,7 +2378,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"statistic-default-sample-count\": 10,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 76 + // CONFIGURATION 75 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -2362,7 +2386,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " \"subnet4\": [ ]\n" " }\n", - // CONFIGURATION 77 + // CONFIGURATION 76 "{\n" " \"interfaces-config\": {\n" " \"interfaces\": [ \"*\" ],\n" @@ -2456,125 +2480,14 @@ const char* UNPARSED_CONFIGS[] = { " \"server-tag\": \"\",\n" " \"shared-networks\": [ ],\n" " \"statistic-default-sample-age\": 0,\n" -" \"statistic-default-sample-count\": 20,\n" -" \"store-extended-info\": false,\n" -" \"subnet4\": [ ],\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.875,\n" -" \"valid-lifetime\": 4000\n" -" }\n", - // CONFIGURATION 1 -"{\n" -" \"allocator\": \"iterative\",\n" -" \"authoritative\": false,\n" -" \"boot-file-name\": \"\",\n" -" \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" -" \"ddns-update-on-renew\": false,\n" -" \"ddns-use-conflict-resolution\": true,\n" -" \"decline-probation-period\": 86400,\n" -" \"dhcp-ddns\": {\n" -" \"enable-updates\": false,\n" -" \"max-queue-size\": 1024,\n" -" \"ncr-format\": \"JSON\",\n" -" \"ncr-protocol\": \"UDP\",\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\": 64,\n" -" \"enable-queue\": false,\n" -" \"queue-type\": \"kea-ring4\"\n" -" },\n" -" \"dhcp4o6-port\": 0,\n" -" \"early-global-reservations-lookup\": false,\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" -" \"hostname-char-replacement\": \"\",\n" -" \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n" -" \"interfaces-config\": {\n" -" \"interfaces\": [ \"*\" ],\n" -" \"re-detect\": false\n" -" },\n" -" \"ip-reservations-unique\": true,\n" -" \"lease-database\": {\n" -" \"type\": \"memfile\"\n" -" },\n" -" \"match-client-id\": true,\n" -" \"multi-threading\": {\n" -" \"enable-multi-threading\": true,\n" -" \"packet-queue-size\": 64,\n" -" \"thread-pool-size\": 0\n" -" },\n" -" \"next-server\": \"0.0.0.0\",\n" -" \"option-data\": [ ],\n" -" \"option-def\": [ ],\n" -" \"parked-packet-limit\": 256,\n" -" \"rebind-timer\": 2000,\n" -" \"reservations-global\": false,\n" -" \"reservations-in-subnet\": true,\n" -" \"reservations-lookup-first\": false,\n" -" \"reservations-out-of-pool\": false,\n" -" \"sanity-checks\": {\n" -" \"extended-info-checks\": \"fix\",\n" -" \"lease-checks\": \"warn\"\n" -" },\n" -" \"server-hostname\": \"\",\n" -" \"server-tag\": \"\",\n" -" \"shared-networks\": [ ],\n" -" \"statistic-default-sample-age\": 0,\n" -" \"statistic-default-sample-count\": 20,\n" -" \"store-extended-info\": false,\n" -" \"subnet4\": [\n" -" {\n" -" \"4o6-interface\": \"\",\n" -" \"4o6-interface-id\": \"\",\n" -" \"4o6-subnet\": \"\",\n" -" \"allocator\": \"iterative\",\n" -" \"calculate-tee-times\": false,\n" -" \"id\": 1,\n" -" \"max-valid-lifetime\": 4000,\n" -" \"min-valid-lifetime\": 4000,\n" -" \"option-data\": [ ],\n" -" \"pools\": [\n" -" {\n" -" \"option-data\": [ ],\n" -" \"pool\": \"192.0.2.1-192.0.2.100\"\n" -" }\n" -" ],\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"reservations\": [ ],\n" -" \"store-extended-info\": false,\n" -" \"subnet\": \"192.0.2.0/24\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.875,\n" -" \"valid-lifetime\": 4000\n" -" }\n" -" ],\n" +" \"statistic-default-sample-count\": 20,\n" +" \"store-extended-info\": false,\n" +" \"subnet4\": [ ],\n" " \"t1-percent\": 0.5,\n" " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 2 + // CONFIGURATION 1 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -2637,7 +2550,7 @@ const char* UNPARSED_CONFIGS[] = { " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" " \"parked-packet-limit\": 256,\n" -" \"renew-timer\": 1000,\n" +" \"rebind-timer\": 2000,\n" " \"reservations-global\": false,\n" " \"reservations-in-subnet\": true,\n" " \"reservations-lookup-first\": false,\n" @@ -2669,10 +2582,10 @@ const char* UNPARSED_CONFIGS[] = { " \"pool\": \"192.0.2.1-192.0.2.100\"\n" " }\n" " ],\n" +" \"rebind-timer\": 2000,\n" " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"renew-timer\": 1000,\n" " \"reservations\": [ ],\n" " \"store-extended-info\": false,\n" " \"subnet\": \"192.0.2.0/24\",\n" @@ -2685,7 +2598,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 3 + // CONFIGURATION 2 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -2739,8 +2652,6 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"memfile\"\n" " },\n" " \"match-client-id\": true,\n" -" \"max-valid-lifetime\": 5000,\n" -" \"min-valid-lifetime\": 3000,\n" " \"multi-threading\": {\n" " \"enable-multi-threading\": true,\n" " \"packet-queue-size\": 64,\n" @@ -2750,7 +2661,6 @@ const char* UNPARSED_CONFIGS[] = { " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" " \"parked-packet-limit\": 256,\n" -" \"rebind-timer\": 2000,\n" " \"renew-timer\": 1000,\n" " \"reservations-global\": false,\n" " \"reservations-in-subnet\": true,\n" @@ -2774,8 +2684,8 @@ const char* UNPARSED_CONFIGS[] = { " \"allocator\": \"iterative\",\n" " \"calculate-tee-times\": false,\n" " \"id\": 1,\n" -" \"max-valid-lifetime\": 5000,\n" -" \"min-valid-lifetime\": 3000,\n" +" \"max-valid-lifetime\": 4000,\n" +" \"min-valid-lifetime\": 4000,\n" " \"option-data\": [ ],\n" " \"pools\": [\n" " {\n" @@ -2783,7 +2693,6 @@ const char* UNPARSED_CONFIGS[] = { " \"pool\": \"192.0.2.1-192.0.2.100\"\n" " }\n" " ],\n" -" \"rebind-timer\": 2000,\n" " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" @@ -2800,7 +2709,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 4 + // CONFIGURATION 3 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -2854,6 +2763,8 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"memfile\"\n" " },\n" " \"match-client-id\": true,\n" +" \"max-valid-lifetime\": 5000,\n" +" \"min-valid-lifetime\": 3000,\n" " \"multi-threading\": {\n" " \"enable-multi-threading\": true,\n" " \"packet-queue-size\": 64,\n" @@ -2887,8 +2798,8 @@ const char* UNPARSED_CONFIGS[] = { " \"allocator\": \"iterative\",\n" " \"calculate-tee-times\": false,\n" " \"id\": 1,\n" -" \"max-valid-lifetime\": 4000,\n" -" \"min-valid-lifetime\": 4000,\n" +" \"max-valid-lifetime\": 5000,\n" +" \"min-valid-lifetime\": 3000,\n" " \"option-data\": [ ],\n" " \"pools\": [\n" " {\n" @@ -2907,97 +2818,13 @@ const char* UNPARSED_CONFIGS[] = { " \"t1-percent\": 0.5,\n" " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" -" },\n" -" {\n" -" \"4o6-interface\": \"\",\n" -" \"4o6-interface-id\": \"\",\n" -" \"4o6-subnet\": \"\",\n" -" \"allocator\": \"iterative\",\n" -" \"calculate-tee-times\": false,\n" -" \"id\": 2,\n" -" \"max-valid-lifetime\": 4000,\n" -" \"min-valid-lifetime\": 4000,\n" -" \"option-data\": [ ],\n" -" \"pools\": [\n" -" {\n" -" \"option-data\": [ ],\n" -" \"pool\": \"192.0.3.101-192.0.3.150\"\n" -" }\n" -" ],\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"renew-timer\": 1000,\n" -" \"reservations\": [ ],\n" -" \"store-extended-info\": false,\n" -" \"subnet\": \"192.0.3.0/24\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.875,\n" -" \"valid-lifetime\": 4000\n" -" },\n" -" {\n" -" \"4o6-interface\": \"\",\n" -" \"4o6-interface-id\": \"\",\n" -" \"4o6-subnet\": \"\",\n" -" \"allocator\": \"iterative\",\n" -" \"calculate-tee-times\": false,\n" -" \"id\": 3,\n" -" \"max-valid-lifetime\": 4000,\n" -" \"min-valid-lifetime\": 4000,\n" -" \"option-data\": [ ],\n" -" \"pools\": [\n" -" {\n" -" \"option-data\": [ ],\n" -" \"pool\": \"192.0.4.101-192.0.4.150\"\n" -" }\n" -" ],\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"renew-timer\": 1000,\n" -" \"reservations\": [ ],\n" -" \"store-extended-info\": false,\n" -" \"subnet\": \"192.0.4.0/24\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.875,\n" -" \"valid-lifetime\": 4000\n" -" },\n" -" {\n" -" \"4o6-interface\": \"\",\n" -" \"4o6-interface-id\": \"\",\n" -" \"4o6-subnet\": \"\",\n" -" \"allocator\": \"iterative\",\n" -" \"calculate-tee-times\": false,\n" -" \"id\": 4,\n" -" \"max-valid-lifetime\": 4000,\n" -" \"min-valid-lifetime\": 4000,\n" -" \"option-data\": [ ],\n" -" \"pools\": [\n" -" {\n" -" \"option-data\": [ ],\n" -" \"pool\": \"192.0.5.101-192.0.5.150\"\n" -" }\n" -" ],\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"renew-timer\": 1000,\n" -" \"reservations\": [ ],\n" -" \"store-extended-info\": false,\n" -" \"subnet\": \"192.0.5.0/24\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.875,\n" -" \"valid-lifetime\": 4000\n" " }\n" " ],\n" " \"t1-percent\": 0.5,\n" " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 5 + // CONFIGURATION 4 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -3194,7 +3021,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 6 + // CONFIGURATION 5 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -3307,7 +3134,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 7 + // CONFIGURATION 6 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -3423,7 +3250,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 8 + // CONFIGURATION 7 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -3539,7 +3366,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 9 + // CONFIGURATION 8 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -3652,7 +3479,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 10 + // CONFIGURATION 9 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -3765,7 +3592,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 11 + // CONFIGURATION 10 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -3884,7 +3711,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 12 + // CONFIGURATION 11 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -4027,7 +3854,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 13 + // CONFIGURATION 12 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -4169,7 +3996,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 14 + // CONFIGURATION 13 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -4312,7 +4139,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 15 + // CONFIGURATION 14 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": true,\n" @@ -4454,7 +4281,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 16 + // CONFIGURATION 15 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -4569,7 +4396,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 17 + // CONFIGURATION 16 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -4718,7 +4545,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 18 + // CONFIGURATION 17 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -4831,7 +4658,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 19 + // CONFIGURATION 18 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -4923,7 +4750,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 20 + // CONFIGURATION 19 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -5015,7 +4842,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 21 + // CONFIGURATION 20 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -5116,7 +4943,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 22 + // CONFIGURATION 21 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -5208,7 +5035,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 23 + // CONFIGURATION 22 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -5300,7 +5127,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 24 + // CONFIGURATION 23 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -5392,7 +5219,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 25 + // CONFIGURATION 24 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -5484,7 +5311,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 26 + // CONFIGURATION 25 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -5616,7 +5443,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 27 + // CONFIGURATION 26 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -5748,7 +5575,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 28 + // CONFIGURATION 27 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -5890,7 +5717,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 29 + // CONFIGURATION 28 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -6012,7 +5839,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 30 + // CONFIGURATION 29 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -6181,7 +6008,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 3000\n" " }\n", - // CONFIGURATION 31 + // CONFIGURATION 30 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -6323,7 +6150,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 32 + // CONFIGURATION 31 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -6484,7 +6311,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 33 + // CONFIGURATION 32 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -6616,7 +6443,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 34 + // CONFIGURATION 33 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -6753,7 +6580,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 35 + // CONFIGURATION 34 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -6885,7 +6712,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 36 + // CONFIGURATION 35 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -7007,7 +6834,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 37 + // CONFIGURATION 36 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -7167,7 +6994,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 3000\n" " }\n", - // CONFIGURATION 38 + // CONFIGURATION 37 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -7297,7 +7124,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 39 + // CONFIGURATION 38 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -7430,7 +7257,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 40 + // CONFIGURATION 39 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -7514,7 +7341,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 41 + // CONFIGURATION 40 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -7598,7 +7425,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 42 + // CONFIGURATION 41 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -7711,7 +7538,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 43 + // CONFIGURATION 42 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -7824,7 +7651,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 44 + // CONFIGURATION 43 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -7937,7 +7764,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 45 + // CONFIGURATION 44 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -8050,7 +7877,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 46 + // CONFIGURATION 45 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -8163,7 +7990,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 47 + // CONFIGURATION 46 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -8363,7 +8190,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 48 + // CONFIGURATION 47 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -8491,7 +8318,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 49 + // CONFIGURATION 48 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -8769,7 +8596,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 50 + // CONFIGURATION 49 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -8913,7 +8740,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 51 + // CONFIGURATION 50 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -9210,7 +9037,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 52 + // CONFIGURATION 51 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -9354,7 +9181,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 53 + // CONFIGURATION 52 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -9436,7 +9263,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 54 + // CONFIGURATION 53 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -9518,7 +9345,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 55 + // CONFIGURATION 54 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -9600,7 +9427,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 56 + // CONFIGURATION 55 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -9682,7 +9509,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 57 + // CONFIGURATION 56 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -9795,7 +9622,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 58 + // CONFIGURATION 57 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -9908,7 +9735,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 59 + // CONFIGURATION 58 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -10021,7 +9848,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 60 + // CONFIGURATION 59 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -10134,7 +9961,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 61 + // CONFIGURATION 60 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -10247,7 +10074,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 62 + // CONFIGURATION 61 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -10386,7 +10213,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 63 + // CONFIGURATION 62 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -10516,7 +10343,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 64 + // CONFIGURATION 63 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -10648,7 +10475,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 65 + // CONFIGURATION 64 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -10761,7 +10588,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 66 + // CONFIGURATION 65 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -10875,7 +10702,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 67 + // CONFIGURATION 66 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -10993,7 +10820,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 68 + // CONFIGURATION 67 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -11111,7 +10938,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 69 + // CONFIGURATION 68 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -11209,7 +11036,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 70 + // CONFIGURATION 69 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -11446,7 +11273,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 71 + // CONFIGURATION 70 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -11646,7 +11473,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 72 + // CONFIGURATION 71 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -11825,7 +11652,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 73 + // CONFIGURATION 72 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -11966,7 +11793,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 74 + // CONFIGURATION 73 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -12107,7 +11934,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 75 + // CONFIGURATION 74 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -12191,7 +12018,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n", - // CONFIGURATION 76 + // CONFIGURATION 75 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" @@ -12273,7 +12100,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 7200\n" " }\n", - // CONFIGURATION 77 + // CONFIGURATION 76 "{\n" " \"allocator\": \"iterative\",\n" " \"authoritative\": false,\n" diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc index bb7d21c90d..648254c5a8 100644 --- a/src/bin/dhcp6/tests/get_config_unittest.cc +++ b/src/bin/dhcp6/tests/get_config_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2017-2023 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2017-2022 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 @@ -96,6 +96,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n" @@ -117,6 +118,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -125,7 +127,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:1::/64\"\n" " },\n" " {\n" -" \"id\": 0,\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:2::/80\"\n" @@ -134,6 +136,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:2::/64\"\n" " },\n" " {\n" +" \"id\": 3,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:3::/80\"\n" @@ -142,6 +145,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:3::/64\"\n" " },\n" " {\n" +" \"id\": 4,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:4::/80\"\n" @@ -264,6 +268,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n" @@ -289,6 +294,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"max-preferred-lifetime\": 4,\n" " \"max-valid-lifetime\": 5,\n" " \"min-preferred-lifetime\": 2,\n" @@ -318,6 +324,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"interface\": \"eth0\",\n" " \"pools\": [\n" " {\n" @@ -336,6 +343,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"interface-id\": \"foobar\",\n" " \"pools\": [\n" " {\n" @@ -358,6 +366,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/96\"\n" @@ -369,6 +378,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:1::/64\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:2::1 - 2001:db8:2::ff\"\n" @@ -393,6 +403,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -414,6 +425,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 128,\n" @@ -437,6 +449,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" @@ -462,6 +475,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 80,\n" @@ -500,6 +514,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" @@ -598,6 +613,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -619,6 +635,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"option-data\": [\n" " {\n" " \"csv-format\": false,\n" @@ -671,6 +688,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -766,6 +784,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -787,6 +806,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"option-data\": [\n" " {\n" " \"csv-format\": false,\n" @@ -802,6 +822,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:1::/64\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"option-data\": [\n" " {\n" " \"csv-format\": false,\n" @@ -830,6 +851,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" @@ -910,6 +932,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -947,6 +970,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -990,6 +1014,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n" @@ -1014,6 +1039,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n" @@ -1039,6 +1065,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"client-class\": \"alpha\",\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -1048,6 +1075,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " {\n" " \"client-class\": \"beta\",\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:2::/80\"\n" @@ -1057,6 +1085,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " {\n" " \"client-class\": \"gamma\",\n" +" \"id\": 3,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:3::/80\"\n" @@ -1065,6 +1094,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:3::/64\"\n" " },\n" " {\n" +" \"id\": 4,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:4::/80\"\n" @@ -1086,6 +1116,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"client-class\": \"alpha\",\n" @@ -1119,6 +1150,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pd-pools\": [\n" " {\n" " \"client-class\": \"alpha\",\n" @@ -1170,6 +1202,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -1208,6 +1241,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -1254,6 +1288,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/80\"\n" @@ -1424,6 +1459,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/64\"\n" @@ -1435,6 +1471,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:1::/48\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:2::/64\"\n" @@ -1446,6 +1483,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:2::/48\"\n" " },\n" " {\n" +" \"id\": 3,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:3::/64\"\n" @@ -1456,6 +1494,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:3::/48\"\n" " },\n" " {\n" +" \"id\": 4,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:4::/64\"\n" @@ -1466,6 +1505,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:4::/48\"\n" " },\n" " {\n" +" \"id\": 5,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:5::/64\"\n" @@ -1474,6 +1514,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:5::/48\"\n" " },\n" " {\n" +" \"id\": 6,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:6::/64\"\n" @@ -1485,6 +1526,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:6::/48\"\n" " },\n" " {\n" +" \"id\": 7,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:7::/64\"\n" @@ -1508,6 +1550,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"reservations-out-of-pool\": true,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::/64\"\n" @@ -1519,6 +1562,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"subnet\": \"2001:db8:1::/48\"\n" " },\n" " {\n" +" \"id\": 2,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:2::/64\"\n" @@ -1605,6 +1649,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n" @@ -1626,6 +1671,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8::/64\"\n" @@ -1647,6 +1693,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8::/64\",\n" @@ -1669,6 +1716,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8::/64\",\n" @@ -1696,6 +1744,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:: - 2001:db8::ffff:ffff:ffff:ffff\",\n" @@ -1723,6 +1772,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" @@ -1746,6 +1796,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" @@ -1770,6 +1821,7 @@ const char* EXTRACTED_CONFIGS[] = { " \"renew-timer\": 1000,\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" @@ -2059,6 +2111,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n" @@ -2092,6 +2145,7 @@ const char* EXTRACTED_CONFIGS[] = { " },\n" " \"subnet6\": [\n" " {\n" +" \"id\": 1,\n" " \"pools\": [\n" " {\n" " \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"