]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[575-cb-cmds-unknown-fields-in-arguments-should-raise-an-error] Added metadata and...
authorFrancis Dupont <fdupont@isc.org>
Sun, 9 Jun 2019 19:09:09 +0000 (21:09 +0200)
committerFrancis Dupont <fdupont@isc.org>
Sun, 7 Jul 2019 09:07:09 +0000 (11:07 +0200)
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
src/lib/dhcpsrv/parsers/dhcp_parsers.cc
src/lib/dhcpsrv/parsers/option_data_parser.cc
src/lib/dhcpsrv/parsers/shared_network_parser.cc

index 27ce7bf1dbaa7ae9a55bc55983531b38d1b69d68..78a04cdc079f7619b1016c4a4df79d7e925c5895 100644 (file)
@@ -724,7 +724,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configSet) {
         "               {\"subnet\": \"192.2.1.0/24\", \n"
         "                \"pools\": [{ \"pool\": \"192.2.1.1-192.2.1.50\" }]}\n";
     string bad_subnet =
-        "               {\"BOGUS\": \"192.2.2.0/24\", \n"
+        "               {\"comment\": \"192.2.2.0/24\", \n"
         "                \"pools\": [{ \"pool\": \"192.2.2.1-192.2.2.50\" }]}\n";
     string subnet_footer =
         "          ] \n";
@@ -923,7 +923,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configTest) {
         "               {\"subnet\": \"192.2.1.0/24\", \n"
         "                \"pools\": [{ \"pool\": \"192.2.1.1-192.2.1.50\" }]}\n";
     string bad_subnet =
-        "               {\"BOGUS\": \"192.2.2.0/24\", \n"
+        "               {\"comment\": \"192.2.2.0/24\", \n"
         "                \"pools\": [{ \"pool\": \"192.2.2.1-192.2.2.50\" }]}\n";
     string subnet_footer =
         "          ] \n";
index 3162406ea254e3bfe2de7e35ec01accdadfd1bb4..7b1eb0e0ae77e946370907567b7ea141d89ab273 100644 (file)
@@ -500,7 +500,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configSet) {
         "               {\"subnet\": \"3003::/64\", \n"
         "                \"pools\": [{ \"pool\": \"3003::100-3003::200\" }]}\n";
     string bad_subnet =
-        "               {\"BOGUS\": \"3005::/64\", \n"
+        "               {\"comment\": \"3005::/64\", \n"
         "                \"pools\": [{ \"pool\": \"3005::100-3005::200\" }]}\n";
     string subnet_footer =
         "          ] \n";
@@ -645,7 +645,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configTest) {
         "               {\"subnet\": \"3003::/64\", \n"
         "                \"pools\": [{ \"pool\": \"3003::100-3003::200\" }]}\n";
     string bad_subnet =
-        "               {\"BOGUS\": \"3005::/64\", \n"
+        "               {\"comment\": \"3005::/64\", \n"
         "                \"pools\": [{ \"pool\": \"3005::100-3005::200\" }]}\n";
     string subnet_footer =
         "          ] \n";
index 3d022f774cca0ab6aa64f26a0b17b59a0a7a2f9b..303e4e6861bd922c2289eaad4930aa21d7c4ced2 100644 (file)
@@ -122,7 +122,8 @@ OptionDefParser::OPTION_DEF_PARAMETERS = {
     { "encapsulate",  Element::string },
     { "array",        Element::boolean, },
     { "user-context", Element::map },
-    { "comment",      Element::string }
+    { "comment",      Element::string },
+    { "metadata",     Element::map }
 };
 
 OptionDefParser::OptionDefParser(const uint16_t address_family)
@@ -387,7 +388,8 @@ PoolParser::POOL_PARAMETERS = {
     { "client-class",           Element::string },
     { "require-client-classes", Element::list },
     { "user-context",           Element::map },
-    { "comment",                Element::string }
+    { "comment",                Element::string },
+    { "metadata",               Element::map }
 };
 
 void
@@ -716,7 +718,8 @@ Subnet4ConfigParser::SUBNET4_PARAMETERS = {
     { "comment",                Element::string },
     { "calculate-tee-times",    Element::boolean },
     { "t1-percent",             Element::real },
-    { "t2-percent",             Element::real }
+    { "t2-percent",             Element::real },
+    { "metadata",               Element::map }
 };
 
 Subnet4ConfigParser::Subnet4ConfigParser()
@@ -1061,7 +1064,8 @@ PdPoolParser::PD_POOL_PARAMETERS = {
     { "excluded-prefix",        Element::string },
     { "excluded-prefix-len",    Element::integer },
     { "user-context",           Element::map },
-    { "comment",                Element::string }
+    { "comment",                Element::string },
+    { "metadata",               Element::map }
 };
 
 PdPoolParser::PdPoolParser() : options_(new CfgOption()) {
@@ -1188,7 +1192,8 @@ Subnet6ConfigParser::SUBNET6_PARAMETERS = {
     { "comment",                Element::string },
     { "calculate-tee-times",    Element::boolean },
     { "t1-percent",             Element::real },
-    { "t2-percent",             Element::real }
+    { "t2-percent",             Element::real },
+    { "metadata",               Element::map }
 };
 
 Subnet6ConfigParser::Subnet6ConfigParser()
index 6a55fdc8fcc8a0cf7f7cfaa76b21707b629150b4..4e430e438f706023b02769329ee5152487397911 100644 (file)
@@ -36,7 +36,8 @@ OptionDataParser::OPTION_PARAMETERS = {
     { "csv-format",   Element::boolean },
     { "always-send",  Element::boolean },
     { "user-context", Element::map },
-    { "comment",      Element::string }
+    { "comment",      Element::string },
+    { "metadata",     Element::map }
 };
 
 OptionDataParser::OptionDataParser(const uint16_t address_family,
index 312c9d4bb544c0b96653cb28ad9a795ba9f91e64..6444d6cc78d636535d471c612ba37d60c2d078b9 100644 (file)
@@ -46,7 +46,8 @@ SharedNetwork4Parser::SHARED_NETWORK4_PARAMETERS = {
     { "comment",                Element::string },
     { "calculate-tee-times",    Element::boolean },
     { "t1-percent",             Element::real },
-    { "t2-percent",             Element::real }
+    { "t2-percent",             Element::real },
+    { "metadata",               Element::map }
 };
 
 SharedNetwork4Ptr
@@ -234,7 +235,8 @@ SharedNetwork6Parser::SHARED_NETWORK6_PARAMETERS = {
     { "comment",                Element::string },
     { "calculate-tee-times",    Element::boolean },
     { "t1-percent",             Element::real },
-    { "t2-percent",             Element::real }
+    { "t2-percent",             Element::real },
+    { "metadata",               Element::map }
 };
 
 SharedNetwork6Ptr