Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
88a4858d
Commit
88a4858d
authored
Dec 16, 2013
by
Tomek Mrugalski
🛰
Browse files
[3210] Changes after review:
- flag => configuration parameter - echoClientId test uses ASSERTs rather than EXPECTs
parent
689bd411
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
88a4858d
XXX. [func] tomek
XXX. [func] tomek
b10-dhcp4: Support for sending back client-id (RFC6842) has been
b10-dhcp4: Support for sending back client-id (RFC6842) has been
added now. Also a flag (echo-client-id) has been added, so it is
added now. Also a configuration parameter (echo-client-id) has
possible to enable backward compatibility (echo-client-id false).
been added, so it is possible to enable backward compatibility
("echo-client-id false").
(Trac #3210, git abcd)
(Trac #3210, git abcd)
698. [bug] muks
698. [bug] muks
...
...
doc/guide/bind10-guide.xml
View file @
88a4858d
...
@@ -4426,8 +4426,8 @@ Dhcp4/subnet4 [] list (default)
...
@@ -4426,8 +4426,8 @@ Dhcp4/subnet4 [] list (default)
that Kea offers. However, in some cases older devices that do
that Kea offers. However, in some cases older devices that do
not support RFC6842 may refuse to accept responses that include
not support RFC6842 may refuse to accept responses that include
client-id option. To enable backward compatibility, an optional
client-id option. To enable backward compatibility, an optional
flag
has been introduced. To configure it,
use the following
configuration parameter
has been introduced. To configure it,
commands:
</para>
use the following
commands:
</para>
<screen>
<screen>
>
<userinput>
config add Dhcp4/echo-client-id
</userinput>
>
<userinput>
config add Dhcp4/echo-client-id
</userinput>
...
...
src/bin/dhcp4/tests/config_parser_unittest.cc
View file @
88a4858d
...
@@ -583,15 +583,15 @@ TEST_F(Dhcp4ParserTest, echoClientId) {
...
@@ -583,15 +583,15 @@ TEST_F(Dhcp4ParserTest, echoClientId) {
ElementPtr
json_true
=
Element
::
fromJSON
(
config_true
);
ElementPtr
json_true
=
Element
::
fromJSON
(
config_true
);
// Let's check the default. It should be true
// Let's check the default. It should be true
EXPEC
T_TRUE
(
CfgMgr
::
instance
().
echoClientId
());
ASSER
T_TRUE
(
CfgMgr
::
instance
().
echoClientId
());
// Now check that "false" configuration is really applied.
// Now check that "false" configuration is really applied.
EXPECT_NO_THROW
(
status
=
configureDhcp4Server
(
*
srv_
,
json_false
));
EXPECT_NO_THROW
(
status
=
configureDhcp4Server
(
*
srv_
,
json_false
));
EXPEC
T_FALSE
(
CfgMgr
::
instance
().
echoClientId
());
ASSER
T_FALSE
(
CfgMgr
::
instance
().
echoClientId
());
// Now check that "true" configuration is really applied.
// Now check that "true" configuration is really applied.
EXPECT_NO_THROW
(
status
=
configureDhcp4Server
(
*
srv_
,
json_true
));
EXPECT_NO_THROW
(
status
=
configureDhcp4Server
(
*
srv_
,
json_true
));
EXPEC
T_TRUE
(
CfgMgr
::
instance
().
echoClientId
());
ASSER
T_TRUE
(
CfgMgr
::
instance
().
echoClientId
());
// In any case revert back to the default value (true)
// In any case revert back to the default value (true)
CfgMgr
::
instance
().
echoClientId
(
true
);
CfgMgr
::
instance
().
echoClientId
(
true
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment