[#2960] clean up processCommand

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index d3e4960e3f3324d672c17dcfcce9bdaa8e176372..deda6c1c064b4bbb99dfd2b059a94ebe0ea322a0 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -860,41 +860,6 @@ ControlledDhcpv4Srv::processCommand(const string& command,
         } else if (command == "config-set") {
             return (srv->commandConfigSetHandler(command, args));
 
-        } else if (command == "config-get") {
-            return (srv->commandConfigGetHandler(command, args));
-
-        } else if (command == "config-hash-get") {
-            return (srv->commandConfigHashGetHandler(command, args));
-
-        } else if (command == "config-test") {
-            return (srv->commandConfigTestHandler(command, args));
-
-        } else if (command == "dhcp-disable") {
-            return (srv->commandDhcpDisableHandler(command, args));
-
-        } else if (command == "dhcp-enable") {
-            return (srv->commandDhcpEnableHandler(command, args));
-
-        } else if (command == "version-get") {
-            return (srv->commandVersionGetHandler(command, args));
-
-        } else if (command == "build-report") {
-            return (srv->commandBuildReportHandler(command, args));
-
-        } else if (command == "leases-reclaim") {
-            return (srv->commandLeasesReclaimHandler(command, args));
-
-        } else if (command == "config-write") {
-            return (srv->commandConfigWriteHandler(command, args));
-
-        } else if (command == "server-tag-get") {
-            return (srv->commandServerTagGetHandler(command, args));
-
-        } else if (command == "config-backend-pull") {
-            return (srv->commandConfigBackendPullHandler(command, args));
-
-        } else if (command == "status-get") {
-            return (srv->commandStatusGetHandler(command, args));
         }
 
         return (isc::config::createAnswer(CONTROL_RESULT_ERROR, "Unrecognized command:"

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
index bcac18c4943a66cfd9b0b6bfe1348423f2490f1e..ab4fe16841f32265ce91b296b6cb4424e19c54cd 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.h
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -74,25 +74,10 @@ public:
 
     /// @brief Command processor
     ///
-    /// This method is uniform for all config backends. It processes received
-    /// command (as a string + JSON arguments). Internally, it's just a
-    /// wrapper that calls process*Command() methods and catches exceptions
-    /// in them.
-    ///
     /// Currently supported commands are:
     /// - shutdown
     /// - config-reload
     /// - config-set
-    /// - config-get
-    /// - config-hash-get
-    /// - config-test
-    /// - dhcp-disable
-    /// - dhcp-enable
-    /// - version-get
-    /// - build-report
-    /// - leases-reclaim
-    /// - config-write
-    /// ...
     ///
     /// @note It never throws.
     ///

diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc
index db1fc55a44bd8eed22998b72f398c9f9b804bde4..c636be1238919529b3aff71cd76ce6ded87c1981 100644 (file)
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@ -312,9 +312,8 @@ public:
             EXPECT_EQ(cb_control->getDatabaseCurrentConfigFetchCalls(), 0);
             EXPECT_EQ(cb_control->getDatabaseStagingConfigFetchCalls(), 1);
 
-            ConstElementPtr result =
-                ControlledDhcpv4Srv::processCommand("config-backend-pull",
-                                                    ConstElementPtr());
+            ConstElementPtr list_cmds = createCommand("config-backend-pull");
+            ConstElementPtr result = CommandMgr::instance().processCommand(list_cmds);
             EXPECT_EQ(cb_control->getDatabaseTotalConfigFetchCalls(), 2);
             std::string expected;
 

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index c30dadfa50b2c8e72ac859154a9fae4ab78f4493..d5b8fb6e63059fb61b07a3384cbab90bd63dc717 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -865,41 +865,6 @@ ControlledDhcpv6Srv::processCommand(const string& command,
         } else if (command == "config-set") {
             return (srv->commandConfigSetHandler(command, args));
 
-        } else if (command == "config-get") {
-            return (srv->commandConfigGetHandler(command, args));
-
-        } else if (command == "config-hash-get") {
-            return (srv->commandConfigHashGetHandler(command, args));
-
-        } else if (command == "config-test") {
-            return (srv->commandConfigTestHandler(command, args));
-
-        } else if (command == "dhcp-disable") {
-            return (srv->commandDhcpDisableHandler(command, args));
-
-        } else if (command == "dhcp-enable") {
-            return (srv->commandDhcpEnableHandler(command, args));
-
-        } else if (command == "version-get") {
-            return (srv->commandVersionGetHandler(command, args));
-
-        } else if (command == "build-report") {
-            return (srv->commandBuildReportHandler(command, args));
-
-        } else if (command == "leases-reclaim") {
-            return (srv->commandLeasesReclaimHandler(command, args));
-
-        } else if (command == "config-write") {
-            return (srv->commandConfigWriteHandler(command, args));
-
-        } else if (command == "server-tag-get") {
-            return (srv->commandServerTagGetHandler(command, args));
-
-        } else if (command == "config-backend-pull") {
-            return (srv->commandConfigBackendPullHandler(command, args));
-
-        } else if (command == "status-get") {
-            return (srv->commandStatusGetHandler(command, args));
         }
 
         return (isc::config::createAnswer(CONTROL_RESULT_ERROR, "Unrecognized command:"

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
index c1093be641e3c297e7838107b6eb3cb41c219cb1..ba6822d03ac94b0930f26106fd6f7e1f35a6f4c6 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -74,25 +74,10 @@ public:
 
     /// @brief Command processor
     ///
-    /// This method is uniform for all config backends. It processes received
-    /// command (as a string + JSON arguments). Internally, it's just a
-    /// wrapper that calls process*Command() methods and catches exceptions
-    /// in them.
-    ///
     /// Currently supported commands are:
     /// - shutdown
     /// - config-reload
     /// - config-set
-    /// - config-get
-    /// - config-hash-get
-    /// - config-test
-    /// - dhcp-disable
-    /// - dhcp-enable
-    /// - version-get
-    /// - build-report
-    /// - leases-reclaim
-    /// - config-write
-    /// ...
     ///
     /// @note It never throws.
     ///

diff --git a/src/bin/dhcp6/tests/kea_controller_unittest.cc b/src/bin/dhcp6/tests/kea_controller_unittest.cc
index b3afbd4f77c6fb4914765d80a14b1764ed05bb8d..9ec596040e18fe7c214c4b59e98511480a600b25 100644 (file)
--- a/src/bin/dhcp6/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp6/tests/kea_controller_unittest.cc
@@ -297,9 +297,8 @@ public:
             EXPECT_EQ(cb_control->getDatabaseCurrentConfigFetchCalls(), 0);
             EXPECT_EQ(cb_control->getDatabaseStagingConfigFetchCalls(), 1);
 
-            ConstElementPtr result =
-                ControlledDhcpv6Srv::processCommand("config-backend-pull",
-                                                    ConstElementPtr());
+            ConstElementPtr list_cmds = createCommand("config-backend-pull");
+            ConstElementPtr result = CommandMgr::instance().processCommand(list_cmds);
             EXPECT_EQ(cb_control->getDatabaseTotalConfigFetchCalls(), 2);
             std::string expected;