Browse Source

[5213] commandSetConfigHandler -> commandConfigSetHandler

Francis Dupont 8 years ago
parent
commit
6221a9e2f2

+ 3 - 3
src/bin/dhcp4/ctrl_dhcp4_srv.cc

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

+ 1 - 1
src/bin/dhcp4/ctrl_dhcp4_srv.h

@@ -206,7 +206,7 @@ private:
     ///
     ///
     /// @return status of the command
     /// @return status of the command
     isc::data::ConstElementPtr
     isc::data::ConstElementPtr
-    commandSetConfigHandler(const std::string& command,
+    commandConfigSetHandler(const std::string& command,
                             isc::data::ConstElementPtr args);
                             isc::data::ConstElementPtr args);
 
 
     /// @brief handler for processing 'config-test' command
     /// @brief handler for processing 'config-test' command

+ 3 - 3
src/bin/dhcp6/ctrl_dhcp6_srv.cc

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

+ 1 - 1
src/bin/dhcp6/ctrl_dhcp6_srv.h

@@ -206,7 +206,7 @@ private:
     ///
     ///
     /// @return status of the command
     /// @return status of the command
     isc::data::ConstElementPtr
     isc::data::ConstElementPtr
-    commandSetConfigHandler(const std::string& command,
+    commandConfigSetHandler(const std::string& command,
                             isc::data::ConstElementPtr args);
                             isc::data::ConstElementPtr args);
 
 
     /// @brief handler for processing 'config-test' command
     /// @brief handler for processing 'config-test' command