[#4129] addressed review comments

diff --git a/src/hooks/dhcp/ping_check/libloadtests/callout_unittests.cc b/src/hooks/dhcp/ping_check/libloadtests/callout_unittests.cc
index 15f198329d707f64a96e0a794276409e67a46900..7c0d598922dbcbaa59e8b62c89b5781eef0eb63e 100644 (file)
--- a/src/hooks/dhcp/ping_check/libloadtests/callout_unittests.cc
+++ b/src/hooks/dhcp/ping_check/libloadtests/callout_unittests.cc
@@ -124,7 +124,7 @@ TEST_F(CalloutTest, lease4Offer) {
                                                *handle));
     EXPECT_EQ(CalloutHandle::CalloutNextStep::NEXT_STEP_CONTINUE, handle->getStatus());
 
-    EXPECT_EQ(1, countFile("PING_CHECK_CHANNEL_NO_LEASE_OR_LEASE_REUSED Ping check skipped: no lease"));
+    EXPECT_EQ(1, countFile("PING_CHECK_NO_LEASE_OR_LEASE_REUSED Ping check skipped: no lease"));
 }
 
 } // end of anonymous namespace

diff --git a/src/hooks/dhcp/ping_check/ping_check_callouts.cc b/src/hooks/dhcp/ping_check/ping_check_callouts.cc
index c5f5adf689be983206cab1c86736c45772d13de7..79cb6f4440ea0d4af67cc21a24ef958f9f6c2a4c 100644 (file)
--- a/src/hooks/dhcp/ping_check/ping_check_callouts.cc
+++ b/src/hooks/dhcp/ping_check/ping_check_callouts.cc
@@ -148,7 +148,7 @@ int lease4_offer(CalloutHandle& handle) {
         if (!lease4) {
             // lease has been reused or there is no address available to check.
             LOG_DEBUG(ping_check_logger, isc::log::DBGLVL_TRACE_DETAIL,
-                      PING_CHECK_CHANNEL_NO_LEASE_OR_LEASE_REUSED);
+                      PING_CHECK_NO_LEASE_OR_LEASE_REUSED);
             return (0);
         }
 

diff --git a/src/hooks/dhcp/ping_check/ping_check_messages.cc b/src/hooks/dhcp/ping_check/ping_check_messages.cc
index 68525d3bf77de5fae93493a97192657034bbb48a..6ade951b2cb38dc592f79ce36d8085b8d05dba7f 100644 (file)
--- a/src/hooks/dhcp/ping_check/ping_check_messages.cc
+++ b/src/hooks/dhcp/ping_check/ping_check_messages.cc
@@ -9,7 +9,6 @@ extern const isc::log::MessageID PING_CHECK_CHANNEL_ECHO_REPLY_RECEIVED = "PING_
 extern const isc::log::MessageID PING_CHECK_CHANNEL_ECHO_REQUEST_SENT = "PING_CHECK_CHANNEL_ECHO_REQUEST_SENT";
 extern const isc::log::MessageID PING_CHECK_CHANNEL_MALFORMED_PACKET_RECEIVED = "PING_CHECK_CHANNEL_MALFORMED_PACKET_RECEIVED";
 extern const isc::log::MessageID PING_CHECK_CHANNEL_NETWORK_WRITE_ERROR = "PING_CHECK_CHANNEL_NETWORK_WRITE_ERROR";
-extern const isc::log::MessageID PING_CHECK_CHANNEL_NO_LEASE_OR_LEASE_REUSED = "PING_CHECK_CHANNEL_NO_LEASE_OR_LEASE_REUSED";
 extern const isc::log::MessageID PING_CHECK_CHANNEL_SOCKET_CLOSED = "PING_CHECK_CHANNEL_SOCKET_CLOSED";
 extern const isc::log::MessageID PING_CHECK_CHANNEL_SOCKET_CLOSE_ERROR = "PING_CHECK_CHANNEL_SOCKET_CLOSE_ERROR";
 extern const isc::log::MessageID PING_CHECK_CHANNEL_SOCKET_OPENED = "PING_CHECK_CHANNEL_SOCKET_OPENED";
@@ -39,6 +38,7 @@ extern const isc::log::MessageID PING_CHECK_MGR_START_PING_CHECK = "PING_CHECK_M
 extern const isc::log::MessageID PING_CHECK_MGR_STOPPED = "PING_CHECK_MGR_STOPPED";
 extern const isc::log::MessageID PING_CHECK_MGR_STOPPING = "PING_CHECK_MGR_STOPPING";
 extern const isc::log::MessageID PING_CHECK_MGR_SUBNET_CONFIG_FAILED = "PING_CHECK_MGR_SUBNET_CONFIG_FAILED";
+extern const isc::log::MessageID PING_CHECK_NO_LEASE_OR_LEASE_REUSED = "PING_CHECK_NO_LEASE_OR_LEASE_REUSED";
 extern const isc::log::MessageID PING_CHECK_PAUSE_FAILED = "PING_CHECK_PAUSE_FAILED";
 extern const isc::log::MessageID PING_CHECK_PAUSE_ILLEGAL = "PING_CHECK_PAUSE_ILLEGAL";
 extern const isc::log::MessageID PING_CHECK_PAUSE_PERMISSIONS_FAILED = "PING_CHECK_PAUSE_PERMISSIONS_FAILED";
