[#4492] Fixed a few more nits

modified:   src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
modified:   src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
modified:   src/hooks/dhcp/lease_cmds/sflq_cmds.cc
modified:   src/share/api/sflq-pool4-rebuild.json

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
index 687f6aea82d30544259b132986d9053832a5671e..a33fe21e87921979438c2a6e313795715db70cde 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-pool4-rebuild command succeeded, (parameters: %1) pools rebuilt: %2",
+    "SFLQ_POOL6_REBUILD", "sflq-pool6-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 5b06a7984057aab42258f925d4e06aab4499950d..77c7c5d2448d9ca9df99d59993f73cb4f03dafc5 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes
@@ -209,13 +209,14 @@ parameters passed are logged.
 
 % SFLQ_POOL4_DEL sflq-pool4-del command succeeded, (parameters: %1) pools deleted: %2
 Logged at debug log level 20.
-The sflq-pool4-del command was successful.
+The sflq-pool4-del command was successful. It prints the command arguments
+along with the number of pools deleted.
 
 % SFLQ_POOL4_DEL_FAILED sflq-pool4-del command failed, (parameters: %1, reason: %2)
 The sflq-pool4-del command has failed. Both the reason as well as the
 parameters passed are logged.
 
-% SFLQ_POOL6_REBUILD sflq-pool4-rebuild command succeeded, (parameters: %1) pools rebuilt: %2
+% SFLQ_POOL6_REBUILD sflq-pool6-rebuild command succeeded, (parameters: %1) pools rebuilt: %2
 Logged at debug log level 20.
 The sflq-pool6-rebuild command was successful. It prints the command arguments
 along with the number of pools rebuilt.
@@ -250,7 +251,8 @@ parameters passed are logged.
 
 % SFLQ_POOL6_DEL sflq-pool4-del command succeeded, (parameters: %1) pools deleted: %2
 Logged at debug log level 20.
-The sflq-pool6-del command was successful.
+The sflq-pool6-del command was successful. It prints the command arguments
+along with the number of pools deleted.
 
 % SFLQ_POOL6_DEL_FAILED sflq-pool4-del command failed, (parameters: %1, reason: %2)
 The sflq-pool6-del command has failed. Both the reason as well as the

diff --git a/src/hooks/dhcp/lease_cmds/sflq_cmds.cc b/src/hooks/dhcp/lease_cmds/sflq_cmds.cc
index 6265db063d9371961105568b01af26d69bdc4275..595d7fe46bd2f4e713791cecdfda708fd714367a 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/sflq_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/sflq_cmds.cc
@@ -93,7 +93,7 @@ SflqCmdsImpl::sflqPool4RebuildHandler(CalloutHandle& handle) {
         }
 
         LOG_DEBUG(lease_cmds_logger, LEASE_CMDS_DBG_COMMAND_DATA, SFLQ_POOL4_REBUILD)
-                  .arg(cmd_args_)
+                  .arg(cmd_args_->str())
                   .arg(rebuilt ? 1 : 0);
 
     } catch (const std::exception& ex) {
@@ -187,7 +187,7 @@ SflqCmdsImpl::sflqPool6RebuildHandler(CalloutHandle& handle) {
         }
 
         LOG_DEBUG(lease_cmds_logger, LEASE_CMDS_DBG_COMMAND_DATA, SFLQ_POOL6_REBUILD)
-                  .arg(cmd_args_)
+                  .arg(cmd_args_->str())
                   .arg(rebuilt ? 1 : 0);
     } catch (const std::exception& ex) {
         LOG_ERROR(lease_cmds_logger, SFLQ_POOL6_REBUILD_FAILED)

diff --git a/src/share/api/sflq-pool4-rebuild.json b/src/share/api/sflq-pool4-rebuild.json
index 97d2ba1205c526bdbbd96ebac80b06c412d3add2..94b69c1a52ab9c55186559b90618733187ebd0c4 100644 (file)
--- a/src/share/api/sflq-pool4-rebuild.json
+++ b/src/share/api/sflq-pool4-rebuild.json
@@ -6,7 +6,7 @@
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"sflq-pool4-create\",",
+        "    \"command\": \"sflq-pool4-rebuild\",",
         "    \"arguments\": {",
         "       \"start-address\": \"1.2.3.4\",",
         "       \"end-address\": \"1.2.3.4\"",