From: Francis Dupont Date: Thu, 3 Oct 2019 20:48:37 +0000 (+0200) Subject: [724-subnet-and-shared-network-default-and-inheritance-are-not-consistent] Removed... X-Git-Tag: Kea-1.7.4~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62d408dc0be4e9e197ae0cfd674522b62008fc8b;p=thirdparty%2Fkea.git [724-subnet-and-shared-network-default-and-inheritance-are-not-consistent] Removed other variables which can be handled by getProperty only --- diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index 577480b8e5..ec62c45c0c 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -5303,11 +5303,19 @@ TEST_F(Dhcp4ParserTest, hostReservationGlobal) { Subnet4Ptr subnet; subnet = subnets->selectSubnet(IOAddress("192.0.2.1")); ASSERT_TRUE(subnet); + // Reset the fetch global function to staging (vs current) config. + subnet->setFetchGlobalsFn([]() -> ConstElementPtr { + return (CfgMgr::instance().getStagingCfg()->getConfiguredGlobals()); + }); EXPECT_EQ(Network::HR_ALL, subnet->getHostReservationMode()); // Subnet 2 subnet = subnets->selectSubnet(IOAddress("192.0.3.1")); ASSERT_TRUE(subnet); + // Reset the fetch global function to staging (vs current) config. + subnet->setFetchGlobalsFn([]() -> ConstElementPtr { + return (CfgMgr::instance().getStagingCfg()->getConfiguredGlobals()); + }); EXPECT_EQ(Network::HR_OUT_OF_POOL, subnet->getHostReservationMode()); } diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc index d172803d18..0a576ba705 100644 --- a/src/bin/dhcp4/tests/get_config_unittest.cc +++ b/src/bin/dhcp4/tests/get_config_unittest.cc @@ -2278,7 +2278,6 @@ const char* UNPARSED_CONFIGS[] = { " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2366,7 +2365,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2460,7 +2458,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2550,7 +2547,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2575,7 +2571,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2600,7 +2595,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.4.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2625,7 +2619,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.5.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2715,7 +2708,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2740,7 +2732,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2765,7 +2756,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.4.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2790,7 +2780,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.5.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2880,7 +2869,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -2972,7 +2960,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"server-hostname\": \"foo\",\n" " \"subnet\": \"192.0.2.0/24\",\n" @@ -3065,7 +3052,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"server-hostname\": \"some-name.example.org\",\n" " \"subnet\": \"192.0.2.0/24\",\n" @@ -3156,7 +3142,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3246,7 +3231,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3337,7 +3321,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3363,7 +3346,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3454,7 +3436,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3479,7 +3460,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3570,7 +3550,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3596,7 +3575,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3687,7 +3665,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3712,7 +3689,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3806,7 +3782,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3900,7 +3875,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -3929,7 +3903,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -4019,7 +3992,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -4639,7 +4611,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -4746,7 +4717,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -4863,7 +4833,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -5106,7 +5075,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -5222,7 +5190,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -5321,7 +5288,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -5355,7 +5321,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -5462,7 +5427,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -5574,7 +5538,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -5681,7 +5644,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -5915,7 +5877,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6020,7 +5981,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6129,7 +6089,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6347,7 +6306,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6439,7 +6397,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6531,7 +6488,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6621,7 +6577,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ \"192.0.2.123\" ]\n" " },\n" " \"renew-timer\": 1,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6711,7 +6666,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ \"192.0.3.123\", \"192.0.3.124\" ]\n" " },\n" " \"renew-timer\": 1,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6802,7 +6756,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6828,7 +6781,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6854,7 +6806,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.4.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6879,7 +6830,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.5.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -6984,7 +6934,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.0.0/16\",\n" " \"t1-percent\": 0.5,\n" @@ -7074,7 +7023,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -7099,7 +7047,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [\n" " {\n" " \"boot-file-name\": \"\",\n" @@ -7179,7 +7126,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [\n" " {\n" " \"boot-file-name\": \"\",\n" @@ -7327,7 +7273,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [\n" " {\n" " \"boot-file-name\": \"\",\n" @@ -7512,7 +7457,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.5.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -7627,7 +7571,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"out-of-pool\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -7965,7 +7908,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -8055,7 +7997,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -8145,7 +8086,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -8235,7 +8175,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -8325,7 +8264,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -8441,7 +8379,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -8531,7 +8468,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -8622,7 +8558,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -8717,7 +8652,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -8812,7 +8746,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -9029,7 +8962,6 @@ const char* UNPARSED_CONFIGS[] = { " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"reservation-mode\": \"all\",\n" " \"subnet4\": [\n" " {\n" " \"comment\": \"A subnet\",\n" @@ -9049,7 +8981,6 @@ const char* UNPARSED_CONFIGS[] = { " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [\n" " {\n" " \"comment\": \"A host reservation\",\n" @@ -9221,7 +9152,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -9246,7 +9176,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.4.0/24\",\n" " \"t1-percent\": 0.5,\n" @@ -9323,7 +9252,6 @@ const char* UNPARSED_CONFIGS[] = { " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"reservation-mode\": \"all\",\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -9341,7 +9269,6 @@ const char* UNPARSED_CONFIGS[] = { " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.1.0/24\",\n" " \"t1-percent\": 0.45,\n" @@ -9364,7 +9291,6 @@ const char* UNPARSED_CONFIGS[] = { " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.2.0/24\",\n" " \"t1-percent\": 0.4,\n" @@ -9394,7 +9320,6 @@ const char* UNPARSED_CONFIGS[] = { " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"192.0.3.0/24\",\n" " \"t1-percent\": 0.5,\n" diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc index 46b326e9a2..850df5cd77 100644 --- a/src/bin/dhcp6/tests/get_config_unittest.cc +++ b/src/bin/dhcp6/tests/get_config_unittest.cc @@ -2085,7 +2085,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2180,7 +2179,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2205,7 +2203,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:2::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2230,7 +2227,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:3::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2255,7 +2251,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:4::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2350,7 +2345,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2375,7 +2369,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:2::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2400,7 +2393,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:3::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2425,7 +2417,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:4::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2520,7 +2511,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2545,7 +2535,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:2::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2570,7 +2559,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:3::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2595,7 +2583,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:4::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2698,7 +2685,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2794,7 +2780,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2890,7 +2875,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -2989,7 +2973,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -3018,7 +3001,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:2::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -3113,7 +3095,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -3210,7 +3191,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -3309,7 +3289,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -3423,7 +3402,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/40\",\n" " \"t1-percent\": 0.5,\n" @@ -3520,7 +3498,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -4026,7 +4003,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -4138,7 +4114,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -4260,7 +4235,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -4513,7 +4487,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -4617,7 +4590,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -4651,7 +4623,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:2::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -4799,7 +4770,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -4909,7 +4879,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5023,7 +4992,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5256,7 +5224,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ \"2001:db8:1::abcd\" ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5351,7 +5318,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ \"2001:db9::abcd\", \"2001:db9::abce\" ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5447,7 +5413,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5473,7 +5438,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:2::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5499,7 +5463,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:3::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5524,7 +5487,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:4::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5634,7 +5596,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8::/40\",\n" " \"t1-percent\": 0.5,\n" @@ -5752,7 +5713,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5847,7 +5807,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -5944,7 +5903,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -6041,7 +5999,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -6136,7 +6093,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -6156,7 +6112,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [\n" " {\n" " \"client-classes\": [ ],\n" @@ -6227,7 +6182,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [\n" " {\n" " \"client-classes\": [ ],\n" @@ -6361,7 +6315,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [\n" " {\n" " \"client-classes\": [ ],\n" @@ -6712,7 +6665,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:5::/48\",\n" " \"t1-percent\": 0.5,\n" @@ -6832,7 +6784,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"out-of-pool\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:2::/48\",\n" " \"t1-percent\": 0.5,\n" @@ -7278,7 +7229,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -7373,7 +7323,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8::/32\",\n" " \"t1-percent\": 0.5,\n" @@ -7469,7 +7418,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8::/32\",\n" " \"t1-percent\": 0.5,\n" @@ -7570,7 +7518,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8::/32\",\n" " \"t1-percent\": 0.5,\n" @@ -7671,7 +7618,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8::/32\",\n" " \"t1-percent\": 0.5,\n" @@ -7768,7 +7714,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8::/32\",\n" " \"t1-percent\": 0.5,\n" @@ -7866,7 +7811,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8::/32\",\n" " \"t1-percent\": 0.5,\n" @@ -7969,7 +7913,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8::/32\",\n" " \"t1-percent\": 0.5,\n" @@ -8186,7 +8129,6 @@ const char* UNPARSED_CONFIGS[] = { " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"reservation-mode\": \"all\",\n" " \"subnet6\": [\n" " {\n" " \"comment\": \"A subnet\",\n" @@ -8213,7 +8155,6 @@ const char* UNPARSED_CONFIGS[] = { " \"relay\": {\n" " \"ip-addresses\": [ ]\n" " },\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [\n" " {\n" " \"comment\": \"A host reservation\",\n" @@ -8386,7 +8327,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:1::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -8406,7 +8346,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:2::/64\",\n" " \"t1-percent\": 0.5,\n" @@ -8426,7 +8365,6 @@ const char* UNPARSED_CONFIGS[] = { " \"ip-addresses\": [ ]\n" " },\n" " \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" " \"reservations\": [ ],\n" " \"subnet\": \"2001:db8:3::/64\",\n" " \"t1-percent\": 0.5,\n" diff --git a/src/lib/dhcpsrv/parsers/simple_parser4.cc b/src/lib/dhcpsrv/parsers/simple_parser4.cc index a5e888e3a5..8046306976 100644 --- a/src/lib/dhcpsrv/parsers/simple_parser4.cc +++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc @@ -254,12 +254,9 @@ const SimpleDefaults SimpleParser4::SHARED_SUBNET4_DEFAULTS = { /// This list is also used for inheriting from global to shared networks /// and from shared networks to subnets within it. const ParamsList SimpleParser4::INHERIT_TO_SUBNET4 = { - "client-class", - "interface", "rebind-timer", "relay", "renew-timer", - "reservation-mode", "valid-lifetime", "min-valid-lifetime", "max-valid-lifetime", diff --git a/src/lib/dhcpsrv/parsers/simple_parser6.cc b/src/lib/dhcpsrv/parsers/simple_parser6.cc index 26b6526f62..07fc69d887 100644 --- a/src/lib/dhcpsrv/parsers/simple_parser6.cc +++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc @@ -235,15 +235,12 @@ const SimpleDefaults SimpleParser6::SHARED_NETWORK6_DEFAULTS = { /// This list is also used for inheriting from global to shared networks /// and from shared networks to subnets within it. const ParamsList SimpleParser6::INHERIT_TO_SUBNET6 = { - "client-class", - "interface", "preferred-lifetime", "min-preferred-lifetime", "max-preferred-lifetime", "rebind-timer", "relay", "renew-timer", - "reservation-mode", "valid-lifetime", "min-valid-lifetime", "max-valid-lifetime",