[5213] commandSetConfigHandler -> commandConfigSetHandler

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index 87ac7800f1ee05565dfd7a655323fecbc8663190..f318ab64a1f642f6955ea5b6a34238da05b5c8bb 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -292,7 +292,7 @@ ControlledDhcpv4Srv::commandConfigWriteHandler(const string&,
 }
 
 ConstElementPtr
-ControlledDhcpv4Srv::commandSetConfigHandler(const string&,
+ControlledDhcpv4Srv::commandConfigSetHandler(const string&,
                                              ConstElementPtr args) {
     const int status_code = CONTROL_RESULT_ERROR; // 1 indicates an error
     ConstElementPtr dhcp4;
@@ -463,7 +463,7 @@ ControlledDhcpv4Srv::processCommand(const string& command,
             return (srv->commandConfigReloadHandler(command, args));
 
         } else if (command == "config-set") {
-            return (srv->commandSetConfigHandler(command, args));
+            return (srv->commandConfigSetHandler(command, args));
 
         } else if (command == "config-get") {
             return (srv->commandConfigGetHandler(command, args));
@@ -642,7 +642,7 @@ ControlledDhcpv4Srv::ControlledDhcpv4Srv(uint16_t port /*= DHCP4_SERVER_PORT*/)
         boost::bind(&ControlledDhcpv4Srv::commandConfigReloadHandler, this, _1, _2));
 
     CommandMgr::instance().registerCommand("config-set",
-        boost::bind(&ControlledDhcpv4Srv::commandSetConfigHandler, this, _1, _2));
+        boost::bind(&ControlledDhcpv4Srv::commandConfigSetHandler, this, _1, _2));
 
     CommandMgr::instance().registerCommand("config-test",
         boost::bind(&ControlledDhcpv4Srv::commandConfigTestHandler, this, _1, _2));

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
index eec36885857ec6ba21295ceda8816b0e40e1264f..5f7873c3f487654f48b5b53dd0dd4dfcabafeb27 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.h
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -206,7 +206,7 @@ private:
     ///
     /// @return status of the command
     isc::data::ConstElementPtr
-    commandSetConfigHandler(const std::string& command,
+    commandConfigSetHandler(const std::string& command,
                             isc::data::ConstElementPtr args);
 
     /// @brief handler for processing 'config-test' command

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index e04acd942f0410df03c931b4f8ddba48309d4272..c33aeb2e906842759d5711adb65997b4f09ebc4e 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -296,7 +296,7 @@ ControlledDhcpv6Srv::commandConfigWriteHandler(const string&, ConstElementPtr ar
 }
 
 ConstElementPtr
-ControlledDhcpv6Srv::commandSetConfigHandler(const string&,
+ControlledDhcpv6Srv::commandConfigSetHandler(const string&,
                                              ConstElementPtr args) {
     const int status_code = CONTROL_RESULT_ERROR;
     ConstElementPtr dhcp6;
@@ -466,7 +466,7 @@ ControlledDhcpv6Srv::processCommand(const std::string& command,
             return (srv->commandConfigReloadHandler(command, args));
 
         } else if (command == "config-set") {
-            return (srv->commandSetConfigHandler(command, args));
+            return (srv->commandConfigSetHandler(command, args));
 
         } else if (command == "config-get") {
             return (srv->commandConfigGetHandler(command, args));
@@ -679,7 +679,7 @@ ControlledDhcpv6Srv::ControlledDhcpv6Srv(uint16_t port)
         boost::bind(&ControlledDhcpv6Srv::commandLibReloadHandler, this, _1, _2));
 
     CommandMgr::instance().registerCommand("config-set",
-        boost::bind(&ControlledDhcpv6Srv::commandSetConfigHandler, this, _1, _2));
+        boost::bind(&ControlledDhcpv6Srv::commandConfigSetHandler, this, _1, _2));
 
     CommandMgr::instance().registerCommand("shutdown",
         boost::bind(&ControlledDhcpv6Srv::commandShutdownHandler, this, _1, _2));

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
index b58e329c017042d912881815ad86ce453fae93d5..608a0052f2e9e8aa13070a009f1e5eacc9599c9f 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -206,7 +206,7 @@ private:
     ///
     /// @return status of the command
     isc::data::ConstElementPtr
-    commandSetConfigHandler(const std::string& command,
+    commandConfigSetHandler(const std::string& command,
                             isc::data::ConstElementPtr args);
 
     /// @brief handler for processing 'config-test' command