[#2974] Rename commands to subnetx-select-test

diff --git a/doc/sphinx/api-files.txt b/doc/sphinx/api-files.txt
index ea026dfd67599d17c304a5e69b6d919c205b8e08..427d1bd885aa6c14aea2b5f8d8100d3fd7552e47 100644 (file)
--- a/doc/sphinx/api-files.txt
+++ b/doc/sphinx/api-files.txt
@@ -69,9 +69,9 @@ src/share/api/lease6-wipe.json
 src/share/api/lease6-write.json
 src/share/api/leases-reclaim.json
 src/share/api/list-commands.json
-src/share/api/localize4.json
-src/share/api/localize4o6.json
-src/share/api/localize6.json
+src/share/api/subnet4-select-test.json
+src/share/api/subnet4o6-select-test.json
+src/share/api/subnet6-select-test.json
 src/share/api/network4-add.json
 src/share/api/network4-del.json
 src/share/api/network4-get.json

diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst
index 239e92e70d2ab448c831d491ea41ff7248871ae6..609dd5db0df6e8c632b45168d334c7fda5819dd2 100644 (file)
--- a/doc/sphinx/arm/ctrl-channel.rst
+++ b/doc/sphinx/arm/ctrl-channel.rst
@@ -867,13 +867,13 @@ command-line argument. This command does not take any parameters.
 Commands Supported by the DHCPv4 Server
 =======================================
 
-.. isccmd:: localize4
-.. _command-localize4:
+.. isccmd:: subnet4-select-test
+.. _command-subnet4-select-test:
 
-The ``localize4`` Command
--------------------------
+The ``subnet4-select-test`` Command
+-----------------------------------
 
-The :isccmd:`localize4` provides a way to test DHCPv4 subnet selection based 
+The :isccmd:`subnet4-select-test` provides a way to test DHCPv4 subnet selection based 
 on a set of input parameters typically supplied in a client packet.
 Recognized parameters take strings and are:
 
@@ -896,13 +896,13 @@ Outside of errors possible results are:
  -  "selected shared network '<name>' starting with subnet '<subnet>' id <id>"
  -  "selected subnet '<subnet>' id <id>"
 
-.. isccmd:: localize4o6
-.. _command-localize4o6:
+.. isccmd:: subnet4o6-select-test
+.. _command-subnet4o6-select-test:
 
-The ``localize4o6`` Command
----------------------------
+The ``subnet4o6-select-test`` Command
+-------------------------------------
 
-The :isccmd:`localize4to5` provides a way to test DHCPv4-over-DHCPv6 subnet
+The :isccmd:`subnet4o6-select-test` provides a way to test DHCPv4-over-DHCPv6 subnet
 selection based  on a set of input parameters typically supplied in a client
 packet. Recognized parameters take strings and are:
 
@@ -931,13 +931,13 @@ Outside of errors possible results are:
 Commands Supported by the DHCPv6 Server
 =======================================
 
-.. isccmd:: localize6
-.. _command-localize6:
+.. isccmd:: subnet6-select-test
+.. _command-subnet6-select-test:
 
-The ``localize6`` Command
--------------------------
+The ``subnet6-select-test`` Command
+-----------------------------------
 
-The :isccmd:`localize6` provides a way to test DHCPv6 subnet selection based 
+The :isccmd:`subnet6-select-test` provides a way to test DHCPv6 subnet selection based 
 on a set of input parameters typically supplied in a client packet.
 Recognized parameters take strings and are:
 

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index 37f870816e0d3150a8806b7bf11a6b65412fbf7e..84b01630badd22714ece04eae6961cf5babb514b 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -696,8 +696,8 @@ ControlledDhcpv4Srv::commandLeasesReclaimHandler(const string&,
 }
 
 ConstElementPtr
-ControlledDhcpv4Srv::commandLocalize4Handler(const string&,
-                                             ConstElementPtr args) {
+ControlledDhcpv4Srv::commandSubnet4SelectTestHandler(const string&,
+                                                     ConstElementPtr args) {
     if (!args) {
         return (createAnswer(CONTROL_RESULT_ERROR, "empty arguments"));
     }
@@ -865,8 +865,8 @@ ControlledDhcpv4Srv::commandLocalize4Handler(const string&,
 }
 
 ConstElementPtr
-ControlledDhcpv4Srv::commandLocalize4o6Handler(const string&,
-                                               ConstElementPtr args) {
+ControlledDhcpv4Srv::commandSubnet4o6SelectTestHandler(const string&,
+                                                       ConstElementPtr args) {
     if (!args) {
         return (createAnswer(CONTROL_RESULT_ERROR, "empty arguments"));
     }
@@ -1489,11 +1489,11 @@ ControlledDhcpv4Srv::ControlledDhcpv4Srv(uint16_t server_port /*= DHCP4_SERVER_P
     CommandMgr::instance().registerCommand("leases-reclaim",
         std::bind(&ControlledDhcpv4Srv::commandLeasesReclaimHandler, this, ph::_1, ph::_2));
 
-    CommandMgr::instance().registerCommand("localize4",
-        std::bind(&ControlledDhcpv4Srv::commandLocalize4Handler, this, ph::_1, ph::_2));
+    CommandMgr::instance().registerCommand("subnet4-select-test",
+        std::bind(&ControlledDhcpv4Srv::commandSubnet4SelectTestHandler, this, ph::_1, ph::_2));
 
-    CommandMgr::instance().registerCommand("localize4o6",
-        std::bind(&ControlledDhcpv4Srv::commandLocalize4o6Handler, this, ph::_1, ph::_2));
+    CommandMgr::instance().registerCommand("subnet4o6-select-test",
+        std::bind(&ControlledDhcpv4Srv::commandSubnet4o6SelectTestHandler, this, ph::_1, ph::_2));
 
     CommandMgr::instance().registerCommand("server-tag-get",
         std::bind(&ControlledDhcpv4Srv::commandServerTagGetHandler, this, ph::_1, ph::_2));
@@ -1578,8 +1578,8 @@ ControlledDhcpv4Srv::~ControlledDhcpv4Srv() {
         CommandMgr::instance().deregisterCommand("dhcp-enable");
         CommandMgr::instance().deregisterCommand("leases-reclaim");
         CommandMgr::instance().deregisterCommand("server-tag-get");
-        CommandMgr::instance().deregisterCommand("localize4");
-        CommandMgr::instance().deregisterCommand("localize4o6");
+        CommandMgr::instance().deregisterCommand("subnet4-select-test");
+        CommandMgr::instance().deregisterCommand("subnet4o6-select-test");
         CommandMgr::instance().deregisterCommand("shutdown");
         CommandMgr::instance().deregisterCommand("statistic-get");
         CommandMgr::instance().deregisterCommand("statistic-get-all");

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
index 0b826ad7c62c1bb537b1d92dc93ac2f034d85a51..5a845892db20f2fbf54a2487e8cfb1640384e643 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.h
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -279,9 +279,9 @@ private:
     commandLeasesReclaimHandler(const std::string& command,
                                 isc::data::ConstElementPtr args);
 
-    /// @brief Handler for processing 'localize4' command
+    /// @brief Handler for processing 'subnet4-select-test' command
     ///
-    /// This handler processes localize4 command, which returns
+    /// This handler processes subnet4-select-test command, which returns
     /// the result of DHCPv4 subnet selected.
     ///
     /// @param command (parameter ignored)
@@ -289,12 +289,12 @@ private:
     ///
     /// @return status of the command with the selection result
     isc::data::ConstElementPtr
-    commandLocalize4Handler(const std::string& command,
-                            isc::data::ConstElementPtr args);
+    commandSubnet4SelectTestHandler(const std::string& command,
+                                    isc::data::ConstElementPtr args);
 
-    /// @brief Handler for processing 'localize4o6' command
+    /// @brief Handler for processing 'subnet4o6-select-test' command
     ///
-    /// This handler processes localize4o6 command, which returns
+    /// This handler processes subnet4o6-select-test command, which returns
     /// the result of DHCP4o6 subnet selected.
     ///
     /// @param command (parameter ignored)
@@ -302,7 +302,7 @@ private:
     ///
     /// @return status of the command with the selection result
     isc::data::ConstElementPtr
-    commandLocalize4o6Handler(const std::string& command,
+    commandSubnet4o6SelectTestHandler(const std::string& command,
                               isc::data::ConstElementPtr args);
 
     /// @brief handler for server-tag-get command

diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 0972166fa1a6e31825e3f1f3c170d58fd03bba30..ad080dae4980020adda59d53de162078b26bccf6 100644 (file)
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -482,8 +482,8 @@ TEST_F(CtrlChannelDhcpv4SrvTest, commandsRegistration) {
     EXPECT_TRUE(command_list.find("\"config-set\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"config-write\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"leases-reclaim\"") != string::npos);
-    EXPECT_TRUE(command_list.find("\"localize4\"") != string::npos);
-    EXPECT_TRUE(command_list.find("\"localize4o6\"") != string::npos);
+    EXPECT_TRUE(command_list.find("\"subnet4-select-test\"") != string::npos);
+    EXPECT_TRUE(command_list.find("\"subnet4o6-select-test\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"server-tag-get\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"shutdown\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"statistic-get\"") != string::npos);
@@ -2056,14 +2056,14 @@ TEST_F(CtrlChannelDhcpv4SrvTest, dhcpEnableOriginId) {
     EXPECT_TRUE(server_->network_state_->isServiceEnabled());
 }
 
-// This test verifies that localize4 command performs sanity check parameters.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
+// This test verifies that subnet4-select-test command performs sanity check parameters.
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4SelectTestBadParam) {
     createUnixChannelServer();
     std::string response;
     ConstElementPtr rsp;
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\""
+                    "    \"command\": \"subnet4-select-test\""
                     "}", response);
 
     // The response should be a valid JSON.
@@ -2074,7 +2074,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
               response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": [ ]"
                     "    }"
                     "}", response);
@@ -2082,7 +2082,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
               response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"foo\": \"bar\""
                     "    }"
@@ -2091,7 +2091,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
               response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": 1"
                     "    }"
@@ -2102,7 +2102,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": 1"
                     "    }"
@@ -2113,7 +2113,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"2001:db8:1::1\""
                     "    }"
@@ -2124,7 +2124,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"foobar\""
                     "    }"
@@ -2136,7 +2136,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": 1"
                     "    }"
@@ -2147,7 +2147,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"2001:db8:1::1\""
                     "    }"
@@ -2158,7 +2158,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"foobar\""
                     "    }"
@@ -2170,7 +2170,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"local\": 1"
                     "    }"
@@ -2181,7 +2181,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"local\": \"2001:db8:1::1\""
                     "    }"
@@ -2192,7 +2192,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"local\": \"foobar\""
                     "    }"
@@ -2204,7 +2204,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": 1"
                     "    }"
@@ -2215,7 +2215,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"2001:db8:1::1\""
                     "    }"
@@ -2226,7 +2226,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"foobar\""
                     "    }"
@@ -2238,7 +2238,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": 1"
                     "    }"
@@ -2249,7 +2249,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"2001:db8:1::1\""
                     "    }"
@@ -2260,7 +2260,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"foobar\""
                     "    }"
@@ -2272,7 +2272,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"subnet\": 1"
                     "    }"
@@ -2283,7 +2283,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"subnet\": \"2001:db8:1::1\""
                     "    }"
@@ -2294,7 +2294,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"subnet\": \"foobar\""
                     "    }"
@@ -2306,7 +2306,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"classes\": \"foo\""
                     "    }"
@@ -2317,7 +2317,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"classes\": [ 1 ]"
                     "    }"
@@ -2328,9 +2328,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4BadParam) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4 command returns proper subnet for a given
+// This test verifies if subnet4-select-test command returns proper subnet for a given
 // relay link select address.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4RAILinkSelect) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4SelectTestRAILinkSelect) {
     createUnixChannelServer();
     std::string response;
 
@@ -2344,7 +2344,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RAILinkSelect) {
 
     // Address not in range: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"10.0.1.1\""
                     "    }"
@@ -2354,7 +2354,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RAILinkSelect) {
 
     // Address in range: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"192.0.2.1\""
                     "    }"
@@ -2367,7 +2367,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RAILinkSelect) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"192.0.2.1\""
                     "    }"
@@ -2379,9 +2379,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RAILinkSelect) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4 command returns proper subnet for a given
+// This test verifies if subnet4-select-test command returns proper subnet for a given
 // subnet select address.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4SubnetSelect) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4SelectTestSubnetSelect) {
     createUnixChannelServer();
     std::string response;
 
@@ -2395,7 +2395,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4SubnetSelect) {
 
     // Address not in range: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"subnet\": \"10.0.1.1\""
                     "    }"
@@ -2405,7 +2405,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4SubnetSelect) {
 
     // Address in range: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"subnet\": \"192.0.2.1\""
                     "    }"
@@ -2418,7 +2418,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4SubnetSelect) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"subnet\": \"192.0.2.1\""
                     "    }"
@@ -2430,9 +2430,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4SubnetSelect) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4 command returns proper subnet for a given
+// This test verifies if subnet4-select-test command returns proper subnet for a given
 // relay address.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4RelayAddress) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4SelectTestRelayAddress) {
     createUnixChannelServer();
     std::string response;
 
@@ -2447,7 +2447,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RelayAddress) {
 
     // Address not in range: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"10.0.1.1\""
                     "    }"
@@ -2457,7 +2457,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RelayAddress) {
 
     // Address in range: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"192.0.3.1\""
                     "    }"
@@ -2470,7 +2470,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RelayAddress) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"192.0.3.1\""
                     "    }"
@@ -2482,9 +2482,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RelayAddress) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4 command returns proper subnet for a given
+// This test verifies if subnet4-select-test command returns proper subnet for a given
 // gateway address.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4Gateway) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4SelectTestGateway) {
     createUnixChannelServer();
     std::string response;
 
@@ -2498,7 +2498,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Gateway) {
 
     // Address not in range: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"10.0.1.1\""
                     "    }"
@@ -2508,7 +2508,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Gateway) {
 
     // Address in range: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"192.0.2.1\""
                     "    }"
@@ -2521,7 +2521,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Gateway) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"192.0.2.1\""
                     "    }"
@@ -2533,9 +2533,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Gateway) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4 command returns proper subnet for a given
+// This test verifies if subnet4-select-test command returns proper subnet for a given
 // client address.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4Client) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4SelectTestClient) {
     createUnixChannelServer();
     std::string response;
 
@@ -2549,7 +2549,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Client) {
 
     // Address not in range: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"10.0.1.1\""
                     "    }"
@@ -2559,7 +2559,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Client) {
 
     // Address in range: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"192.0.2.1\""
                     "    }"
@@ -2572,7 +2572,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Client) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"192.0.2.1\""
                     "    }"
@@ -2584,9 +2584,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Client) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4 command returns proper subnet for a given
+// This test verifies if subnet4-select-test command returns proper subnet for a given
 // remote/source address.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4Remote) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4SelectTestRemote) {
     createUnixChannelServer();
     std::string response;
 
@@ -2600,7 +2600,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Remote) {
 
     // Address not in range: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"10.0.1.1\""
                     "    }"
@@ -2610,7 +2610,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Remote) {
 
     // Address in range: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"192.0.2.1\""
                     "    }"
@@ -2623,7 +2623,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Remote) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"192.0.2.1\""
                     "    }"
@@ -2635,9 +2635,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Remote) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4 command returns proper subnet for a given
+// This test verifies if subnet4-select-test command returns proper subnet for a given
 // incoming interface.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4Iface) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4SelectTestIface) {
     isc::dhcp::test::IfaceMgrTestConfig test_config(true);
     createUnixChannelServer();
     std::string response;
@@ -2654,7 +2654,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Iface) {
 
     // Different interface: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": \"eth0\""
                     "    }"
@@ -2664,7 +2664,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Iface) {
 
     // Same interface: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": \"eth1\""
                     "    }"
@@ -2677,7 +2677,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Iface) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": \"eth1\""
                     "    }"
@@ -2689,8 +2689,8 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Iface) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4 command returns proper guarded subnet.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4Class) {
+// This test verifies if subnet4-select-test command returns proper guarded subnet.
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4SelectTestClass) {
     createUnixChannelServer();
     std::string response;
 
@@ -2705,7 +2705,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Class) {
 
     // Address in range but not in guard: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"192.0.2.1\""
                     "    }"
@@ -2715,7 +2715,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Class) {
 
     // Address in range and in guard: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"192.0.2.1\","
                     "        \"classes\": [ \"foobar\" ]"
@@ -2729,7 +2729,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Class) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4\","
+                    "    \"command\": \"subnet4-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"192.0.2.1\","
                     "        \"classes\": [ \"foobar\" ]"
@@ -2742,14 +2742,14 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Class) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies that localize4o6 command performs sanity check parameters.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
+// This test verifies that subnet4o6-select-test command performs sanity check parameters.
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4o6SelectTestBadParam) {
     createUnixChannelServer();
     std::string response;
     ConstElementPtr rsp;
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\""
+                    "    \"command\": \"subnet4o6-select-test\""
                     "}", response);
 
     // The response should be a valid JSON.
@@ -2760,7 +2760,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
               response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": [ ]"
                     "    }"
                     "}", response);
@@ -2768,7 +2768,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
               response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"foo\": \"bar\""
                     "    }"
@@ -2777,7 +2777,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
               response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": 1"
                     "    }"
@@ -2788,7 +2788,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": 1"
                     "    }"
@@ -2799,7 +2799,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"2001:db8:1::1\""
                     "    }"
@@ -2810,7 +2810,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"address\": \"foobar\""
                     "    }"
@@ -2822,7 +2822,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": 1"
                     "    }"
@@ -2833,7 +2833,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"2001:db8:1::1\""
                     "    }"
@@ -2844,7 +2844,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"relay\": \"foobar\""
                     "    }"
@@ -2856,7 +2856,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"local\": 1"
                     "    }"
@@ -2867,7 +2867,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"local\": \"192.2.1.2\""
                     "    }"
@@ -2878,7 +2878,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"local\": \"foobar\""
                     "    }"
@@ -2890,7 +2890,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": 1"
                     "    }"
@@ -2901,7 +2901,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"192.2.1.2\""
                     "    }"
@@ -2912,7 +2912,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"foobar\""
                     "    }"
@@ -2924,7 +2924,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": 1"
                     "    }"
@@ -2935,7 +2935,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"192.2.1.2\""
                     "    }"
@@ -2946,7 +2946,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"foobar\""
                     "    }"
@@ -2958,7 +2958,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"subnet\": 1"
                     "    }"
@@ -2969,7 +2969,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"subnet\": \"2001:db8:1::1\""
                     "    }"
@@ -2980,7 +2980,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"subnet\": \"foobar\""
                     "    }"
@@ -2992,7 +2992,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"classes\": \"foo\""
                     "    }"
@@ -3003,7 +3003,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"classes\": [ 1 ]"
                     "    }"
@@ -3014,9 +3014,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6BadParam) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4o6 command returns proper subnet for a given
+// This test verifies if subnet4o6-select-test command returns proper subnet for a given
 // remote/source address.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Remote) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4o6SelectTestRemote) {
     createUnixChannelServer();
     std::string response;
 
@@ -3031,7 +3031,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Remote) {
 
     // Address not in range: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"2001:db8:2::2\""
                     "    }"
@@ -3041,7 +3041,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Remote) {
 
     // Address in range: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"2001:db8:1::1\""
                     "    }"
@@ -3054,7 +3054,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Remote) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"2001:db8:1::1\""
                     "    }"
@@ -3066,9 +3066,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Remote) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4o6 command returns proper subnet for a given
+// This test verifies if subnet4o6-select-test command returns proper subnet for a given
 // relay interface id.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6RelayInterfaceId) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4o6SelectTestRelayInterfaceId) {
     isc::dhcp::test::IfaceMgrTestConfig test_config(true);
     createUnixChannelServer();
     std::string response;
@@ -3087,7 +3087,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6RelayInterfaceId) {
 
     // Different interface: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface-id\": \"'foobar'\""
                     "    }"
@@ -3097,7 +3097,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6RelayInterfaceId) {
 
     // Same interface: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface-id\": \"'relay'\""
                     "    }"
@@ -3110,7 +3110,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6RelayInterfaceId) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface-id\": \"'relay'\""
                     "    }"
@@ -3122,9 +3122,9 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6RelayInterfaceId) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize4o6 command returns proper subnet for a given
+// This test verifies if subnet4o6-select-test command returns proper subnet for a given
 // incoming interface.
-TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Iface) {
+TEST_F(CtrlChannelDhcpv4SrvTest, subnet4o6SelectTestIface) {
     isc::dhcp::test::IfaceMgrTestConfig test_config(true);
     createUnixChannelServer();
     std::string response;
@@ -3140,7 +3140,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Iface) {
 
     // Different interface: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": \"foobar\""
                     "    }"
@@ -3150,7 +3150,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Iface) {
 
     // Same interface: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": \"eth0\""
                     "    }"
@@ -3163,7 +3163,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Iface) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize4o6\","
+                    "    \"command\": \"subnet4o6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": \"eth0\""
                     "    }"

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index d7b0acff94c6b13fbfa670c3842665b1fa86958f..5db8580a8365b2c740817d77e51c270b4bd90ba0 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -698,8 +698,8 @@ ControlledDhcpv6Srv::commandLeasesReclaimHandler(const string&,
 }
 
 ConstElementPtr
-ControlledDhcpv6Srv::commandLocalize6Handler(const string&,
-                                             ConstElementPtr args) {
+ControlledDhcpv6Srv::commandSubnet6SelectTestHandler(const string&,
+                                                     ConstElementPtr args) {
     if (!args) {
         return (createAnswer(CONTROL_RESULT_ERROR, "empty arguments"));
     }
@@ -1277,8 +1277,8 @@ ControlledDhcpv6Srv::ControlledDhcpv6Srv(uint16_t server_port /*= DHCP6_SERVER_P
     CommandMgr::instance().registerCommand("leases-reclaim",
         std::bind(&ControlledDhcpv6Srv::commandLeasesReclaimHandler, this, ph::_1, ph::_2));
 
-    CommandMgr::instance().registerCommand("localize6",
-        std::bind(&ControlledDhcpv6Srv::commandLocalize6Handler, this, ph::_1, ph::_2));
+    CommandMgr::instance().registerCommand("subnet6-select-test",
+        std::bind(&ControlledDhcpv6Srv::commandSubnet6SelectTestHandler, this, ph::_1, ph::_2));
 
     CommandMgr::instance().registerCommand("server-tag-get",
         std::bind(&ControlledDhcpv6Srv::commandServerTagGetHandler, this, ph::_1, ph::_2));
@@ -1362,7 +1362,7 @@ ControlledDhcpv6Srv::~ControlledDhcpv6Srv() {
         CommandMgr::instance().deregisterCommand("dhcp-disable");
         CommandMgr::instance().deregisterCommand("dhcp-enable");
         CommandMgr::instance().deregisterCommand("leases-reclaim");
-        CommandMgr::instance().deregisterCommand("localize6");
+        CommandMgr::instance().deregisterCommand("subnet6-select-test");
         CommandMgr::instance().deregisterCommand("server-tag-get");
         CommandMgr::instance().deregisterCommand("shutdown");
         CommandMgr::instance().deregisterCommand("statistic-get");

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
index e6227bbe3e0046b644c3a19453aaba0d3b177214..d2b5b734843c88d4883552338a83bd14e2c60734 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -279,9 +279,9 @@ private:
     commandLeasesReclaimHandler(const std::string& command,
                                 isc::data::ConstElementPtr args);
 
-    /// @brief Handler for processing 'localize6' command
+    /// @brief Handler for processing 'subnet6-select-test' command
     ///
-    /// This handler processes localize6 command, which returns
+    /// This handler processes subnet6-select-test command, which returns
     /// the result of DHCPv6 subnet selected.
     ///
     /// @param command (parameter ignored)
@@ -289,8 +289,8 @@ private:
     ///
     /// @return status of the command with the selection result
     isc::data::ConstElementPtr
-    commandLocalize6Handler(const std::string& command,
-                            isc::data::ConstElementPtr args);
+    commandSubnet6SelectTestHandler(const std::string& command,
+                                    isc::data::ConstElementPtr args);
 
     /// @brief handler for server-tag-get command
     ///

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index fec8263d4836ccbb87f390a7f739f8f3da6af23b..3ae4a909877fc0c7b54e3dad12f1f63d238df832 100644 (file)
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -509,7 +509,7 @@ TEST_F(CtrlDhcpv6SrvTest, commandsRegistration) {
     EXPECT_TRUE(command_list.find("\"config-set\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"config-write\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"leases-reclaim\"") != string::npos);
-    EXPECT_TRUE(command_list.find("\"localize6\"") != string::npos);
+    EXPECT_TRUE(command_list.find("\"subnet6-select-test\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"server-tag-get\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"shutdown\"") != string::npos);
     EXPECT_TRUE(command_list.find("\"statistic-get\"") != string::npos);
@@ -2090,14 +2090,14 @@ TEST_F(CtrlChannelDhcpv6SrvTest, dhcpEnableOriginId) {
     EXPECT_TRUE(server_->network_state_->isServiceEnabled());
 }
 
-// This test verifies that localize6 command performs sanity check parameters.
-TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
+// This test verifies that subnet6-select-test command performs sanity check parameters.
+TEST_F(CtrlChannelDhcpv6SrvTest, subnet6SelectTestBadParam) {
     createUnixChannelServer();
     std::string response;
     ConstElementPtr rsp;
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\""
+                    "    \"command\": \"subnet6-select-test\""
                     "}", response);
 
     // The response should be a valid JSON.
@@ -2108,7 +2108,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
               response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": [ ]"
                     "    }"
                     "}", response);
@@ -2116,7 +2116,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
               response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"foo\": \"bar\""
                     "    }"
@@ -2125,7 +2125,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
               response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": 1"
                     "    }"
@@ -2136,7 +2136,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface-id\": 1"
                     "    }"
@@ -2147,7 +2147,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface-id\": \"\""
                     "    }"
@@ -2158,7 +2158,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface-id\": \"foo\""
                     "    }"
@@ -2169,7 +2169,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": 1"
                     "    }"
@@ -2180,7 +2180,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"192.2.1.2\""
                     "    }"
@@ -2191,7 +2191,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"foobar\""
                     "    }"
@@ -2203,7 +2203,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": 1"
                     "    }"
@@ -2214,7 +2214,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"192.2.1.2\""
                     "    }"
@@ -2225,7 +2225,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"foobar\""
                     "    }"
@@ -2237,7 +2237,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"classes\": \"foo\""
                     "    }"
@@ -2248,7 +2248,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"classes\": [ 1 ]"
                     "    }"
@@ -2259,9 +2259,9 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6BadParam) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize6 command returns proper subnet for a given
+// This test verifies if subnet6-select-test command returns proper subnet for a given
 // remote/source address.
-TEST_F(CtrlChannelDhcpv6SrvTest, localize6Addr) {
+TEST_F(CtrlChannelDhcpv6SrvTest, subnet6SelectTestAddr) {
     createUnixChannelServer();
     std::string response;
 
@@ -2275,7 +2275,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Addr) {
 
     // Address not in range: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"fe80::abcd\""
                     "    }"
@@ -2285,7 +2285,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Addr) {
 
     // Address in range: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"2001:db8:1::1\""
                     "    }"
@@ -2298,7 +2298,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Addr) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"2001:db8:1::1\""
                     "    }"
@@ -2310,9 +2310,9 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Addr) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize6 command returns proper subnet for a given
+// This test verifies if subnet6-select-test command returns proper subnet for a given
 // incoming interface.
-TEST_F(CtrlChannelDhcpv6SrvTest, localize6Iface) {
+TEST_F(CtrlChannelDhcpv6SrvTest, subnet6SelectTestIface) {
     createUnixChannelServer();
     std::string response;
 
@@ -2327,7 +2327,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Iface) {
 
     // Different interface: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": \"bar\""
                     "    }"
@@ -2337,7 +2337,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Iface) {
 
     // Same interface: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": \"eth0\""
                     "    }"
@@ -2350,7 +2350,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Iface) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"interface\": \"eth0\""
                     "    }"
@@ -2362,9 +2362,9 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Iface) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize6 command returns proper subnet for a given
+// This test verifies if subnet6-select-test command returns proper subnet for a given
 // relay link address.
-TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayLinkaddr) {
+TEST_F(CtrlChannelDhcpv6SrvTest, subnet6SelectTestRelayLinkaddr) {
     createUnixChannelServer();
     std::string response;
 
@@ -2378,7 +2378,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayLinkaddr) {
 
     // Address not in range: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"2001:db8:2::2\""
                     "    }"
@@ -2388,7 +2388,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayLinkaddr) {
 
     // Address in range: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"2001:db8:1::1\""
                     "    }"
@@ -2401,7 +2401,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayLinkaddr) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"2001:db8:1::1\""
                     "    }"
@@ -2413,9 +2413,9 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayLinkaddr) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize6 command returns proper subnet for a given
+// This test verifies if subnet6-select-test command returns proper subnet for a given
 // relay interface id.
-TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayInterfaceId) {
+TEST_F(CtrlChannelDhcpv6SrvTest, subnet6SelectTestRelayInterfaceId) {
     createUnixChannelServer();
     std::string response;
 
@@ -2435,7 +2435,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayInterfaceId) {
     // is behind a relay.
     // Different interface id: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"2001:db8:2::2\","
                     "        \"interface-id\": \"'foobar'\""
@@ -2446,7 +2446,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayInterfaceId) {
 
     // Same interface id: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"2001:db8:2::2\","
                     "        \"interface-id\": \"'relay'\""
@@ -2460,7 +2460,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayInterfaceId) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"link\": \"2001:db8:2::2\","
                     "        \"interface-id\": \"'relay'\""
@@ -2473,8 +2473,8 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayInterfaceId) {
     EXPECT_EQ(expected, response);
 }
 
-// This test verifies if localize6 command returns proper guarded subnet.
-TEST_F(CtrlChannelDhcpv6SrvTest, localize6Class) {
+// This test verifies if subnet6-select-test command returns proper guarded subnet.
+TEST_F(CtrlChannelDhcpv6SrvTest, subnet6SelectTestClass) {
     createUnixChannelServer();
     std::string response;
 
@@ -2489,7 +2489,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Class) {
 
     // Address in range but not in guard: nothing can be selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"2001:db8:1::1\""
                     "    }"
@@ -2499,7 +2499,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Class) {
 
     // Address in range and in guard: the subnet is selected.
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"2001:db8:1::1\","
                     "        \"classes\": [ \"foobar\" ]"
@@ -2513,7 +2513,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Class) {
     // Add the subnet to the shared network.
     subnet->setSharedNetwork(network);
     sendUnixCommand("{"
-                    "    \"command\": \"localize6\","
+                    "    \"command\": \"subnet6-select-test\","
                     "    \"arguments\": {"
                     "        \"remote\": \"2001:db8:1::1\","
                     "        \"classes\": [ \"foobar\" ]"

diff --git a/src/share/api/api_files.mk b/src/share/api/api_files.mk
index 44596f86bfb20320078fe8538d576fa98f1ae368..726a0a82ab120d9da395a3e595a0e74085bd3754 100644 (file)
--- a/src/share/api/api_files.mk
+++ b/src/share/api/api_files.mk
@@ -69,9 +69,9 @@ api_files += $(top_srcdir)/src/share/api/lease6-wipe.json
 api_files += $(top_srcdir)/src/share/api/lease6-write.json
 api_files += $(top_srcdir)/src/share/api/leases-reclaim.json
 api_files += $(top_srcdir)/src/share/api/list-commands.json
-api_files += $(top_srcdir)/src/share/api/localize4.json
-api_files += $(top_srcdir)/src/share/api/localize4o6.json
-api_files += $(top_srcdir)/src/share/api/localize6.json
+api_files += $(top_srcdir)/src/share/api/subnet4-select-test.json
+api_files += $(top_srcdir)/src/share/api/subnet4o6-select-test.json
+api_files += $(top_srcdir)/src/share/api/subnet6-select-test.json
 api_files += $(top_srcdir)/src/share/api/network4-add.json
 api_files += $(top_srcdir)/src/share/api/network4-del.json
 api_files += $(top_srcdir)/src/share/api/network4-get.json

diff --git a/src/share/api/localize4.json b/src/share/api/subnet4-select-test.json
similarity index 84%
rename from src/share/api/localize4.json
rename to src/share/api/subnet4-select-test.json
index 6b19b0bc1658430bf739e058c0b9e5e6fdb09677..cb8f971158de5344162e745813a7838f3ac266ae 100644 (file)
--- a/src/share/api/localize4.json
+++ b/src/share/api/subnet4-select-test.json
@@ -5,7 +5,7 @@
     "cmd-comment": [ "Possible parameters are the incoming interface name, client address, relay address, client classes, etc." ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"localize4\",",
+        "    \"command\": \"subnet4-select-test\",",
         "    \"arguments\": {",
         "        \"interface\": <string>,",
         "        \"address\": <string>,",
@@ -18,8 +18,8 @@
         "    }",
         "}"
     ],
-    "description": [ "See <xref linkend=\"command-localize4\"/>" ],
-    "name": "localize4",
+    "description": [ "See <xref linkend=\"command-subnet4-select-test\"/>" ],
+    "name": "subnet4-select-test",
     "resp-comment": [ "3 forms for selected shared network, subnet or nothing.." ],
     "resp-syntax": [ "{ \"result\": 1, \"text\": <localization result> }" ],
     "support": [ "kea-dhcp4" ]

diff --git a/src/share/api/localize4o6.json b/src/share/api/subnet4o6-select-test.json
similarity index 84%
rename from src/share/api/localize4o6.json
rename to src/share/api/subnet4o6-select-test.json
index ecaa42741da2994312a1778e8fca3382d5c9b261..a2cefb7ceb44f664cf9cbf0919547a876b09a50b 100644 (file)
--- a/src/share/api/localize4o6.json
+++ b/src/share/api/subnet4o6-select-test.json
@@ -5,7 +5,7 @@
     "cmd-comment": [ "Possible parameters are the remote address, interface id option, interface name (the three from the DHCPv6 server), etc." ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"localize4o6\",",
+        "    \"command\": \"subnet4o6-select-test\",",
         "    \"arguments\": {",
         "        \"interface\": <string>,",
         "        \"interface-id\": <string>,",
@@ -19,8 +19,8 @@
         "    }",
         "}"
     ],
-    "description": [ "See <xref linkend=\"command-localize4o6\"/>" ],
-    "name": "localize4o6",
+    "description": [ "See <xref linkend=\"command-subnet4o6-select-test\"/>" ],
+    "name": "subnet4o6-select-test",
     "resp-comment": [ "3 forms for selected shared network, subnet or nothing.." ],
     "resp-syntax": [ "{ \"result\": 1, \"text\": <localization result> }" ],
     "support": [ "kea-dhcp4" ]

diff --git a/src/share/api/localize6.json b/src/share/api/subnet6-select-test.json
similarity index 82%
rename from src/share/api/localize6.json
rename to src/share/api/subnet6-select-test.json
index dfe8718c4a2e35b15f524d65ea059140cafc55ee..3741a052a89baed4e5c304c11318f8c0d7c6e4df 100644 (file)
--- a/src/share/api/localize6.json
+++ b/src/share/api/subnet6-select-test.json
@@ -5,7 +5,7 @@
     "cmd-comment": [ "Possible parameters are the incoming interface name, remote address, relay link address, client classes, etc." ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"localize6\",",
+        "    \"command\": \"subnet6-select-test\",",
         "    \"arguments\": {",
         "        \"interface\": <string>,",
         "        \"interface-id\": <string>,",
@@ -15,8 +15,8 @@
         "    }",
         "}"
     ],
-    "description": [ "See <xref linkend=\"command-localize6\"/>" ],
-    "name": "localize6",
+    "description": [ "See <xref linkend=\"command-subnet6-select-test\"/>" ],
+    "name": "subnet6-select-test",
     "resp-comment": [ "3 forms for selected shared network, subnet or nothing.." ],
     "resp-syntax": [ "{ \"result\": 1, \"text\": <localization result> }" ],
     "support": [ "kea-dhcp6" ]