From: Tomek Mrugalski Date: Fri, 8 Sep 2017 21:43:42 +0000 (+0200) Subject: [5357] get-config unit-tests regenerated. X-Git-Tag: trac5073a_base~9^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=270aa877bd8135625f23c51446621454beec2228;p=thirdparty%2Fkea.git [5357] get-config unit-tests regenerated. --- diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc index 6446fab2c3..d51f51c244 100644 --- a/src/bin/dhcp4/tests/get_config_unittest.cc +++ b/src/bin/dhcp4/tests/get_config_unittest.cc @@ -12,11 +12,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include @@ -1592,6 +1592,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 1 @@ -1634,6 +1635,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -1701,6 +1703,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -1768,6 +1771,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -1835,6 +1839,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -1974,6 +1979,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2113,6 +2119,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2180,6 +2187,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2247,6 +2255,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2314,6 +2323,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2381,6 +2391,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2448,6 +2459,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2539,6 +2551,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2630,6 +2643,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2697,6 +2711,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2796,6 +2811,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -2873,6 +2889,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"ipv4-address\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 17 @@ -2925,6 +2942,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"record\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 18 @@ -2986,6 +3004,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"ipv4-address\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 19 @@ -3038,6 +3057,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"uint32\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 20 @@ -3090,6 +3110,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"uint32\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 21 @@ -3142,6 +3163,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"string\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 22 @@ -3194,6 +3216,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"string\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 23 @@ -3253,6 +3276,7 @@ const char* UNPARSED_CONFIGS[] = { " }\n" " ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -3320,6 +3344,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -3431,6 +3456,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"uint32\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -3534,6 +3560,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"ipv4-address\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 27 @@ -3629,6 +3656,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"ipv4-address\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -3705,6 +3733,7 @@ const char* UNPARSED_CONFIGS[] = { " }\n" " ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -3789,6 +3818,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -3898,6 +3928,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -3982,6 +4013,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -4107,6 +4139,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"ipv4-address\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 33 @@ -4193,6 +4226,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"ipv4-address\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -4275,6 +4309,7 @@ const char* UNPARSED_CONFIGS[] = { " }\n" " ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -4361,6 +4396,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"string\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -4428,6 +4464,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 37 @@ -4470,6 +4507,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 38 @@ -4512,6 +4550,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -4579,6 +4618,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -4646,6 +4686,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -4874,6 +4915,7 @@ const char* UNPARSED_CONFIGS[] = { " \"type\": \"uint32\"\n" " }\n" " ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -4961,6 +5003,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -5100,6 +5143,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 44 @@ -5142,6 +5186,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 45 @@ -5184,6 +5229,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 46 @@ -5226,6 +5272,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [ ]\n" " }\n", // CONFIGURATION 47 @@ -5268,6 +5315,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -5335,6 +5383,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -5402,6 +5451,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"ethX\",\n" @@ -5469,6 +5519,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"ethX\",\n" @@ -5536,6 +5587,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -5626,6 +5678,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -5693,6 +5746,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -5760,6 +5814,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -5828,6 +5883,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -5900,6 +5956,7 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " \"option-data\": [ ],\n" " \"option-def\": [ ],\n" +" \"shared-networks\": [ ],\n" " \"subnet4\": [\n" " {\n" " \"4o6-interface\": \"\",\n" @@ -6135,7 +6192,6 @@ public: }; /// Test a configuration - TEST_P(Dhcp4GetConfigTest, run) { // configurations have not been extracted yet if (max_config_counter == 0) { @@ -6200,14 +6256,8 @@ TEST_P(Dhcp4GetConfigTest, run) { EXPECT_TRUE(isEquivalent(unparsed, unparsed2)); } -#if 0 -// This test is temporarily disabled. The shared subnets structures have been -// implemented (#5305), but the parsers are not there yet, so grammar will fail -// when parseDHCP4 is called. That's comping up in #5357. - /// Define the parameterized test loop INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest, ::testing::Range(static_cast(0), max_config_counter)); -#endif }; diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc index b21eae5514..dae152ebc2 100644 --- a/src/bin/dhcp6/tests/get_config_unittest.cc +++ b/src/bin/dhcp6/tests/get_config_unittest.cc @@ -11,12 +11,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include @@ -65,7 +65,6 @@ namespace { ///@{ /// @brief extracted configurations const char* EXTRACTED_CONFIGS[] = { -/// put this after const char* EXTRACTED_CONFIGS[] = { // CONFIGURATION 0 "{\n" " \"interfaces-config\": {\n" @@ -1514,6 +1513,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 1 @@ -1565,6 +1565,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -1639,6 +1640,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -1779,6 +1781,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1024,\n" @@ -1919,6 +1922,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2059,6 +2063,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2133,6 +2138,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2208,6 +2214,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2283,6 +2290,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2387,6 +2395,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2461,6 +2470,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2537,6 +2547,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2615,6 +2626,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2708,6 +2720,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -2794,6 +2807,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 15 @@ -2855,6 +2869,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 16 @@ -2925,6 +2940,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 17 @@ -2986,6 +3002,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 18 @@ -3047,6 +3064,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 19 @@ -3115,6 +3133,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -3189,6 +3208,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -3307,6 +3327,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -3417,6 +3438,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 23 @@ -3521,6 +3543,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -3595,6 +3618,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -3709,6 +3733,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -3851,6 +3876,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -3944,6 +3970,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -4018,6 +4045,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 29 @@ -4069,6 +4097,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 30 @@ -4120,6 +4149,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -4194,6 +4224,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"client-class\": \"alpha\",\n" @@ -4337,6 +4368,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -4411,6 +4443,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 123,\n" @@ -4614,6 +4647,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 234,\n" @@ -4701,6 +4735,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 36 @@ -4752,6 +4787,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 37 @@ -4803,6 +4839,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -4943,6 +4980,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 39 @@ -4994,6 +5032,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 40 @@ -5045,6 +5084,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 41 @@ -5096,6 +5136,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 42 @@ -5147,6 +5188,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [ ]\n" " }\n", // CONFIGURATION 43 @@ -5212,6 +5254,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -5286,6 +5329,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -5360,6 +5404,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -5435,6 +5480,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -5515,6 +5561,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -5595,6 +5642,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -5671,6 +5719,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -5748,6 +5797,7 @@ const char* UNPARSED_CONFIGS[] = { " \"time\": 0,\n" " \"type\": \"LLT\"\n" " },\n" +" \"shared-networks\": [ ],\n" " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" @@ -6051,14 +6101,8 @@ TEST_P(Dhcp6GetConfigTest, run) { EXPECT_TRUE(isEquivalent(unparsed, unparsed2)); } -#if 0 -// This test is temporarily disabled. The shared subnets structures have been -// implemented (#5305), but the parsers are not there yet, so grammar will fail -// when parseDHCP4 is called. That's comping up in #5357. - /// Define the parameterized test loop INSTANTIATE_TEST_CASE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest, ::testing::Range(static_cast(0), max_config_counter)); -#endif };