mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 22:45:18 +00:00
Code Issues Releases Wiki Activity

[#2974] Addressed some comments

Browse Source
This commit is contained in:
Francis Dupont
2024-10-20 13:42:01 +02:00
committed by Razvan Becheriu
parent 2f5d06caf1
commit a2b33c0072
5 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
doc/sphinx/arm/ctrl-channel.rst
View File

@@ -873,8 +873,9 @@ Commands Supported by the DHCPv4 Server
The ``localize4`` Command The ``localize4`` Command
------------------------- -------------------------
The :isccmd:`localize4` command returns the result of DHCPv4 subnet selection. The :isccmd:`localize4` provides a way to test DHCPv4 subnet selection based
Recognized entries take strings and are: on a set of input parameters typically supplied in a client packet.
Recognized parameters take strings and are:
- ``interface`` - the incoming interface name - ``interface`` - the incoming interface name
- ``address`` - the client address - ``address`` - the client address
@@ -901,8 +902,9 @@ Outside of errors possible results are:
The ``localize4o6`` Command The ``localize4o6`` Command
--------------------------- ---------------------------
The :isccmd:`localize4o6` command returns the result of DHCPv4-over-DHCPv6 The :isccmd:`localize4to5` provides a way to test DHCPv4-over-DHCPv6 subnet
subnet selection. Recognized entries take strings and are: selection based on a set of input parameters typically supplied in a client
packet. Recognized parameters take strings and are:
- ``interface`` - the incoming interface name of the DHCPv6 server - ``interface`` - the incoming interface name of the DHCPv6 server
- ``interface-id`` - the binary content of the interface-id relay option - ``interface-id`` - the binary content of the interface-id relay option
@@ -935,8 +937,9 @@ Commands Supported by the DHCPv6 Server
The ``localize6`` Command The ``localize6`` Command
------------------------- -------------------------
The :isccmd:`localize6` command returns the result of DHCPv6 subnet selection. The :isccmd:`localize6` provides a way to test DHCPv6 subnet selection based
Recognized entries take strings and are: on a set of input parameters typically supplied in a client packet.
Recognized parameters take strings and are:
- ``interface`` - the incoming interface name - ``interface`` - the incoming interface name
- ``interface-id`` - the binary content of the interface-id relay option - ``interface-id`` - the binary content of the interface-id relay option

2
src/bin/dhcp4/ctrl_dhcp4_srv.cc
View File

@@ -848,7 +848,7 @@ ControlledDhcpv4Srv::commandLocalize4Handler(const string&,
ConstSubnet4Ptr subnet = CfgMgr::instance().getCurrentCfg()-> ConstSubnet4Ptr subnet = CfgMgr::instance().getCurrentCfg()->
getCfgSubnets4()->selectSubnet(selector); getCfgSubnets4()->selectSubnet(selector);
if (!subnet) { if (!subnet) {
return (createAnswer(CONTROL_RESULT_EMPTY, "no selected subnet")); return (createAnswer(CONTROL_RESULT_EMPTY, "no subnet selected"));
} }
SharedNetwork4Ptr network; SharedNetwork4Ptr network;
subnet->getSharedNetwork(network); subnet->getSharedNetwork(network);

22
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
View File

@@ -2349,7 +2349,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RAILinkSelect) {
" \"link\": \"10.0.1.1\"" " \"link\": \"10.0.1.1\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range: the subnet is selected. // Address in range: the subnet is selected.
@@ -2400,7 +2400,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4SubnetSelect) {
" \"subnet\": \"10.0.1.1\"" " \"subnet\": \"10.0.1.1\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range: the subnet is selected. // Address in range: the subnet is selected.
@@ -2452,7 +2452,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4RelayAddress) {
" \"relay\": \"10.0.1.1\"" " \"relay\": \"10.0.1.1\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range: the subnet is selected. // Address in range: the subnet is selected.
@@ -2503,7 +2503,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Gateway) {
" \"relay\": \"10.0.1.1\"" " \"relay\": \"10.0.1.1\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range: the subnet is selected. // Address in range: the subnet is selected.
@@ -2554,7 +2554,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Client) {
" \"address\": \"10.0.1.1\"" " \"address\": \"10.0.1.1\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range: the subnet is selected. // Address in range: the subnet is selected.
@@ -2605,7 +2605,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Remote) {
" \"remote\": \"10.0.1.1\"" " \"remote\": \"10.0.1.1\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range: the subnet is selected. // Address in range: the subnet is selected.
@@ -2659,7 +2659,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Iface) {
" \"interface\": \"eth0\"" " \"interface\": \"eth0\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Same interface: the subnet is selected. // Same interface: the subnet is selected.
@@ -2710,7 +2710,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4Class) {
" \"address\": \"192.0.2.1\"" " \"address\": \"192.0.2.1\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range and in guard: the subnet is selected. // Address in range and in guard: the subnet is selected.
@@ -3036,7 +3036,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Remote) {
" \"remote\": \"2001:db8:2::2\"" " \"remote\": \"2001:db8:2::2\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range: the subnet is selected. // Address in range: the subnet is selected.
@@ -3092,7 +3092,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6RelayInterfaceId) {
" \"interface-id\": \"'foobar'\"" " \"interface-id\": \"'foobar'\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Same interface: the subnet is selected. // Same interface: the subnet is selected.
@@ -3145,7 +3145,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, localize4o6Iface) {
" \"interface\": \"foobar\"" " \"interface\": \"foobar\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Same interface: the subnet is selected. // Same interface: the subnet is selected.

2
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View File

@@ -798,7 +798,7 @@ ControlledDhcpv6Srv::commandLocalize6Handler(const string&,
ConstSubnet6Ptr subnet = CfgMgr::instance().getCurrentCfg()-> ConstSubnet6Ptr subnet = CfgMgr::instance().getCurrentCfg()->
getCfgSubnets6()->selectSubnet(selector); getCfgSubnets6()->selectSubnet(selector);
if (!subnet) { if (!subnet) {
return (createAnswer(CONTROL_RESULT_EMPTY, "no selected subnet")); return (createAnswer(CONTROL_RESULT_EMPTY, "no subnet selected"));
} }
SharedNetwork6Ptr network; SharedNetwork6Ptr network;
subnet->getSharedNetwork(network); subnet->getSharedNetwork(network);

10
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
View File

@@ -2280,7 +2280,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Addr) {
" \"remote\": \"fe80::abcd\"" " \"remote\": \"fe80::abcd\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range: the subnet is selected. // Address in range: the subnet is selected.
@@ -2332,7 +2332,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Iface) {
" \"interface\": \"bar\"" " \"interface\": \"bar\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Same interface: the subnet is selected. // Same interface: the subnet is selected.
@@ -2383,7 +2383,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayLinkaddr) {
" \"link\": \"2001:db8:2::2\"" " \"link\": \"2001:db8:2::2\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range: the subnet is selected. // Address in range: the subnet is selected.
@@ -2441,7 +2441,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6RelayInterfaceId) {
" \"interface-id\": \"'foobar'\"" " \"interface-id\": \"'foobar'\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Same interface id: the subnet is selected. // Same interface id: the subnet is selected.
@@ -2494,7 +2494,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, localize6Class) {
" \"remote\": \"2001:db8:1::1\"" " \"remote\": \"2001:db8:1::1\""
" }" " }"
"}", response); "}", response);
EXPECT_EQ("{ \"result\": 3, \"text\": \"no selected subnet\" }", EXPECT_EQ("{ \"result\": 3, \"text\": \"no subnet selected\" }",
response); response);
// Address in range and in guard: the subnet is selected. // Address in range and in guard: the subnet is selected.