@@ -55,7 +55,6 @@ const char* values[] = {
     "PING_CHECK_CHANNEL_ECHO_REQUEST_SENT", "to address %1, id %2, sequence %3",
     "PING_CHECK_CHANNEL_MALFORMED_PACKET_RECEIVED", "error occurred unpacking message %1, discarding it",
     "PING_CHECK_CHANNEL_NETWORK_WRITE_ERROR", "occurred trying to ping %1, error %2",
-    "PING_CHECK_CHANNEL_NO_LEASE_OR_LEASE_REUSED", "Ping check skipped: no lease",
     "PING_CHECK_CHANNEL_SOCKET_CLOSED", "ICMP socket has been closed.",
     "PING_CHECK_CHANNEL_SOCKET_CLOSE_ERROR", "an attempt to close the ICMP socket failed %1",
     "PING_CHECK_CHANNEL_SOCKET_OPENED", "ICMP socket been opened successfully.",
@@ -85,6 +84,7 @@ const char* values[] = {
     "PING_CHECK_MGR_STOPPED", "channel operations have stopped",
     "PING_CHECK_MGR_STOPPING", "ping channel operations are stopping",
     "PING_CHECK_MGR_SUBNET_CONFIG_FAILED", "user-context for subnet id %1, contains invalid ping-check %2",
+    "PING_CHECK_NO_LEASE_OR_LEASE_REUSED", "Ping check skipped: no lease",
     "PING_CHECK_PAUSE_FAILED", "Pausing ping channel operations failed %1",
     "PING_CHECK_PAUSE_ILLEGAL", "Pausing ping channel operations not allowed %1",
     "PING_CHECK_PAUSE_PERMISSIONS_FAILED", "Permissions check for ping-channel pause failed %1",

diff --git a/src/hooks/dhcp/ping_check/ping_check_messages.h b/src/hooks/dhcp/ping_check/ping_check_messages.h
index 53a998a3b662e0b6c19fe1621aa972736f02925b..7e952e750a4d49c29589c32da5985f68a99e7460 100644 (file)
--- a/src/hooks/dhcp/ping_check/ping_check_messages.h
+++ b/src/hooks/dhcp/ping_check/ping_check_messages.h
@@ -10,7 +10,6 @@ extern const isc::log::MessageID PING_CHECK_CHANNEL_ECHO_REPLY_RECEIVED;
 extern const isc::log::MessageID PING_CHECK_CHANNEL_ECHO_REQUEST_SENT;
 extern const isc::log::MessageID PING_CHECK_CHANNEL_MALFORMED_PACKET_RECEIVED;
 extern const isc::log::MessageID PING_CHECK_CHANNEL_NETWORK_WRITE_ERROR;
-extern const isc::log::MessageID PING_CHECK_CHANNEL_NO_LEASE_OR_LEASE_REUSED;
 extern const isc::log::MessageID PING_CHECK_CHANNEL_SOCKET_CLOSED;
 extern const isc::log::MessageID PING_CHECK_CHANNEL_SOCKET_CLOSE_ERROR;
 extern const isc::log::MessageID PING_CHECK_CHANNEL_SOCKET_OPENED;
@@ -40,6 +39,7 @@ extern const isc::log::MessageID PING_CHECK_MGR_START_PING_CHECK;
 extern const isc::log::MessageID PING_CHECK_MGR_STOPPED;
 extern const isc::log::MessageID PING_CHECK_MGR_STOPPING;
 extern const isc::log::MessageID PING_CHECK_MGR_SUBNET_CONFIG_FAILED;
+extern const isc::log::MessageID PING_CHECK_NO_LEASE_OR_LEASE_REUSED;
 extern const isc::log::MessageID PING_CHECK_PAUSE_FAILED;
 extern const isc::log::MessageID PING_CHECK_PAUSE_ILLEGAL;
 extern const isc::log::MessageID PING_CHECK_PAUSE_PERMISSIONS_FAILED;

diff --git a/src/hooks/dhcp/ping_check/ping_check_messages.mes b/src/hooks/dhcp/ping_check/ping_check_messages.mes
index f3da414cb467630d20014b5ca21130fcfa01291c..cbdd305ed45e7f74d4b2bd8bd60ad44acaf3aca7 100644 (file)
--- a/src/hooks/dhcp/ping_check/ping_check_messages.mes
+++ b/src/hooks/dhcp/ping_check/ping_check_messages.mes
@@ -119,11 +119,6 @@ This debug message is emitted when the minimum number of ECHO REQUESTs
 is greater than 1 and the next ECHO REQUEST for a given lease address has
 been scheduled.
 
-% PING_CHECK_CHANNEL_NO_LEASE_OR_LEASE_REUSED Ping check skipped: no lease
-Logged at debug log level 50.
-This debug message is emitted when the ping check is omitted because there is no lease.
-This could be caused by the fact that the lease has been reused.
-
 % PING_CHECK_MGR_RECEIVED_ECHO_REPLY from %1, id %2, sequence %3
 Logged at debug log level 40.
 This debug message is emitted when an ECHO REPLY message has been received.
@@ -195,6 +190,13 @@ and its 'user-context' contains invalid 'ping-check' configuration.  The
 server will log the error once and then use global ping-check parameters
 for the subnet until the configuration is corrected.
 
+% PING_CHECK_NO_LEASE_OR_LEASE_REUSED Ping check skipped: no lease
+Logged at debug log level 50.
+This debug message is emitted when the ping check request made by the
+server does not contain a lease. This typically happens when a lease is
+being reused. The ping check will be skipped and the offer processing will
+continue as normal.
+
 % PING_CHECK_PAUSE_FAILED Pausing ping channel operations failed %1
 This error message is emitted when an unexpected error occurred while
 attempting to pause the ping channel's thread pool. This error is highly