From: Francis Dupont <fdupont@isc.org>
Date: Wed, 3 Jul 2019 22:20:58 +0000 (+0200)
Subject: [575-cb-cmds-unknown-fields-in-arguments-should-raise-an-error] Fixed rebase errors
X-Git-Tag: Kea-1.6.0-beta2~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9d87afad8db924da0aadc1b8ab40638bd0a6738;p=thirdparty%2Fkea.git

[575-cb-cmds-unknown-fields-in-arguments-should-raise-an-error] Fixed rebase errors
---

diff --git a/src/lib/dhcpsrv/parsers/simple_parser4.cc b/src/lib/dhcpsrv/parsers/simple_parser4.cc
index 4236d480a4..484c63c813 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser4.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc
@@ -165,6 +165,8 @@ const SimpleDefaults SimpleParser4::OPTION4_DEFAULTS = {
 /// Order follows subnet4_param rule in bison grammar.
 const SimpleKeywords SimpleParser4::SUBNET4_PARAMETERS = {
     { "valid-lifetime",         Element::integer },
+    { "min-valid-lifetime",     Element::integer },
+    { "max-valid-lifetime",     Element::integer },
     { "renew-timer",            Element::integer },
     { "rebind-timer",           Element::integer },
     { "option-data",            Element::list },
@@ -288,6 +290,8 @@ const SimpleKeywords SimpleParser4::SHARED_NETWORK4_PARAMETERS = {
     { "client-class",           Element::string },
     { "require-client-classes", Element::list },
     { "valid-lifetime",         Element::integer },
+    { "min-valid-lifetime",     Element::integer },
+    { "max-valid-lifetime",     Element::integer },
     { "user-context",           Element::map },
     { "comment",                Element::string },
     { "calculate-tee-times",    Element::boolean },
diff --git a/src/lib/dhcpsrv/parsers/simple_parser6.cc b/src/lib/dhcpsrv/parsers/simple_parser6.cc
index 37914ff172..d2c5d8b69c 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser6.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc
@@ -160,7 +160,11 @@ const SimpleDefaults SimpleParser6::OPTION6_DEFAULTS = {
 /// Order follows subnet6_param rule in bison grammar.
 const SimpleKeywords SimpleParser6::SUBNET6_PARAMETERS = {
     { "preferred-lifetime",     Element::integer },
+    { "min-preferred-lifetime", Element::integer },
+    { "max-preferred-lifetime", Element::integer },
     { "valid-lifetime",         Element::integer },
+    { "min-valid-lifetime",     Element::integer },
+    { "max-valid-lifetime",     Element::integer },
     { "renew-timer",            Element::integer },
     { "rebind-timer",           Element::integer },
     { "option-data",            Element::list },
@@ -282,8 +286,12 @@ const SimpleKeywords SimpleParser6::SHARED_NETWORK6_PARAMETERS = {
     { "client-class",           Element::string },
     { "require-client-classes", Element::list },
     { "preferred-lifetime",     Element::integer },
+    { "min-preferred-lifetime", Element::integer },
+    { "max-preferred-lifetime", Element::integer },
     { "rapid-commit",           Element::boolean },
     { "valid-lifetime",         Element::integer },
+    { "min-valid-lifetime",     Element::integer },
+    { "max-valid-lifetime",     Element::integer },
     { "user-context",           Element::map },
     { "comment",                Element::string },
     { "calculate-tee-times",    Element::boolean },
diff --git a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
index f651b4daea..ce7e4cd0f8 100644
--- a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
@@ -1322,9 +1322,7 @@ TEST(CfgSubnets4Test, validLifetimeValidation) {
         "            \"reservation-mode\": \"all\", \n"
         "            \"4o6-interface\": \"\", \n"
         "            \"4o6-interface-id\": \"\", \n"
-        "            \"4o6-subnet\": \"\", \n"
-        "            \"dhcp4o6-port\": 0, \n"
-        "            \"decline-probation-period\": 86400 \n"
+        "            \"4o6-subnet\": \"\" \n"
         "        }";
 
 
diff --git a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
index 9d4b981de3..f2af0c58e7 100644
--- a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
@@ -1110,12 +1110,7 @@ TEST(CfgSubnets6Test, preferredLifetimeValidation) {
         "            \"valid-lifetime\": 300, \n"
         "            \"client-class\": \"\", \n"
         "            \"require-client-classes\": [] \n,"
-        "            \"reservation-mode\": \"all\", \n"
-        "            \"4o6-interface\": \"\", \n"
-        "            \"4o6-interface-id\": \"\", \n"
-        "            \"4o6-subnet\": \"\", \n"
-        "            \"dhcp4o6-port\": 0, \n"
-        "            \"decline-probation-period\": 86400 \n"
+        "            \"reservation-mode\": \"all\" \n"
         "        }";