From: Tomek Mrugalski Date: Thu, 10 Aug 2017 13:38:14 +0000 (+0200) Subject: [5314] Regenerated get_config unit-tests in dhcp4 and dhcp6 X-Git-Tag: trac5124a_base~9^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac93de29231178e9e1ca56bd25d4a6790188fb3e;p=thirdparty%2Fkea.git [5314] Regenerated get_config unit-tests in dhcp4 and dhcp6 --- diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc index c66cdbf2ca..c4769149f1 100644 --- a/src/bin/dhcp4/tests/get_config_unittest.cc +++ b/src/bin/dhcp4/tests/get_config_unittest.cc @@ -1640,7 +1640,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -1708,7 +1707,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -1776,7 +1774,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -1844,7 +1841,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -1869,7 +1865,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -1894,7 +1889,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 3,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -1919,7 +1913,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 4,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -1987,7 +1980,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1024,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2012,7 +2004,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 100,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2037,7 +2028,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2062,7 +2052,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 34,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2130,7 +2119,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"1.2.3.4\",\n" " \"option-data\": [ ],\n" @@ -2198,7 +2186,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"1.2.3.4\",\n" " \"option-data\": [ ],\n" @@ -2266,7 +2253,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"1.2.3.4\",\n" " \"option-data\": [ ],\n" @@ -2334,7 +2320,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2402,7 +2387,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2470,7 +2454,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2495,7 +2478,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" " \"match-client-id\": false,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2563,7 +2545,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": false,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2588,7 +2569,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2656,7 +2636,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2724,7 +2703,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2753,7 +2731,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -2825,7 +2802,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -3281,7 +3257,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -3349,7 +3324,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [\n" @@ -3457,7 +3431,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -3651,7 +3624,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -3727,7 +3699,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [\n" @@ -3810,7 +3781,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [\n" @@ -3843,7 +3813,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [\n" @@ -3919,7 +3888,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4002,7 +3970,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4207,7 +4174,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4288,7 +4254,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4374,7 +4339,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4526,7 +4490,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4594,7 +4557,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4662,7 +4624,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 123,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4687,7 +4648,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 234,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4763,7 +4723,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 542,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4887,7 +4846,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 234,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4974,7 +4932,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -4999,7 +4956,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5024,7 +4980,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 3,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5049,7 +5004,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 4,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5285,7 +5239,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5353,7 +5306,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"2001:db8::123/45\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5421,7 +5373,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5489,7 +5440,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"2001:db8::543/21\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5557,7 +5507,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"vlan123\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5648,7 +5597,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5716,7 +5664,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5784,7 +5731,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5853,7 +5799,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" @@ -5926,7 +5871,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-interface-id\": \"\",\n" " \"4o6-subnet\": \"\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" " \"option-data\": [ ],\n" diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc index 38dc406b5e..3eb6a96e86 100644 --- a/src/bin/dhcp6/tests/get_config_unittest.cc +++ b/src/bin/dhcp6/tests/get_config_unittest.cc @@ -1567,8 +1567,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1643,8 +1641,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1667,8 +1663,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1691,8 +1685,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 3,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1715,8 +1707,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 4,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1791,8 +1781,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1024,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1815,8 +1803,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 100,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1839,8 +1825,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1863,8 +1847,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 34,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1939,8 +1921,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1963,8 +1943,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -1987,8 +1965,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 3,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -2011,8 +1987,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 4,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -2087,8 +2061,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -2164,7 +2136,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"id\": 1,\n" " \"interface\": \"eth0\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -2239,7 +2210,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" " \"interface-id\": \"foobar\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2315,8 +2285,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -2343,8 +2311,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -2423,8 +2389,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -2499,14 +2463,10 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 128,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [ ],\n" " \"prefix\": \"2001:db8:1::\",\n" " \"prefix-len\": 64\n" @@ -2579,8 +2539,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" " {\n" @@ -2659,30 +2617,22 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 80,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [ ],\n" " \"prefix\": \"2001:db8:1:1::\",\n" " \"prefix-len\": 72\n" " },\n" " {\n" " \"delegated-len\": 88,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [ ],\n" " \"prefix\": \"2001:db8:1:2::\",\n" " \"prefix-len\": 72\n" " },\n" " {\n" " \"delegated-len\": 96,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [ ],\n" " \"prefix\": \"3000:1:3::\",\n" " \"prefix-len\": 72\n" @@ -2760,14 +2710,10 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [ ],\n" " \"prefix\": \"2001:db8:1::\",\n" " \"prefix-len\": 64\n" @@ -3169,8 +3115,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -3245,8 +3189,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [\n" " {\n" " \"code\": 38,\n" @@ -3361,8 +3303,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -3572,8 +3512,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -3648,8 +3586,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [\n" " {\n" " \"code\": 38,\n" @@ -3680,8 +3616,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [\n" " {\n" " \"code\": 15,\n" @@ -3764,14 +3698,10 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [\n" " {\n" " \"code\": 38,\n" @@ -3786,8 +3716,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"delegated-len\": 64,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [\n" " {\n" " \"code\": 15,\n" @@ -3906,8 +3834,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4000,8 +3926,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4178,8 +4102,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4255,8 +4177,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"client-class\": \"alpha\",\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4280,8 +4200,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"client-class\": \"beta\",\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4305,8 +4223,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"client-class\": \"gamma\",\n" " \"id\": 3,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4329,8 +4245,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 4,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4405,8 +4319,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4481,8 +4393,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 123,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4505,8 +4415,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 234,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [ ],\n" @@ -4571,8 +4479,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 542,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [ ],\n" @@ -4684,8 +4590,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 234,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [ ],\n" @@ -4874,8 +4778,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4898,8 +4800,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 2,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4922,8 +4822,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 3,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -4946,8 +4844,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"id\": 4,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -5291,8 +5187,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -5367,8 +5261,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -5443,8 +5335,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -5520,8 +5410,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -5602,8 +5490,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" " \"pools\": [\n" @@ -5684,14 +5570,10 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [ ],\n" " \"prefix\": \"2001:db8::\",\n" " \"prefix-len\": 56\n" @@ -5764,14 +5646,10 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [ ],\n" " \"prefix\": \"2001:db8::\",\n" " \"prefix-len\": 56,\n" @@ -5845,14 +5723,10 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"id\": 1,\n" -" \"interface\": \"\",\n" -" \"interface-id\": \"\",\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" " {\n" " \"delegated-len\": 64,\n" -" \"excluded-prefix\": \"::\",\n" -" \"excluded-prefix-len\": 0,\n" " \"option-data\": [ ],\n" " \"prefix\": \"2001:db8::\",\n" " \"prefix-len\": 56,\n"