Skip to content

Commit 1214966

Browse files
author
Razvan Becheriu
committed
[#2960] clean up processCommand
1 parent 6d10d64 commit 1214966

File tree

6 files changed

+4
-106
lines changed

6 files changed

+4
-106
lines changed

‎src/bin/dhcp4/ctrl_dhcp4_srv.cc

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -860,41 +860,6 @@ ControlledDhcpv4Srv::processCommand(const string& command,
860860
} else if (command == "config-set") {
861861
return (srv->commandConfigSetHandler(command, args));
862862

863-
} else if (command == "config-get") {
864-
return (srv->commandConfigGetHandler(command, args));
865-
866-
} else if (command == "config-hash-get") {
867-
return (srv->commandConfigHashGetHandler(command, args));
868-
869-
} else if (command == "config-test") {
870-
return (srv->commandConfigTestHandler(command, args));
871-
872-
} else if (command == "dhcp-disable") {
873-
return (srv->commandDhcpDisableHandler(command, args));
874-
875-
} else if (command == "dhcp-enable") {
876-
return (srv->commandDhcpEnableHandler(command, args));
877-
878-
} else if (command == "version-get") {
879-
return (srv->commandVersionGetHandler(command, args));
880-
881-
} else if (command == "build-report") {
882-
return (srv->commandBuildReportHandler(command, args));
883-
884-
} else if (command == "leases-reclaim") {
885-
return (srv->commandLeasesReclaimHandler(command, args));
886-
887-
} else if (command == "config-write") {
888-
return (srv->commandConfigWriteHandler(command, args));
889-
890-
} else if (command == "server-tag-get") {
891-
return (srv->commandServerTagGetHandler(command, args));
892-
893-
} else if (command == "config-backend-pull") {
894-
return (srv->commandConfigBackendPullHandler(command, args));
895-
896-
} else if (command == "status-get") {
897-
return (srv->commandStatusGetHandler(command, args));
898863
}
899864

900865
return (isc::config::createAnswer(CONTROL_RESULT_ERROR, "Unrecognized command:"

‎src/bin/dhcp4/ctrl_dhcp4_srv.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,10 @@ class ControlledDhcpv4Srv : public isc::dhcp::Dhcpv4Srv {
7474

7575
/// @brief Command processor
7676
///
77-
/// This method is uniform for all config backends. It processes received
78-
/// command (as a string + JSON arguments). Internally, it's just a
79-
/// wrapper that calls process*Command() methods and catches exceptions
80-
/// in them.
81-
///
8277
/// Currently supported commands are:
8378
/// - shutdown
8479
/// - config-reload
8580
/// - config-set
86-
/// - config-get
87-
/// - config-hash-get
88-
/// - config-test
89-
/// - dhcp-disable
90-
/// - dhcp-enable
91-
/// - version-get
92-
/// - build-report
93-
/// - leases-reclaim
94-
/// - config-write
95-
/// ...
9681
///
9782
/// @note It never throws.
9883
///

‎src/bin/dhcp4/tests/kea_controller_unittest.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,8 @@ class JSONFileBackendTest : public isc::dhcp::test::BaseServerTest {
312312
EXPECT_EQ(cb_control->getDatabaseCurrentConfigFetchCalls(), 0);
313313
EXPECT_EQ(cb_control->getDatabaseStagingConfigFetchCalls(), 1);
314314

315-
ConstElementPtr result =
316-
ControlledDhcpv4Srv::processCommand("config-backend-pull",
317-
ConstElementPtr());
315+
ConstElementPtr list_cmds = createCommand("config-backend-pull");
316+
ConstElementPtr result = CommandMgr::instance().processCommand(list_cmds);
318317
EXPECT_EQ(cb_control->getDatabaseTotalConfigFetchCalls(), 2);
319318
std::string expected;
320319

‎src/bin/dhcp6/ctrl_dhcp6_srv.cc

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -865,41 +865,6 @@ ControlledDhcpv6Srv::processCommand(const string& command,
865865
} else if (command == "config-set") {
866866
return (srv->commandConfigSetHandler(command, args));
867867

868-
} else if (command == "config-get") {
869-
return (srv->commandConfigGetHandler(command, args));
870-
871-
} else if (command == "config-hash-get") {
872-
return (srv->commandConfigHashGetHandler(command, args));
873-
874-
} else if (command == "config-test") {
875-
return (srv->commandConfigTestHandler(command, args));
876-
877-
} else if (command == "dhcp-disable") {
878-
return (srv->commandDhcpDisableHandler(command, args));
879-
880-
} else if (command == "dhcp-enable") {
881-
return (srv->commandDhcpEnableHandler(command, args));
882-
883-
} else if (command == "version-get") {
884-
return (srv->commandVersionGetHandler(command, args));
885-
886-
} else if (command == "build-report") {
887-
return (srv->commandBuildReportHandler(command, args));
888-
889-
} else if (command == "leases-reclaim") {
890-
return (srv->commandLeasesReclaimHandler(command, args));
891-
892-
} else if (command == "config-write") {
893-
return (srv->commandConfigWriteHandler(command, args));
894-
895-
} else if (command == "server-tag-get") {
896-
return (srv->commandServerTagGetHandler(command, args));
897-
898-
} else if (command == "config-backend-pull") {
899-
return (srv->commandConfigBackendPullHandler(command, args));
900-
901-
} else if (command == "status-get") {
902-
return (srv->commandStatusGetHandler(command, args));
903868
}
904869

905870
return (isc::config::createAnswer(CONTROL_RESULT_ERROR, "Unrecognized command:"

‎src/bin/dhcp6/ctrl_dhcp6_srv.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,10 @@ class ControlledDhcpv6Srv : public isc::dhcp::Dhcpv6Srv {
7474

7575
/// @brief Command processor
7676
///
77-
/// This method is uniform for all config backends. It processes received
78-
/// command (as a string + JSON arguments). Internally, it's just a
79-
/// wrapper that calls process*Command() methods and catches exceptions
80-
/// in them.
81-
///
8277
/// Currently supported commands are:
8378
/// - shutdown
8479
/// - config-reload
8580
/// - config-set
86-
/// - config-get
87-
/// - config-hash-get
88-
/// - config-test
89-
/// - dhcp-disable
90-
/// - dhcp-enable
91-
/// - version-get
92-
/// - build-report
93-
/// - leases-reclaim
94-
/// - config-write
95-
/// ...
9681
///
9782
/// @note It never throws.
9883
///

‎src/bin/dhcp6/tests/kea_controller_unittest.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,8 @@ class JSONFileBackendTest : public dhcp::test::BaseServerTest {
297297
EXPECT_EQ(cb_control->getDatabaseCurrentConfigFetchCalls(), 0);
298298
EXPECT_EQ(cb_control->getDatabaseStagingConfigFetchCalls(), 1);
299299

300-
ConstElementPtr result =
301-
ControlledDhcpv6Srv::processCommand("config-backend-pull",
302-
ConstElementPtr());
300+
ConstElementPtr list_cmds = createCommand("config-backend-pull");
301+
ConstElementPtr result = CommandMgr::instance().processCommand(list_cmds);
303302
EXPECT_EQ(cb_control->getDatabaseTotalConfigFetchCalls(), 2);
304303
std::string expected;
305304

0 commit comments

Comments
 (0)