[#3683] Addressed comments

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index f0a24db7824302dafc2b9addb34f9ad4eed0f181..8e4d6f0ba82b88cedd35a8bf831deca7479e7732 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -1024,7 +1024,7 @@ mysql_upgrade_27_to_28_test() {
 
 mysql_upgrade_28_to_29_test() {
 
-    # check registered were added tp lease_state
+    # check registered was added tp lease_state
     qry="SELECT name FROM lease_state WHERE state = 4"
     run_command \
         mysql_execute "${qry}"

diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index 010f9cde278d458876969f929d3d93279a8d095a..f5eeeebecf1c19139568127c0fed3c47974535a8 100644 (file)
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -1115,7 +1115,7 @@ pgsql_upgrade_27_to_28_test() {
 
 pgsql_upgrade_28_to_29_test() {
 
-    # check registered were added tp lease_state
+    # check registered was added tp lease_state
     query="SELECT name FROM lease_state WHERE state = 4"
     run_command \
         pgsql_execute "${query}"

diff --git a/src/hooks/dhcp/lease_cmds/lease_parser.cc b/src/hooks/dhcp/lease_cmds/lease_parser.cc
index ce763dd00219bfcede7903cbc61222ef89246769..86b9cc1c064a4694d887bdf2f44df1b6e81af69b 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_parser.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_parser.cc
@@ -143,10 +143,10 @@ Lease4Parser::parse(ConstSrvConfigPtr& cfg,
     }
 
     // Check if the state value is sane.
-    if (state > Lease::STATE_RELEASED) {
+    if (state > Lease::STATE_REGISTERED) {
         isc_throw(BadValue, "Invalid state value: " << state << ", supported "
-                  "values are: 0 (default), 1 (declined), 2 (expired-reclaimed)"
-                  " and 3 (released)");
+                  "values are: 0 (default), 1 (declined), 2 (expired-reclaimed),"
+                  " 3 (released) and 4 (registered)");
     }
 
     // Handle user context.
@@ -351,10 +351,10 @@ Lease6Parser::parse(ConstSrvConfigPtr& cfg,
     }
 
     // Check if the state value is sane.
-    if (state > Lease::STATE_RELEASED) {
+    if (state > Lease::STATE_REGISTERED) {
         isc_throw(BadValue, "Invalid state value: " << state << ", supported "
-                  "values are: 0 (default), 1 (declined), 2 (expired-reclaimed)"
-                  " and 3 (released)");
+                  "values are: 0 (default), 1 (declined), 2 (expired-reclaimed),"
+                  " 3 (released) and 4 (registered)");
     }
 
     if ((state == Lease::STATE_DECLINED) && (type == Lease::TYPE_PD)) {