[#3009] addressed review comments

diff --git a/src/bin/dhcp4/dhcp4_messages.cc b/src/bin/dhcp4/dhcp4_messages.cc
index 74f6dc3938be43b530e36d4a010c291a10a0d6d0..0f3369089187b0144584968214e94f4fa115e060 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.cc
+++ b/src/bin/dhcp4/dhcp4_messages.cc
@@ -189,8 +189,8 @@ const char* values[] = {
     "DHCP4_CB_ON_DEMAND_FETCH_UPDATES_FAIL", "error on demand attempt to fetch configuration updates from the configuration backend(s): %1",
     "DHCP4_CB_PERIODIC_FETCH_UPDATES_FAIL", "error on periodic attempt to fetch configuration updates from the configuration backend(s): %1",
     "DHCP4_CB_PERIODIC_FETCH_UPDATES_RETRIES_EXHAUSTED", "maximum number of configuration fetch attempts: 10, has been exhausted without success",
-    "DHCP4_CLASSES_ASSIGNED", "%1: on %2 message the client packet has been assigned to the following classes: %3",
-    "DHCP4_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION", "%1: the client packet has been assigned to the following classes: %2",
+    "DHCP4_CLASSES_ASSIGNED", "%1: client packet has been assigned on %2 message to the following classes: %3",
+    "DHCP4_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION", "%1: client packet has been assigned to the following classes: %2",
     "DHCP4_CLASS_ASSIGNED", "%1: client packet has been assigned to the following class: %2",
     "DHCP4_CLASS_UNCONFIGURED", "%1: client packet belongs to an unconfigured class: %2",
     "DHCP4_CLASS_UNDEFINED", "required class %1 has no definition",

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index a9f3645ce16916226f6df7dc0a9f87b412de14e8..71d12e10a44fefb74eeb736d649542b5c85359e3 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -65,14 +65,14 @@ The server will continue to operate but won't make any further attempts
 to fetch configuration updates. The administrator must fix the configuration
 in the database and reload (or restart) the server.
 
-% DHCP4_CLASSES_ASSIGNED %1: on %2 message the client packet has been assigned to the following classes: %3
+% DHCP4_CLASSES_ASSIGNED %1: client packet has been assigned on %2 message to the following classes: %3
 This debug message informs that incoming packet has been assigned to specified
 classes. This is a normal behavior and indicates successful operation.
 The first argument specifies the client and transaction identification
 information. The second argument specifies the DHCPv4 message type. The third
 argument includes all classes to which the packet has been assigned.
 
-% DHCP4_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION %1: the client packet has been assigned to the following classes: %2
+% DHCP4_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION %1: client packet has been assigned to the following classes: %2
 This debug message informs that incoming packet has been assigned to specified
 classes. This is a normal behavior and indicates successful operation.
 The first argument specifies the client and transaction identification

diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc
index 5badf5cca6d7a9ee16cc5796e6d972051d659c52..94d208ea851e1a3ddc36e11a417e4f75c81bd6ca 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.cc
+++ b/src/bin/dhcp6/dhcp6_messages.cc
@@ -188,8 +188,8 @@ const char* values[] = {
     "DHCP6_CB_ON_DEMAND_FETCH_UPDATES_FAIL", "error on demand attempt to fetch configuration updates from the configuration backend(s): %1",
     "DHCP6_CB_PERIODIC_FETCH_UPDATES_FAIL", "error on periodic attempt to fetch configuration updates from the configuration backend(s): %1",
     "DHCP6_CB_PERIODIC_FETCH_UPDATES_RETRIES_EXHAUSTED", "maximum number of configuration fetch attempts: 10, has been exhausted without success",
-    "DHCP6_CLASSES_ASSIGNED", "%1: on %2 message the client packet has been assigned to the following classes: %3",
-    "DHCP6_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION", "%1: the client packet has been assigned to the following classes: %2",
+    "DHCP6_CLASSES_ASSIGNED", "%1: client packet has been assigned on %2 message to the following classes: %3",
+    "DHCP6_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION", "%1: client packet has been assigned to the following classes: %2",
     "DHCP6_CLASS_ASSIGNED", "%1: client packet has been assigned to the following class: %2",
     "DHCP6_CLASS_UNCONFIGURED", "%1: client packet belongs to an unconfigured class: %2",
     "DHCP6_CLASS_UNDEFINED", "required class %1 has no definition",

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 88a8e7ee56855082fb9788fa4c416c3d57073adb..80e0d008a6c4086c764aab61c7a096915dccf340 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -72,14 +72,14 @@ The server will continue to operate but won't make any further attempts
 to fetch configuration updates. The administrator must fix the configuration
 in the database and reload (or restart) the server.
 
-% DHCP6_CLASSES_ASSIGNED %1: on %2 message the client packet has been assigned to the following classes: %3
+% DHCP6_CLASSES_ASSIGNED %1: client packet has been assigned on %2 message to the following classes: %3
 This debug message informs that incoming packet has been assigned to specified
 classes. This is a normal behavior and indicates successful operation.
 The first argument specifies the client and transaction identification
 information. The second argument specifies the DHCPv6 message type. The third
 argument includes all classes to which the packet has been assigned.
 
-% DHCP6_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION %1: the client packet has been assigned to the following classes: %2
+% DHCP6_CLASSES_ASSIGNED_AFTER_SUBNET_SELECTION %1: client packet has been assigned to the following classes: %2
 This debug message informs that incoming packet has been assigned to specified
 classes. This is a normal behavior and indicates successful operation.
 The first argument specifies the client and transaction identification