[#3477] Changed write-config to config-write

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index 27fad13f6a77126f064c9944aaefe9795ac0940a..4201b60cb70de0be7fad41a7529eab7f7a5b6de6 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -302,7 +302,7 @@ ControlledDhcpv4Srv::commandConfigWriteHandler(const string&,
         ConstElementPtr cfg = CfgMgr::instance().getCurrentCfg()->toElement();
         size = writeConfigFile(filename, cfg);
     } catch (const isc::Exception& ex) {
-        return (createAnswer(CONTROL_RESULT_ERROR, string("Error during write-config: ")
+        return (createAnswer(CONTROL_RESULT_ERROR, string("Error during config-write: ")
                              + ex.what()));
     }
     if (size == 0) {

diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index cff5d5cd579302b9041cf5f4ca53c33a8726ab19..9539d58b70a8ca2ad5c6fd98adc859258e8dc8e5 100644 (file)
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -312,7 +312,7 @@ public:
         EXPECT_EQ(1, cnt) << "Command " << command << " not found";
     }
 
-    /// @brief Check if the answer for write-config command is correct.
+    /// @brief Check if the answer for config-write command is correct.
     ///
     /// @param response_txt response in text form (as read from
     /// the control socket)

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index d1e2f5101a8b6489d88595024f9cdc56fd230b2e..ac8952256d7459793fd676827d384f938153a912 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -304,7 +304,7 @@ ControlledDhcpv6Srv::commandConfigWriteHandler(const string&,
         ConstElementPtr cfg = CfgMgr::instance().getCurrentCfg()->toElement();
         size = writeConfigFile(filename, cfg);
     } catch (const isc::Exception& ex) {
-        return (createAnswer(CONTROL_RESULT_ERROR, string("Error during write-config: ")
+        return (createAnswer(CONTROL_RESULT_ERROR, string("Error during config-write: ")
                              + ex.what()));
     }
     if (size == 0) {

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index 78fb384175351aab6173109855fb3c460b2ccac1..57bf6c1203789f0a76551795ed5cba069ea1e443 100644 (file)
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -337,7 +337,7 @@ public:
         EXPECT_EQ(1, cnt) << "Command " << command << " not found";
     }
 
-    /// @brief Check if the answer for write-config command is correct.
+    /// @brief Check if the answer for config-write command is correct.
     ///
     /// @param response_txt response in text form (as read from
     /// the control socket)

diff --git a/src/lib/process/d_controller.cc b/src/lib/process/d_controller.cc
index b5f7e14184a48e22fd861a03ffc6da43f61b932e..b4f5781a35aad6b5d269b5109a18012b2976c9ff 100644 (file)
--- a/src/lib/process/d_controller.cc
+++ b/src/lib/process/d_controller.cc
@@ -518,7 +518,7 @@ DControllerBase::configWriteHandler(const std::string&,
         size = writeConfigFile(filename, cfg);
     } catch (const isc::Exception& ex) {
         return (createAnswer(CONTROL_RESULT_ERROR,
-                             std::string("Error during write-config:")
+                             std::string("Error during config-write:")
                              + ex.what()));
     }
     if (size == 0) {

diff --git a/src/lib/process/d_controller.h b/src/lib/process/d_controller.h
index 91b777b786a9cc91ba73828050742af0ce115cbf..53c1e6a871b08dc15eeb61d17ecf23b06ac26537 100644 (file)
--- a/src/lib/process/d_controller.h
+++ b/src/lib/process/d_controller.h
@@ -279,7 +279,7 @@ public:
 
     /// @brief handler for config-write command
     ///
-    /// This handle processes write-config command, which writes the
+    /// This handle processes config-write command, which writes the
     /// current configuration to disk. This command takes one optional
     /// parameter called filename. If specified, the current configuration
     /// will be written to that file. If not specified, the file used during