]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fbeb246)
[#1405] regenerated and fixed unittests
authorRazvan Becheriu <razvan@isc.org>
Wed, 11 Nov 2020 21:35:42 +0000 (23:35 +0200)
committerRazvan Becheriu <razvan@isc.org>
Wed, 18 Nov 2020 13:55:23 +0000 (15:55 +0200)
src/bin/admin/tests/mysql_tests.sh.in patch | blob | blame | history
src/bin/dhcp4/tests/get_config_unittest.cc patch | blob | blame | history
src/bin/dhcp6/tests/get_config_unittest.cc patch | blob | blame | history
src/lib/dhcpsrv/alloc_engine.cc patch | blob | blame | history
src/lib/dhcpsrv/dhcpsrv_messages.cc patch | blob | blame | history
src/lib/dhcpsrv/dhcpsrv_messages.h patch | blob | blame | history

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index ec12eafe060885d4548e0e6629fada698ce65682..daa965532a778a354d7b59c000fc589bb5066618 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -1481,7 +1481,7 @@ mysql_reservation_mode_upgrade_test() {
     run_statement "#4_shared_global" "$qry" 1
 
     # Test ALL (3) -> false, true, false
-    qry="select count(id) from dhcp4_shared_network where reservation_global = false and reservations_in_subnet = true and reservations_out_of_pool = false name = 'test3';"
+    qry="select count(id) from dhcp4_shared_network where reservations_global = false and reservations_in_subnet = true and reservations_out_of_pool = false and name = 'test3';"
     run_statement "#4_shared_all" "$qry" 1
 
     # Test DISABLED (0) -> false, false, false
diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc
index d481f430bf1e1340b39fe4c388ca6709bd747887..8559b9cf18abacf8ced880770d674dcf398573dc 100644 (file)
--- a/src/bin/dhcp4/tests/get_config_unittest.cc
+++ b/src/bin/dhcp4/tests/get_config_unittest.cc
@@ -1586,59 +1586,9 @@ const char* EXTRACTED_CONFIGS[] = {
         "                        \"pool\": \"192.0.1.0/24\"\n"
         "                    }\n"
         "                ],\n"
-        "                \"reservation-mode\": \"all\",\n"
-        "                \"subnet\": \"192.0.1.0/24\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"192.0.2.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"reservation-mode\": \"out-of-pool\",\n"
-        "                \"subnet\": \"192.0.2.0/24\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"192.0.3.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"reservation-mode\": \"disabled\",\n"
-        "                \"subnet\": \"192.0.3.0/24\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"192.0.4.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"reservation-mode\": \"global\",\n"
-        "                \"subnet\": \"192.0.4.0/24\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"192.0.5.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"subnet\": \"192.0.5.0/24\"\n"
-        "            }\n"
-        "        ],\n"
-        "        \"valid-lifetime\": 4000\n"
-        "    }\n",
-            // CONFIGURATION 51
-        "{\n"
-        "        \"rebind-timer\": 2000,\n"
-        "        \"renew-timer\": 1000,\n"
-        "        \"subnet4\": [\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"192.0.1.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"subnet\": \"192.0.1.0/24\"\n"
         "            },\n"
         "            {\n"
@@ -1647,6 +1597,8 @@ const char* EXTRACTED_CONFIGS[] = {
         "                        \"pool\": \"192.0.2.0/24\"\n"
         "                    }\n"
         "                ],\n"
+        "                \"reservations-global\": false,\n"
+        "                \"reservations-in-subnet\": true,\n"
         "                \"reservations-out-of-pool\": true,\n"
         "                \"subnet\": \"192.0.2.0/24\"\n"
         "            },\n"
@@ -1668,6 +1620,8 @@ const char* EXTRACTED_CONFIGS[] = {
         "                    }\n"
         "                ],\n"
         "                \"reservations-global\": true,\n"
+        "                \"reservations-in-subnet\": false,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"subnet\": \"192.0.4.0/24\"\n"
         "            },\n"
         "            {\n"
@@ -1703,36 +1657,12 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 52
-        "{\n"
-        "        \"rebind-timer\": 2000,\n"
-        "        \"renew-timer\": 1000,\n"
-        "        \"reservation-mode\": \"out-of-pool\",\n"
-        "        \"subnet4\": [\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"192.0.2.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"reservation-mode\": \"all\",\n"
-        "                \"subnet\": \"192.0.2.0/24\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"192.0.3.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"subnet\": \"192.0.3.0/24\"\n"
-        "            }\n"
-        "        ],\n"
-        "        \"valid-lifetime\": 4000\n"
-        "    }\n",
-            // CONFIGURATION 53
+            // CONFIGURATION 51
         "{\n"
         "        \"rebind-timer\": 2000,\n"
         "        \"renew-timer\": 1000,\n"
+        "        \"reservations-global\": false,\n"
+        "        \"reservations-in-subnet\": true,\n"
         "        \"reservations-out-of-pool\": true,\n"
         "        \"subnet4\": [\n"
         "            {\n"
@@ -1741,7 +1671,9 @@ const char* EXTRACTED_CONFIGS[] = {
         "                        \"pool\": \"192.0.2.0/24\"\n"
         "                    }\n"
         "                ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"subnet\": \"192.0.2.0/24\"\n"
         "            },\n"
         "            {\n"
@@ -1755,7 +1687,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 54
+            // CONFIGURATION 52
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1763,7 +1695,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet4\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 55
+            // CONFIGURATION 53
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1771,7 +1703,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet4\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 56
+            // CONFIGURATION 54
         "{\n"
         "        \"decline-probation-period\": 12345,\n"
         "        \"interfaces-config\": {\n"
@@ -1780,7 +1712,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet4\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 57
+            // CONFIGURATION 55
         "{\n"
         "        \"expired-leases-processing\": {\n"
         "            \"flush-reclaimed-timer-wait-time\": 35,\n"
@@ -1796,7 +1728,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet4\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 58
+            // CONFIGURATION 56
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1816,7 +1748,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 59
+            // CONFIGURATION 57
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1837,7 +1769,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 60
+            // CONFIGURATION 58
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1858,7 +1790,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 61
+            // CONFIGURATION 59
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1880,7 +1812,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 62
+            // CONFIGURATION 60
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1901,7 +1833,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 63
+            // CONFIGURATION 61
         "{\n"
         "        \"client-classes\": [\n"
         "            {\n"
@@ -1932,7 +1864,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 64
+            // CONFIGURATION 62
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1952,7 +1884,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 65
+            // CONFIGURATION 63
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1973,7 +1905,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 66
+            // CONFIGURATION 64
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1998,7 +1930,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 67
+            // CONFIGURATION 65
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2023,7 +1955,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 68
+            // CONFIGURATION 66
         "{\n"
         "        \"hosts-databases\": [\n"
         "            {\n"
@@ -2047,7 +1979,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        \"renew-timer\": 1000,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 69
+            // CONFIGURATION 67
         "{\n"
         "        \"client-classes\": [\n"
         "            {\n"
@@ -2156,7 +2088,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "            \"comment\": \"A DHCPv4 server\"\n"
         "        }\n"
         "    }\n",
-            // CONFIGURATION 70
+            // CONFIGURATION 68
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2218,7 +2150,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 71
+            // CONFIGURATION 69
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2268,7 +2200,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 72
+            // CONFIGURATION 70
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2298,7 +2230,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 73
+            // CONFIGURATION 71
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2328,7 +2260,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 74
+            // CONFIGURATION 72
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2340,7 +2272,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        \"statistic-default-sample-count\": 10,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 75
+            // CONFIGURATION 73
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2348,7 +2280,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet4\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 76
+            // CONFIGURATION 74
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -8426,7 +8358,9 @@ const char* UNPARSED_CONFIGS[] = {
         "                },\n"
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"store-extended-info\": false,\n"
         "                \"subnet\": \"192.0.1.0/24\",\n"
         "                \"t1-percent\": 0.5,\n"
@@ -8452,6 +8386,7 @@ const char* UNPARSED_CONFIGS[] = {
         "                },\n"
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
         "                \"reservations-out-of-pool\": true,\n"
         "                \"store-extended-info\": false,\n"
@@ -8508,6 +8443,8 @@ const char* UNPARSED_CONFIGS[] = {
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
         "                \"reservations-global\": true,\n"
+        "                \"reservations-in-subnet\": false,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"store-extended-info\": false,\n"
         "                \"subnet\": \"192.0.4.0/24\",\n"
         "                \"t1-percent\": 0.5,\n"
@@ -8538,6 +8475,62 @@ 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"
+        "                \"calculate-tee-times\": false,\n"
+        "                \"id\": 6,\n"
+        "                \"option-data\": [ ],\n"
+        "                \"pools\": [\n"
+        "                    {\n"
+        "                        \"option-data\": [ ],\n"
+        "                        \"pool\": \"192.0.6.0/24\"\n"
+        "                    }\n"
+        "                ],\n"
+        "                \"rebind-timer\": 2000,\n"
+        "                \"relay\": {\n"
+        "                    \"ip-addresses\": [ ]\n"
+        "                },\n"
+        "                \"renew-timer\": 1000,\n"
+        "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": true,\n"
+        "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
+        "                \"store-extended-info\": false,\n"
+        "                \"subnet\": \"192.0.6.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"
+        "                \"calculate-tee-times\": false,\n"
+        "                \"id\": 7,\n"
+        "                \"option-data\": [ ],\n"
+        "                \"pools\": [\n"
+        "                    {\n"
+        "                        \"option-data\": [ ],\n"
+        "                        \"pool\": \"192.0.7.0/24\"\n"
+        "                    }\n"
+        "                ],\n"
+        "                \"rebind-timer\": 2000,\n"
+        "                \"relay\": {\n"
+        "                    \"ip-addresses\": [ ]\n"
+        "                },\n"
+        "                \"renew-timer\": 1000,\n"
+        "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": true,\n"
+        "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": true,\n"
+        "                \"store-extended-info\": false,\n"
+        "                \"subnet\": \"192.0.7.0/24\",\n"
+        "                \"t1-percent\": 0.5,\n"
+        "                \"t2-percent\": 0.875,\n"
+        "                \"valid-lifetime\": 4000\n"
         "            }\n"
         "        ],\n"
         "        \"t1-percent\": 0.5,\n"
@@ -8608,7 +8601,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"renew-timer\": 1000,\n"
         "        \"reservations-global\": false,\n"
         "        \"reservations-in-subnet\": true,\n"
-        "        \"reservations-out-of-pool\": false,\n"
+        "        \"reservations-out-of-pool\": true,\n"
         "        \"sanity-checks\": {\n"
         "            \"lease-checks\": \"warn\"\n"
         "        },\n"
@@ -8629,32 +8622,6 @@ const char* UNPARSED_CONFIGS[] = {
         "                \"pools\": [\n"
         "                    {\n"
         "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"192.0.1.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"rebind-timer\": 2000,\n"
-        "                \"relay\": {\n"
-        "                    \"ip-addresses\": [ ]\n"
-        "                },\n"
-        "                \"renew-timer\": 1000,\n"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-in-subnet\": true,\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"192.0.1.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"
-        "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 2,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
         "                        \"pool\": \"192.0.2.0/24\"\n"
         "                    }\n"
         "                ],\n"
@@ -8664,8 +8631,9 @@ const char* UNPARSED_CONFIGS[] = {
         "                },\n"
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
-        "                \"reservations-out-of-pool\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"store-extended-info\": false,\n"
         "                \"subnet\": \"192.0.2.0/24\",\n"
         "                \"t1-percent\": 0.5,\n"
@@ -8677,7 +8645,7 @@ const char* UNPARSED_CONFIGS[] = {
         "                \"4o6-interface-id\": \"\",\n"
         "                \"4o6-subnet\": \"\",\n"
         "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 3,\n"
+        "                \"id\": 2,\n"
         "                \"option-data\": [ ],\n"
         "                \"pools\": [\n"
         "                    {\n"
@@ -8691,120 +8659,11 @@ const char* UNPARSED_CONFIGS[] = {
         "                },\n"
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
-        "                \"reservations-global\": false,\n"
-        "                \"reservations-in-subnet\": false,\n"
-        "                \"reservations-out-of-pool\": false,\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"
-        "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 4,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"192.0.4.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"rebind-timer\": 2000,\n"
-        "                \"relay\": {\n"
-        "                    \"ip-addresses\": [ ]\n"
-        "                },\n"
-        "                \"renew-timer\": 1000,\n"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-global\": true,\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"
-        "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 5,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"192.0.5.0/24\"\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"
-        "                \"4o6-interface\": \"\",\n"
-        "                \"4o6-interface-id\": \"\",\n"
-        "                \"4o6-subnet\": \"\",\n"
-        "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 6,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"192.0.6.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"rebind-timer\": 2000,\n"
-        "                \"relay\": {\n"
-        "                    \"ip-addresses\": [ ]\n"
-        "                },\n"
-        "                \"renew-timer\": 1000,\n"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-global\": true,\n"
-        "                \"reservations-in-subnet\": true,\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"192.0.6.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"
-        "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 7,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"192.0.7.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"rebind-timer\": 2000,\n"
-        "                \"relay\": {\n"
-        "                    \"ip-addresses\": [ ]\n"
-        "                },\n"
-        "                \"renew-timer\": 1000,\n"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-global\": true,\n"
-        "                \"reservations-in-subnet\": true,\n"
-        "                \"reservations-out-of-pool\": true,\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"192.0.7.0/24\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.875,\n"
-        "                \"valid-lifetime\": 4000\n"
         "            }\n"
         "        ],\n"
         "        \"t1-percent\": 0.5,\n"
@@ -8855,266 +8714,6 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"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\": false,\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"
-        "        \"rebind-timer\": 2000,\n"
-        "        \"renew-timer\": 1000,\n"
-        "        \"reservation-mode\": \"out-of-pool\",\n"
-        "        \"sanity-checks\": {\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"
-        "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 1,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"192.0.2.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"rebind-timer\": 2000,\n"
-        "                \"relay\": {\n"
-        "                    \"ip-addresses\": [ ]\n"
-        "                },\n"
-        "                \"renew-timer\": 1000,\n"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-in-subnet\": true,\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"
-        "                \"4o6-interface\": \"\",\n"
-        "                \"4o6-interface-id\": \"\",\n"
-        "                \"4o6-subnet\": \"\",\n"
-        "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 2,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"192.0.3.0/24\"\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"
-        "        \"t1-percent\": 0.5,\n"
-        "        \"t2-percent\": 0.875,\n"
-        "        \"valid-lifetime\": 4000\n"
-        "    }\n",
-            // CONFIGURATION 53
-        "{\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"
-        "        \"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\": false,\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"
-        "        \"rebind-timer\": 2000,\n"
-        "        \"renew-timer\": 1000,\n"
-        "        \"reservations-global\": false,\n"
-        "        \"reservations-in-subnet\": true,\n"
-        "        \"reservations-out-of-pool\": true,\n"
-        "        \"sanity-checks\": {\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"
-        "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 1,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"192.0.2.0/24\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"rebind-timer\": 2000,\n"
-        "                \"relay\": {\n"
-        "                    \"ip-addresses\": [ ]\n"
-        "                },\n"
-        "                \"renew-timer\": 1000,\n"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-in-subnet\": true,\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"
-        "                \"4o6-interface\": \"\",\n"
-        "                \"4o6-interface-id\": \"\",\n"
-        "                \"4o6-subnet\": \"\",\n"
-        "                \"calculate-tee-times\": false,\n"
-        "                \"id\": 2,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"192.0.3.0/24\"\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"
-        "        \"t1-percent\": 0.5,\n"
-        "        \"t2-percent\": 0.875,\n"
-        "        \"valid-lifetime\": 4000\n"
-        "    }\n",
-            // CONFIGURATION 54
-        "{\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"
-        "        \"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"
@@ -9148,7 +8747,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 55
+            // CONFIGURATION 53
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -9225,7 +8824,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 56
+            // CONFIGURATION 54
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -9302,7 +8901,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 57
+            // CONFIGURATION 55
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -9379,7 +8978,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 58
+            // CONFIGURATION 56
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -9484,7 +9083,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 59
+            // CONFIGURATION 57
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -9589,7 +9188,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 60
+            // CONFIGURATION 58
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -9694,7 +9293,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 61
+            // CONFIGURATION 59
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -9799,7 +9398,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 62
+            // CONFIGURATION 60
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -9904,7 +9503,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 63
+            // CONFIGURATION 61
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -10035,7 +9634,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 64
+            // CONFIGURATION 62
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -10140,7 +9739,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 65
+            // CONFIGURATION 63
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -10246,7 +9845,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 66
+            // CONFIGURATION 64
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -10356,7 +9955,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 67
+            // CONFIGURATION 65
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -10466,7 +10065,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 68
+            // CONFIGURATION 66
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -10559,7 +10158,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 69
+            // CONFIGURATION 67
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -10783,7 +10382,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        },\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 70
+            // CONFIGURATION 68
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -10968,7 +10567,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 71
+            // CONFIGURATION 69
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -11130,7 +10729,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 72
+            // CONFIGURATION 70
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -11260,7 +10859,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 73
+            // CONFIGURATION 71
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -11390,7 +10989,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 74
+            // CONFIGURATION 72
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -11469,7 +11068,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 75
+            // CONFIGURATION 73
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
@@ -11546,7 +11145,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.875,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 76
+            // CONFIGURATION 74
         "{\n"
         "        \"authoritative\": false,\n"
         "        \"boot-file-name\": \"\",\n"
diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc
index 87472054b5efd5f848f34d9ab310ac4374b3fbc8..5b329c06c3f4763e1e4fb66a5706b221abd88424 100644 (file)
--- a/src/bin/dhcp6/tests/get_config_unittest.cc
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc
@@ -1406,60 +1406,9 @@ const char* EXTRACTED_CONFIGS[] = {
         "                        \"pool\": \"2001:db8:1::/64\"\n"
         "                    }\n"
         "                ],\n"
-        "                \"reservation-mode\": \"all\",\n"
-        "                \"subnet\": \"2001:db8:1::/48\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"2001:db8:2::/64\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"reservation-mode\": \"out-of-pool\",\n"
-        "                \"subnet\": \"2001:db8:2::/48\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"2001:db8:3::/64\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"reservation-mode\": \"disabled\",\n"
-        "                \"subnet\": \"2001:db8:3::/48\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"2001:db8:4::/64\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"reservation-mode\": \"global\",\n"
-        "                \"subnet\": \"2001:db8:4::/48\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"2001:db8:5::/64\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"subnet\": \"2001:db8:5::/48\"\n"
-        "            }\n"
-        "        ],\n"
-        "        \"valid-lifetime\": 4000\n"
-        "    }\n",
-            // CONFIGURATION 43
-        "{\n"
-        "        \"preferred-lifetime\": 3000,\n"
-        "        \"rebind-timer\": 2000,\n"
-        "        \"renew-timer\": 1000,\n"
-        "        \"subnet6\": [\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"2001:db8:1::/64\"\n"
-        "                    }\n"
-        "                ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"subnet\": \"2001:db8:1::/48\"\n"
         "            },\n"
         "            {\n"
@@ -1468,6 +1417,8 @@ const char* EXTRACTED_CONFIGS[] = {
         "                        \"pool\": \"2001:db8:2::/64\"\n"
         "                    }\n"
         "                ],\n"
+        "                \"reservations-global\": false,\n"
+        "                \"reservations-in-subnet\": true,\n"
         "                \"reservations-out-of-pool\": true,\n"
         "                \"subnet\": \"2001:db8:2::/48\"\n"
         "            },\n"
@@ -1489,6 +1440,8 @@ const char* EXTRACTED_CONFIGS[] = {
         "                    }\n"
         "                ],\n"
         "                \"reservations-global\": true,\n"
+        "                \"reservations-in-subnet\": false,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"subnet\": \"2001:db8:4::/48\"\n"
         "            },\n"
         "            {\n"
@@ -1524,38 +1477,13 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 44
-        "{\n"
-        "        \"preferred-lifetime\": 3000,\n"
-        "        \"rebind-timer\": 2000,\n"
-        "        \"renew-timer\": 1000,\n"
-        "        \"reservation-mode\": \"out-of-pool\",\n"
-        "        \"subnet6\": [\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"2001:db8:1::/64\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"reservation-mode\": \"all\",\n"
-        "                \"subnet\": \"2001:db8:1::/48\"\n"
-        "            },\n"
-        "            {\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"pool\": \"2001:db8:2::/64\"\n"
-        "                    }\n"
-        "                ],\n"
-        "                \"subnet\": \"2001:db8:2::/48\"\n"
-        "            }\n"
-        "        ],\n"
-        "        \"valid-lifetime\": 4000\n"
-        "    }\n",
-            // CONFIGURATION 45
+            // CONFIGURATION 43
         "{\n"
         "        \"preferred-lifetime\": 3000,\n"
         "        \"rebind-timer\": 2000,\n"
         "        \"renew-timer\": 1000,\n"
+        "        \"reservations-global\": false,\n"
+        "        \"reservations-in-subnet\": true,\n"
         "        \"reservations-out-of-pool\": true,\n"
         "        \"subnet6\": [\n"
         "            {\n"
@@ -1564,7 +1492,9 @@ const char* EXTRACTED_CONFIGS[] = {
         "                        \"pool\": \"2001:db8:1::/64\"\n"
         "                    }\n"
         "                ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"subnet\": \"2001:db8:1::/48\"\n"
         "            },\n"
         "            {\n"
@@ -1578,7 +1508,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 46
+            // CONFIGURATION 44
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1591,7 +1521,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        \"subnet6\": [ ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 47
+            // CONFIGURATION 45
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1599,7 +1529,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet6\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 48
+            // CONFIGURATION 46
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1607,7 +1537,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet6\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 49
+            // CONFIGURATION 47
         "{\n"
         "        \"decline-probation-period\": 12345,\n"
         "        \"interfaces-config\": {\n"
@@ -1616,7 +1546,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet6\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 50
+            // CONFIGURATION 48
         "{\n"
         "        \"expired-leases-processing\": {\n"
         "            \"flush-reclaimed-timer-wait-time\": 35,\n"
@@ -1632,7 +1562,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet6\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 51
+            // CONFIGURATION 49
         "{\n"
         "        \"client-classes\": [\n"
         "            {\n"
@@ -1664,7 +1594,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 52
+            // CONFIGURATION 50
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1685,7 +1615,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 53
+            // CONFIGURATION 51
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1707,7 +1637,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 54
+            // CONFIGURATION 52
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1734,7 +1664,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 55
+            // CONFIGURATION 53
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1761,7 +1691,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 56
+            // CONFIGURATION 54
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1784,7 +1714,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 57
+            // CONFIGURATION 55
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1808,7 +1738,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 58
+            // CONFIGURATION 56
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -1837,7 +1767,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 59
+            // CONFIGURATION 57
         "{\n"
         "        \"hosts-databases\": [\n"
         "            {\n"
@@ -1862,7 +1792,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        \"renew-timer\": 1000,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 60
+            // CONFIGURATION 58
         "{\n"
         "        \"client-classes\": [\n"
         "            {\n"
@@ -1987,7 +1917,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "            \"comment\": \"A DHCPv6 server\"\n"
         "        }\n"
         "    }\n",
-            // CONFIGURATION 61
+            // CONFIGURATION 59
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2052,7 +1982,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        ],\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 62
+            // CONFIGURATION 60
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2065,7 +1995,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        \"statistic-default-sample-count\": 10,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 63
+            // CONFIGURATION 61
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2073,7 +2003,7 @@ const char* EXTRACTED_CONFIGS[] = {
         "        },\n"
         "        \"subnet6\": [ ]\n"
         "    }\n",
-            // CONFIGURATION 64
+            // CONFIGURATION 62
         "{\n"
         "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
@@ -2090,6 +2020,7 @@ const char* EXTRACTED_CONFIGS[] = {
 
 /// @brief unparsed configurations
 const char* UNPARSED_CONFIGS[] = {
+        ///put this after const char* UNPARSED_CONFIGS[] = {
             // CONFIGURATION 0
         "{\n"
         "        \"calculate-tee-times\": true,\n"
@@ -7419,7 +7350,9 @@ const char* UNPARSED_CONFIGS[] = {
         "                },\n"
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"store-extended-info\": false,\n"
         "                \"subnet\": \"2001:db8:1::/48\",\n"
         "                \"t1-percent\": 0.5,\n"
@@ -7445,6 +7378,7 @@ const char* UNPARSED_CONFIGS[] = {
         "                },\n"
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
         "                \"reservations-out-of-pool\": true,\n"
         "                \"store-extended-info\": false,\n"
@@ -7501,6 +7435,8 @@ const char* UNPARSED_CONFIGS[] = {
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
         "                \"reservations-global\": true,\n"
+        "                \"reservations-in-subnet\": false,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"store-extended-info\": false,\n"
         "                \"subnet\": \"2001:db8:4::/48\",\n"
         "                \"t1-percent\": 0.5,\n"
@@ -7531,6 +7467,62 @@ const char* UNPARSED_CONFIGS[] = {
         "                \"t1-percent\": 0.5,\n"
         "                \"t2-percent\": 0.8,\n"
         "                \"valid-lifetime\": 4000\n"
+        "            },\n"
+        "            {\n"
+        "                \"calculate-tee-times\": true,\n"
+        "                \"id\": 6,\n"
+        "                \"option-data\": [ ],\n"
+        "                \"pd-pools\": [ ],\n"
+        "                \"pools\": [\n"
+        "                    {\n"
+        "                        \"option-data\": [ ],\n"
+        "                        \"pool\": \"2001:db8:6::/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"
+        "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": true,\n"
+        "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
+        "                \"store-extended-info\": false,\n"
+        "                \"subnet\": \"2001:db8:6::/48\",\n"
+        "                \"t1-percent\": 0.5,\n"
+        "                \"t2-percent\": 0.8,\n"
+        "                \"valid-lifetime\": 4000\n"
+        "            },\n"
+        "            {\n"
+        "                \"calculate-tee-times\": true,\n"
+        "                \"id\": 7,\n"
+        "                \"option-data\": [ ],\n"
+        "                \"pd-pools\": [ ],\n"
+        "                \"pools\": [\n"
+        "                    {\n"
+        "                        \"option-data\": [ ],\n"
+        "                        \"pool\": \"2001:db8:7::/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"
+        "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": true,\n"
+        "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": true,\n"
+        "                \"store-extended-info\": false,\n"
+        "                \"subnet\": \"2001:db8:7::/48\",\n"
+        "                \"t1-percent\": 0.5,\n"
+        "                \"t2-percent\": 0.8,\n"
+        "                \"valid-lifetime\": 4000\n"
         "            }\n"
         "        ],\n"
         "        \"t1-percent\": 0.5,\n"
@@ -7599,7 +7591,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"renew-timer\": 1000,\n"
         "        \"reservations-global\": false,\n"
         "        \"reservations-in-subnet\": true,\n"
-        "        \"reservations-out-of-pool\": false,\n"
+        "        \"reservations-out-of-pool\": true,\n"
         "        \"sanity-checks\": {\n"
         "            \"lease-checks\": \"warn\"\n"
         "        },\n"
@@ -7636,7 +7628,9 @@ const char* UNPARSED_CONFIGS[] = {
         "                },\n"
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
+        "                \"reservations-global\": false,\n"
         "                \"reservations-in-subnet\": true,\n"
+        "                \"reservations-out-of-pool\": false,\n"
         "                \"store-extended-info\": false,\n"
         "                \"subnet\": \"2001:db8:1::/48\",\n"
         "                \"t1-percent\": 0.5,\n"
@@ -7662,147 +7656,11 @@ const char* UNPARSED_CONFIGS[] = {
         "                },\n"
         "                \"renew-timer\": 1000,\n"
         "                \"reservations\": [ ],\n"
-        "                \"reservations-in-subnet\": true,\n"
-        "                \"reservations-out-of-pool\": true,\n"
         "                \"store-extended-info\": false,\n"
         "                \"subnet\": \"2001:db8:2::/48\",\n"
         "                \"t1-percent\": 0.5,\n"
         "                \"t2-percent\": 0.8,\n"
         "                \"valid-lifetime\": 4000\n"
-        "            },\n"
-        "            {\n"
-        "                \"calculate-tee-times\": true,\n"
-        "                \"id\": 3,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pd-pools\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"2001:db8:3::/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"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-global\": false,\n"
-        "                \"reservations-in-subnet\": false,\n"
-        "                \"reservations-out-of-pool\": false,\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"2001:db8:3::/48\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.8,\n"
-        "                \"valid-lifetime\": 4000\n"
-        "            },\n"
-        "            {\n"
-        "                \"calculate-tee-times\": true,\n"
-        "                \"id\": 4,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pd-pools\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"2001:db8:4::/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"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-global\": true,\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"2001:db8:4::/48\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.8,\n"
-        "                \"valid-lifetime\": 4000\n"
-        "            },\n"
-        "            {\n"
-        "                \"calculate-tee-times\": true,\n"
-        "                \"id\": 5,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pd-pools\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"2001:db8:5::/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"
-        "                \"reservations\": [ ],\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"2001:db8:5::/48\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.8,\n"
-        "                \"valid-lifetime\": 4000\n"
-        "            },\n"
-        "            {\n"
-        "                \"calculate-tee-times\": true,\n"
-        "                \"id\": 6,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pd-pools\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"2001:db8:6::/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"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-global\": true,\n"
-        "                \"reservations-in-subnet\": true,\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"2001:db8:6::/48\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.8,\n"
-        "                \"valid-lifetime\": 4000\n"
-        "            },\n"
-        "            {\n"
-        "                \"calculate-tee-times\": true,\n"
-        "                \"id\": 7,\n"
-        "                \"option-data\": [ ],\n"
-        "                \"pd-pools\": [ ],\n"
-        "                \"pools\": [\n"
-        "                    {\n"
-        "                        \"option-data\": [ ],\n"
-        "                        \"pool\": \"2001:db8:7::/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"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-global\": true,\n"
-        "                \"reservations-in-subnet\": true,\n"
-        "                \"reservations-out-of-pool\": true,\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"2001:db8:7::/48\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.8,\n"
-        "                \"valid-lifetime\": 4000\n"
         "            }\n"
         "        ],\n"
         "        \"t1-percent\": 0.5,\n"
@@ -7850,276 +7708,6 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"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"
-        "        \"mac-sources\": [ \"any\" ],\n"
-        "        \"multi-threading\": {\n"
-        "            \"enable-multi-threading\": false,\n"
-        "            \"packet-queue-size\": 64,\n"
-        "            \"thread-pool-size\": 0\n"
-        "        },\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"
-        "        \"server-tag\": \"\",\n"
-        "        \"shared-networks\": [ ],\n"
-        "        \"statistic-default-sample-age\": 0,\n"
-        "        \"statistic-default-sample-count\": 20,\n"
-        "        \"store-extended-info\": false,\n"
-        "        \"subnet6\": [\n"
-        "            {\n"
-        "                \"calculate-tee-times\": true,\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"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-in-subnet\": true,\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"2001:db8:1::/48\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.8,\n"
-        "                \"valid-lifetime\": 4000\n"
-        "            },\n"
-        "            {\n"
-        "                \"calculate-tee-times\": true,\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"
-        "                \"reservations\": [ ],\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"2001:db8:2::/48\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.8,\n"
-        "                \"valid-lifetime\": 4000\n"
-        "            }\n"
-        "        ],\n"
-        "        \"t1-percent\": 0.5,\n"
-        "        \"t2-percent\": 0.8,\n"
-        "        \"valid-lifetime\": 4000\n"
-        "    }\n",
-            // CONFIGURATION 45
-        "{\n"
-        "        \"calculate-tee-times\": true,\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-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"
-        "        \"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"
-        "        \"mac-sources\": [ \"any\" ],\n"
-        "        \"multi-threading\": {\n"
-        "            \"enable-multi-threading\": false,\n"
-        "            \"packet-queue-size\": 64,\n"
-        "            \"thread-pool-size\": 0\n"
-        "        },\n"
-        "        \"option-data\": [ ],\n"
-        "        \"option-def\": [ ],\n"
-        "        \"preferred-lifetime\": 3000,\n"
-        "        \"rebind-timer\": 2000,\n"
-        "        \"relay-supplied-options\": [ \"65\" ],\n"
-        "        \"renew-timer\": 1000,\n"
-        "        \"reservations-global\": false,\n"
-        "        \"reservations-in-subnet\": true,\n"
-        "        \"reservations-out-of-pool\": true,\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"
-        "        \"server-tag\": \"\",\n"
-        "        \"shared-networks\": [ ],\n"
-        "        \"statistic-default-sample-age\": 0,\n"
-        "        \"statistic-default-sample-count\": 20,\n"
-        "        \"store-extended-info\": false,\n"
-        "        \"subnet6\": [\n"
-        "            {\n"
-        "                \"calculate-tee-times\": true,\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"
-        "                \"reservations\": [ ],\n"
-        "                \"reservations-in-subnet\": true,\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"2001:db8:1::/48\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.8,\n"
-        "                \"valid-lifetime\": 4000\n"
-        "            },\n"
-        "            {\n"
-        "                \"calculate-tee-times\": true,\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"
-        "                \"reservations\": [ ],\n"
-        "                \"store-extended-info\": false,\n"
-        "                \"subnet\": \"2001:db8:2::/48\",\n"
-        "                \"t1-percent\": 0.5,\n"
-        "                \"t2-percent\": 0.8,\n"
-        "                \"valid-lifetime\": 4000\n"
-        "            }\n"
-        "        ],\n"
-        "        \"t1-percent\": 0.5,\n"
-        "        \"t2-percent\": 0.8,\n"
-        "        \"valid-lifetime\": 4000\n"
-        "    }\n",
-            // CONFIGURATION 46
-        "{\n"
-        "        \"calculate-tee-times\": true,\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-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"
-        "        \"hostname-char-replacement\": \"\",\n"
-        "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
-        "        \"interfaces-config\": {\n"
         "            \"interfaces\": [ \"*\" ],\n"
         "            \"re-detect\": false\n"
         "        },\n"
@@ -8163,7 +7751,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 47
+            // CONFIGURATION 45
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -8245,7 +7833,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 48
+            // CONFIGURATION 46
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -8327,7 +7915,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 49
+            // CONFIGURATION 47
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -8409,7 +7997,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 50
+            // CONFIGURATION 48
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -8491,7 +8079,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 51
+            // CONFIGURATION 49
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"client-classes\": [\n"
@@ -8615,7 +8203,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 52
+            // CONFIGURATION 50
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -8725,7 +8313,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 53
+            // CONFIGURATION 51
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -8836,7 +8424,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 54
+            // CONFIGURATION 52
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -8952,7 +8540,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 55
+            // CONFIGURATION 53
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -9068,7 +8656,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 56
+            // CONFIGURATION 54
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -9180,7 +8768,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 57
+            // CONFIGURATION 55
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -9293,7 +8881,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 58
+            // CONFIGURATION 56
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -9411,7 +8999,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 59
+            // CONFIGURATION 57
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -9509,7 +9097,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 60
+            // CONFIGURATION 58
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"client-classes\": [\n"
@@ -9739,7 +9327,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        },\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 61
+            // CONFIGURATION 59
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -9941,7 +9529,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 62
+            // CONFIGURATION 60
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -10025,7 +9613,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 4000\n"
         "    }\n",
-            // CONFIGURATION 63
+            // CONFIGURATION 61
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
@@ -10107,7 +9695,7 @@ const char* UNPARSED_CONFIGS[] = {
         "        \"t2-percent\": 0.8,\n"
         "        \"valid-lifetime\": 7200\n"
         "    }\n",
-            // CONFIGURATION 64
+            // CONFIGURATION 62
         "{\n"
         "        \"calculate-tee-times\": true,\n"
         "        \"ddns-generated-prefix\": \"myhost\",\n"
diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index d12f19788733be8b346113cffb70bf0c8f540df1..c769a9dc3ad97743cca3b95c770eca8c285b2b2a 100644 (file)
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -535,7 +535,8 @@ isAllocated(const asiolink::IOAddress& prefix, const uint8_t prefix_len) const {
 ConstHostPtr
 AllocEngine::ClientContext6::currentHost() const {
     Subnet6Ptr subnet = host_subnet_ ? host_subnet_ : subnet_;
-    if (subnet && subnet->getReservationsInSubnet()) {
+    if (subnet && (subnet->getReservationsInSubnet() ||
+        subnet->getReservationsOutOfPool())) {
         auto host = hosts_.find(subnet->getID());
         if (host != hosts_.cend()) {
             return (host->second);
@@ -3242,7 +3243,8 @@ AllocEngine::ClientContext4::ClientContext4(const Subnet4Ptr& subnet,
 
 ConstHostPtr
 AllocEngine::ClientContext4::currentHost() const {
-    if (subnet_ && subnet_->getReservationsInSubnet()) {
+    if (subnet_ && (subnet_->getReservationsInSubnet() ||
+        subnet_->getReservationsOutOfPool())) {
         auto host = hosts_.find(subnet_->getID());
         if (host != hosts_.cend()) {
             return (host->second);
diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc
index d8e57a2c3b9375b3ebf2f29b719113e4782af5d3..7e641f8db31f34afa5a72d27753d65d55f883851 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.cc
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes on Fri Oct 23 2020 14:07
+// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes on Wed Nov 11 2020 19:52
 
 #include <cstddef>
 #include <log/message_types.h>
@@ -87,6 +87,7 @@ extern const isc::log::MessageID DHCPSRV_CQL_LEASE_EXCEPTION_THROWN = "DHCPSRV_C
 extern const isc::log::MessageID DHCPSRV_CQL_ROLLBACK = "DHCPSRV_CQL_ROLLBACK";
 extern const isc::log::MessageID DHCPSRV_CQL_UPDATE_ADDR4 = "DHCPSRV_CQL_UPDATE_ADDR4";
 extern const isc::log::MessageID DHCPSRV_CQL_UPDATE_ADDR6 = "DHCPSRV_CQL_UPDATE_ADDR6";
+extern const isc::log::MessageID DHCPSRV_DEPRECATED_RESERVATION_MODE = "DHCPSRV_DEPRECATED_RESERVATION_MODE";
 extern const isc::log::MessageID DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET = "DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET";
 extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION = "DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION";
 extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_HANDLER_NULL = "DHCPSRV_DHCP_DDNS_HANDLER_NULL";
@@ -336,6 +337,7 @@ const char* values[] = {
     "DHCPSRV_CQL_ROLLBACK", "rolling back Cassandra database.",
     "DHCPSRV_CQL_UPDATE_ADDR4", "updating IPv4 lease for address %1",
     "DHCPSRV_CQL_UPDATE_ADDR6", "updating IPv6 lease for address %1",
+    "DHCPSRV_DEPRECATED_RESERVATION_MODE", "deprecated reservation-mode parameter; use reservations-global, reservations-in-subnet and reservations-out-of-pool instead.",
     "DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET", "received bad DHCPv4o6 packet: %1",
     "DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION", "error handler for DHCP_DDNS IO generated an expected exception: %1",
     "DHCPSRV_DHCP_DDNS_HANDLER_NULL", "error handler for DHCP_DDNS IO is not set.",
diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.h b/src/lib/dhcpsrv/dhcpsrv_messages.h
index 656567cb4c7540129b1cff944a8dffc4d306bb40..03a524f2ff0aee274d750cc8293bf2508fb2c7bf 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.h
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes on Fri Oct 23 2020 14:07
+// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes on Wed Nov 11 2020 19:52
 
 #ifndef DHCPSRV_MESSAGES_H
 #define DHCPSRV_MESSAGES_H
@@ -88,6 +88,7 @@ extern const isc::log::MessageID DHCPSRV_CQL_LEASE_EXCEPTION_THROWN;
 extern const isc::log::MessageID DHCPSRV_CQL_ROLLBACK;
 extern const isc::log::MessageID DHCPSRV_CQL_UPDATE_ADDR4;
 extern const isc::log::MessageID DHCPSRV_CQL_UPDATE_ADDR6;
+extern const isc::log::MessageID DHCPSRV_DEPRECATED_RESERVATION_MODE;
 extern const isc::log::MessageID DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET;
 extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION;
 extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_HANDLER_NULL;
Mirror of https://github.com/isc-projects/kea.git