[#490,!284] Regenerated parser tests.

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index a6c7dbc7540deda49ab84781b2563ed958b200be..f3f32e04544119f906717e9acf455db9af641930 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -546,7 +546,6 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
                  (config_pair.first == "decline-probation-period") ||
                  (config_pair.first == "dhcp4o6-port") ||
                  (config_pair.first == "echo-client-id") ||
-                 (config_pair.first == "user-context") ||
                  (config_pair.first == "match-client-id") ||
                  (config_pair.first == "authoritative") ||
                  (config_pair.first == "next-server") ||
@@ -561,6 +560,12 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
                 CfgMgr::instance().getStagingCfg()->addConfiguredGlobal(config_pair.first,
                                                                         config_pair.second);
                 continue;
+
+            }
+
+            // Nothing to configure for the user-context.
+            if (config_pair.first == "user-context") {
+                continue;
             }
 
             // If we got here, no code handled this parameter, so we bail out.

diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc
index ca0f38d1a29a4faab924720eddccf9694fbba8c3..912910e518da51b670ce2cec9ef8697e877de605 100644 (file)
--- a/src/bin/dhcp4/tests/get_config_unittest.cc
+++ b/src/bin/dhcp4/tests/get_config_unittest.cc
@@ -2057,6 +2057,9 @@ const char* EXTRACTED_CONFIGS[] = {
 const char* UNPARSED_CONFIGS[] = {
     // CONFIGURATION 0
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -2099,19 +2102,29 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 1
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -2154,12 +2167,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2190,10 +2208,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 2
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -2236,12 +2259,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2272,10 +2300,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 3
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -2318,13 +2351,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2356,10 +2394,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 4
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -2402,13 +2445,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2524,10 +2572,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 5
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -2570,13 +2623,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2692,11 +2750,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 6
 "{\n"
+"        \"authoritative\": false,\n"
 "        \"boot-file-name\": \"bar\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -2739,15 +2801,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
 "        \"next-server\": \"1.2.3.4\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
 "        \"server-hostname\": \"foo\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2781,10 +2846,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 7
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -2827,13 +2897,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2867,11 +2942,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 8
 "{\n"
+"        \"authoritative\": false,\n"
 "        \"boot-file-name\": \"nofile\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -2914,15 +2993,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
 "        \"next-server\": \"192.0.0.1\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
 "        \"server-hostname\": \"nohost\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2956,10 +3038,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 9
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3002,13 +3089,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3040,10 +3132,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 10
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3086,13 +3183,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3124,10 +3226,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 11
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3170,13 +3277,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3236,10 +3348,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 12
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3283,13 +3400,17 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3349,10 +3470,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 13
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3395,13 +3521,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3461,11 +3592,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 14
 "{\n"
 "        \"authoritative\": true,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3508,13 +3643,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3574,10 +3714,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 15
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3620,13 +3765,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3658,10 +3808,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 16
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3704,13 +3859,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3778,10 +3938,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 17
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3824,13 +3989,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3862,10 +4032,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 18
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3908,6 +4083,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -3920,14 +4097,23 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 19
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -3970,6 +4156,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -3982,14 +4170,23 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"record\"\n"
 "            }\n"
 "        ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 20
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4032,6 +4229,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -4053,14 +4252,23 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 21
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4103,6 +4311,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -4115,14 +4325,23 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"uint32\"\n"
 "            }\n"
 "        ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 22
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4165,6 +4384,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -4177,14 +4398,23 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"uint32\"\n"
 "            }\n"
 "        ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 23
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4227,6 +4457,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -4239,14 +4471,23 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"string\"\n"
 "            }\n"
 "        ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 24
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4289,6 +4530,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -4301,14 +4544,23 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"string\"\n"
 "            }\n"
 "        ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 25
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4351,6 +4603,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -4372,9 +4626,12 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -4406,10 +4663,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 26
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4452,13 +4714,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -4507,10 +4774,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 27
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4553,6 +4825,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -4584,9 +4858,12 @@ const char* UNPARSED_CONFIGS[] = {
 "        ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -4618,10 +4895,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 28
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4664,6 +4946,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -4704,15 +4988,23 @@ const char* UNPARSED_CONFIGS[] = {
 "        ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 29
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4755,6 +5047,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -4812,9 +5106,12 @@ const char* UNPARSED_CONFIGS[] = {
 "        ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -4846,10 +5143,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 3000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 3000\n"
 "    }\n",
     // CONFIGURATION 30
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -4892,6 +5194,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -4905,9 +5209,12 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -4956,10 +5263,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 31
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5002,13 +5314,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5086,10 +5403,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 32
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5132,13 +5454,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5187,10 +5514,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 33
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5233,13 +5565,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5293,10 +5630,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 34
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5339,6 +5681,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -5360,9 +5704,12 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5394,10 +5741,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 35
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5440,6 +5792,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -5480,15 +5834,23 @@ const char* UNPARSED_CONFIGS[] = {
 "        ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 36
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5531,6 +5893,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -5579,9 +5943,12 @@ const char* UNPARSED_CONFIGS[] = {
 "        ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5613,10 +5980,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 3000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 3000\n"
 "    }\n",
     // CONFIGURATION 37
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5659,6 +6031,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -5678,9 +6052,12 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5712,10 +6089,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 38
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5758,6 +6140,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -5781,9 +6165,12 @@ const char* UNPARSED_CONFIGS[] = {
 "        ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5815,10 +6202,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 39
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5861,19 +6253,29 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 40
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -5916,19 +6318,29 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 41
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": true,\n"
@@ -5971,13 +6383,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6009,10 +6426,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 42
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -6055,13 +6477,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6093,10 +6520,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 43
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -6139,13 +6571,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6177,10 +6614,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 44
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -6223,13 +6665,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6348,10 +6795,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 45
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -6394,13 +6846,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6447,10 +6904,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 46
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -6493,13 +6955,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6690,10 +7157,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 47
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -6736,6 +7208,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -6750,9 +7224,12 @@ const char* UNPARSED_CONFIGS[] = {
 "        ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6804,10 +7281,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 48
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -6850,13 +7332,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6972,10 +7459,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 49
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7018,6 +7510,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
@@ -7026,6 +7520,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7085,10 +7581,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 50
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7131,16 +7632,27 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 51
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7183,16 +7695,27 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 52
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 12345,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7235,16 +7758,27 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 53
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7287,16 +7821,27 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 54
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7339,13 +7884,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7377,10 +7927,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 55
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7423,13 +7978,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7461,10 +8021,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 56
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7507,13 +8072,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7545,10 +8115,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 57
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7591,13 +8166,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7629,10 +8209,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 58
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7675,13 +8260,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7713,10 +8303,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 59
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"client-classes\": [\n"
 "            {\n"
 "                \"boot-file-name\": \"\",\n"
@@ -7785,13 +8380,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7823,10 +8423,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 60
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7869,13 +8474,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7907,10 +8517,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 61
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -7953,13 +8568,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7992,10 +8612,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 62
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -8038,13 +8663,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8081,10 +8711,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 63
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -8127,13 +8762,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8170,10 +8810,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 64
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -8230,20 +8875,30 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 65
 "{\n"
 "        \"comment\": \"A DHCPv4 server\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"client-classes\": [\n"
 "            {\n"
 "                \"comment\": \"match all\",\n"
@@ -8325,6 +8980,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"comment\": \"Set option value\",\n"
@@ -8348,9 +9005,12 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [\n"
 "            {\n"
 "                \"comment\": \"A shared network\",\n"
@@ -8420,10 +9080,16 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 7200\n"
 "            }\n"
 "        ],\n"
-"        \"subnet4\": [ ]\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 66
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -8466,10 +9132,13 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"reservations\": [\n"
 "            {\n"
 "                \"boot-file-name\": \"\",\n"
@@ -8528,6 +9197,8 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8587,10 +9258,15 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 67
 "{\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
@@ -8633,11 +9309,16 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
+"        \"match-client-id\": true,\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [\n"
 "            {\n"
 "                \"authoritative\": false,\n"
@@ -8737,6 +9418,8 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n"
 };

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 645f5c0f270ddc7ace701e020a86c1b501251906..2f9a07c9609b193f0cae5618433c2535fed4919b 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -670,7 +670,6 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
                  (config_pair.first == "valid-lifetime") ||
                  (config_pair.first == "decline-probation-period") ||
                  (config_pair.first == "dhcp4o6-port") ||
-                 (config_pair.first == "user-context") ||
                  (config_pair.first == "server-tag") ||
                  (config_pair.first == "reservation-mode")) {
                 CfgMgr::instance().getStagingCfg()->addConfiguredGlobal(config_pair.first,
@@ -678,6 +677,11 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
                 continue;
             }
 
+            // Nothing to configure for the user-context.
+            if (config_pair.first == "user-context") {
+                continue;
+            }
+
             if (config_pair.first == "relay-supplied-options") {
                 RSOOListConfigParser parser;
                 parser.parse(srv_config, config_pair.second);

diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc
index 8d45fd2d962588ae48b0cc7c65fa17838d518e0e..308374b47a51b9392fc90abae3a3b5f29cef4c9d 100644 (file)
--- a/src/bin/dhcp6/tests/get_config_unittest.cc
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc
@@ -1884,6 +1884,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -1895,6 +1896,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [ ],\n"
 "        \"valid-lifetime\": 4000\n"
@@ -1949,6 +1951,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -1960,6 +1963,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2037,6 +2041,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -2048,6 +2053,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2191,6 +2197,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -2202,6 +2209,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2345,6 +2353,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -2356,6 +2365,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2499,6 +2509,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -2510,6 +2521,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2587,6 +2599,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -2598,6 +2611,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2676,6 +2690,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -2687,6 +2702,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2765,6 +2781,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -2776,6 +2793,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2883,6 +2901,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -2894,6 +2913,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2971,6 +2991,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -2982,6 +3003,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3008,7 +3030,8 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"subnet\": \"2001:db8:1::/64\",\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
-"        ]\n"
+"        ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 11
 "{\n"
@@ -3060,6 +3083,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3071,6 +3095,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3099,7 +3124,8 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"subnet\": \"2001:db8:1::/64\",\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
-"        ]\n"
+"        ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 12
 "{\n"
@@ -3151,6 +3177,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3162,6 +3189,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3205,7 +3233,8 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"subnet\": \"2001:db8:1::/40\",\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
-"        ]\n"
+"        ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 13
 "{\n"
@@ -3257,6 +3286,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3268,6 +3298,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3294,7 +3325,8 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"subnet\": \"2001:db8:1::/64\",\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
-"        ]\n"
+"        ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 14
 "{\n"
@@ -3352,7 +3384,11 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"ipv6-address\"\n"
 "            }\n"
 "        ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3364,8 +3400,10 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 15
 "{\n"
@@ -3423,7 +3461,11 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"record\"\n"
 "            }\n"
 "        ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3435,8 +3477,10 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 16
 "{\n"
@@ -3503,7 +3547,11 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3515,8 +3563,10 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 17
 "{\n"
@@ -3574,7 +3624,11 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"uint32\"\n"
 "            }\n"
 "        ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3586,8 +3640,10 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 18
 "{\n"
@@ -3645,7 +3701,11 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"uint32\"\n"
 "            }\n"
 "        ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3657,8 +3717,10 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 19
 "{\n"
@@ -3727,6 +3789,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3738,6 +3801,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3815,6 +3879,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3826,6 +3891,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3947,6 +4013,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -3958,6 +4025,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4071,6 +4139,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4082,6 +4151,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [ ],\n"
 "        \"valid-lifetime\": 4000\n"
@@ -4189,6 +4259,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4200,6 +4271,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4277,6 +4349,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4288,6 +4361,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4405,6 +4479,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4416,6 +4491,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4561,6 +4637,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4572,6 +4649,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4668,6 +4746,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4679,6 +4758,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4756,6 +4836,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4767,6 +4848,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [ ],\n"
 "        \"valid-lifetime\": 4000\n"
@@ -4821,6 +4903,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4832,6 +4915,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [ ],\n"
 "        \"valid-lifetime\": 4000\n"
@@ -4886,6 +4970,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4897,6 +4982,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4974,6 +5060,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -4985,6 +5072,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5062,6 +5150,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -5073,6 +5162,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5219,6 +5309,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -5230,6 +5321,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5322,6 +5414,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -5333,6 +5426,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5433,6 +5527,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -5444,6 +5539,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5521,6 +5617,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -5532,6 +5629,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5738,6 +5836,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -5749,6 +5848,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5839,6 +5939,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -5850,6 +5951,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [ ],\n"
 "        \"valid-lifetime\": 4000\n"
@@ -5904,6 +6006,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -5915,6 +6018,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [ ],\n"
 "        \"valid-lifetime\": 4000\n"
@@ -5969,6 +6073,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -5980,6 +6085,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6157,6 +6263,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6256,6 +6363,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"23\", \"37\", \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6267,6 +6375,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [ ],\n"
 "        \"valid-lifetime\": 4000\n"
@@ -6317,7 +6426,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"mac-sources\": [ \"any\" ],\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6329,8 +6442,10 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 44
 "{\n"
@@ -6378,7 +6493,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"mac-sources\": [ \"any\" ],\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6390,8 +6509,10 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 45
 "{\n"
@@ -6439,7 +6560,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"mac-sources\": [ \"any\" ],\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6451,8 +6576,10 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 46
 "{\n"
@@ -6500,7 +6627,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"mac-sources\": [ \"any\" ],\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6512,8 +6643,10 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 47
 "{\n"
@@ -6579,6 +6712,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6590,6 +6724,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6667,6 +6802,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6678,6 +6814,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6755,6 +6892,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6766,6 +6904,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6844,6 +6983,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6855,6 +6995,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6938,6 +7079,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -6949,6 +7091,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7032,6 +7175,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -7043,6 +7187,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7122,6 +7267,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -7133,6 +7279,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7213,6 +7360,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -7224,6 +7372,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7323,6 +7472,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -7334,6 +7484,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [ ],\n"
 "        \"valid-lifetime\": 4000\n"
@@ -7433,7 +7584,11 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"type\": \"ipv6-address\"\n"
 "            }\n"
 "        ],\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"rebind-timer\": 1800,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"renew-timer\": 900,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
@@ -7446,6 +7601,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LL\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [\n"
 "            {\n"
 "                \"comment\": \"A shared network\",\n"
@@ -7516,7 +7672,8 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 7200\n"
 "            }\n"
 "        ],\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet6\": [ ],\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
     // CONFIGURATION 57
 "{\n"
@@ -7568,6 +7725,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"rebind-timer\": 2000,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
+"        \"reservation-mode\": \"all\",\n"
 "        \"reservations\": [\n"
 "            {\n"
 "                \"client-classes\": [ ],\n"
@@ -7631,6 +7789,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"time\": 0,\n"
 "            \"type\": \"LLT\"\n"
 "        },\n"
+"        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7691,6 +7850,9 @@ const char* UNPARSED_CONFIGS[] = {
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
+"        \"preferred-lifetime\": 3600,\n"
+"        \"reservation-mode\": \"all\",\n"
+"        \"server-tag\": \"\",\n"
 "    }\n"
 };