[#4492] Addressed more comments

	modified:   doc/sphinx/arm/hooks-lease-cmds.rst
	modified:   src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
	modified:   src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
	modified:   src/lib/cc/simple_parser.h

diff --git a/doc/sphinx/arm/hooks-lease-cmds.rst b/doc/sphinx/arm/hooks-lease-cmds.rst
index dafd79fb6562df4c7ebe1798882e65b74dcdeda3..c18af678849a9fe4af67383627264ffabae9619b 100644 (file)
--- a/doc/sphinx/arm/hooks-lease-cmds.rst
+++ b/doc/sphinx/arm/hooks-lease-cmds.rst
@@ -1226,15 +1226,15 @@ where one or more servers have been using other allocator schemes for
 the address ranges that include SFLQ pools. Issuing the command will cause
 the lease back end to discard and then rebuild the free lease data for the
 given pool. Only a pool that exactly matches the start and end adddress
-given will rebuilt.
+given will be rebuilt.
 
-An example :isccmd:`sflq-pool4-rebuild` command for rebuiding an IPv4 SFLQ
+An example :isccmd:`sflq-pool4-rebuild` command for rebuilding an IPv4 SFLQ
 Pool is shown below:
 
 ::
 
     {
-        "command": "sflq-pool4-create",
+        "command": "sflq-pool4-rebuild",
         "arguments": {
             "start-address": "192.0.2.0",
             "end-address": "192.0.2.255"
@@ -1247,7 +1247,7 @@ SFLQ pool for an address pool is shown below:
 ::
 
     {
-        "command": "sflq-pool6-create",
+        "command": "sflq-pool6-rebuild",
         "arguments": {
             "start-address": "2001:db8:1::",
             "end-address": "2001:db8:1::FFFF"
@@ -1572,7 +1572,7 @@ matching pool will be deleted without checking for overlapping pools.
 
 Deleting a pool when there are overlapping pools can produce holes in the
 free lease data where the overlaps occur. If the overlapping pools are to
-remain in use, the ``sflq-poolX-create`` commands should be used to rebuild the
+remain in use, the ``sflq-poolX-rebuild`` commands should be used to rebuild the
 free lease data for the remaining pools.
 
 Alternatively, all of the overlapping pools can be deleted and the next

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
index a33fe21e87921979438c2a6e313795715db70cde..687f6aea82d30544259b132986d9053832a5671e 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
@@ -120,7 +120,7 @@ const char* values[] = {
     "SFLQ_POOL6_GET_BY_RANGE_FAILED", "sflq-pool6-get-by-range command failed, (parameters: %1, reason: %2)",
     "SFLQ_POOL6_GET_BY_SUBNET", "sflq-pool6-get-by-subnet command succeeded, (parameters: %1) pools found: %2",
     "SFLQ_POOL6_GET_BY_SUBNET_FAILED", "sflq-pool6-get-by-subnet command failed, (parameters: %1, reason: %2)",
-    "SFLQ_POOL6_REBUILD", "sflq-pool6-rebuild command succeeded, (parameters: %1) pools rebuilt: %2",
+    "SFLQ_POOL6_REBUILD", "sflq-pool4-rebuild command succeeded, (parameters: %1) pools rebuilt: %2",
     "SFLQ_POOL6_REBUILD_FAILED", "sflq-pool6-rebuild command failed, (parameters: %1, reason: %2)",
     NULL
 };

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
index b4ad9613e5dc758caea87f0e7d645174f4fbad79..5b06a7984057aab42258f925d4e06aab4499950d 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
@@ -176,7 +176,8 @@ parameters passed are logged.
 
 % SFLQ_POOL4_REBUILD sflq-pool4-rebuild command succeeded, (parameters: %1) pools rebuilt: %2
 Logged at debug log level 20.
-The sflq-pool4-rebuild command was successful.
+The sflq-pool4-rebuild command was successful. It prints the command arguments
+along with the number of pools rebuilt.
 
 % SFLQ_POOL4_REBUILD_FAILED sflq-pool4-rebuild command failed, (parameters: %1, reason: %2)
 The sflq-pool4-rebuild command has failed. Both the reason as well as the
@@ -214,9 +215,10 @@ The sflq-pool4-del command was successful.
 The sflq-pool4-del command has failed. Both the reason as well as the
 parameters passed are logged.
 
-% SFLQ_POOL6_REBUILD sflq-pool6-rebuild command succeeded, (parameters: %1) pools rebuilt: %2
+% SFLQ_POOL6_REBUILD sflq-pool4-rebuild command succeeded, (parameters: %1) pools rebuilt: %2
 Logged at debug log level 20.
-The sflq-pool6-rebuild command was successful.
+The sflq-pool6-rebuild command was successful. It prints the command arguments
+along with the number of pools rebuilt.
 
 % SFLQ_POOL6_REBUILD_FAILED sflq-pool6-rebuild command failed, (parameters: %1, reason: %2)
 The sflq-pool6-rebuild command has failed. Both the reason as well as the

diff --git a/src/lib/cc/simple_parser.h b/src/lib/cc/simple_parser.h
index 5a15392e936f798571a064fd9b30abcc9430d356..cb788028fda548844fe3612de74be7c61d8c5b0e 100644 (file)
--- a/src/lib/cc/simple_parser.h
+++ b/src/lib/cc/simple_parser.h
@@ -290,7 +290,7 @@ public:
     /// @return an uint32_t value
     /// @throw isc::dhcp::DhcpConfigError when it is not an uint32_t
     uint32_t getUint32(isc::data::ConstElementPtr scope,
-                              const std::string& name) {
+                       const std::string& name) {
         return (getIntType<uint32_t>(scope, name));
     }