Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
Kea
Commits
d8f63199
Commit
d8f63199
authored
Sep 10, 2019
by
Wlodzimierz Wencel
Committed by
Tomek Mrugalski
Oct 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[
#795
] unit tests tweaked for new configuration
parent
72c3987d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
13 deletions
+13
-13
src/bin/agent/tests/parser_unittests.cc
src/bin/agent/tests/parser_unittests.cc
+6
-6
src/bin/agent/tests/testdata/get_config.json
src/bin/agent/tests/testdata/get_config.json
+3
-3
src/bin/d2/d2_config.h
src/bin/d2/d2_config.h
+1
-1
src/bin/d2/tests/testdata/get_config.json
src/bin/d2/tests/testdata/get_config.json
+1
-1
src/bin/netconf/tests/parser_unittests.cc
src/bin/netconf/tests/parser_unittests.cc
+2
-2
No files found.
src/bin/agent/tests/parser_unittests.cc
View file @
d8f63199
...
...
@@ -177,15 +177,15 @@ TEST(ParserTest, keywordAgent) {
"
\"
control-sockets
\"
: {"
"
\"
dhcp4
\"
: {"
"
\"
socket-type
\"
:
\"
unix
\"
,"
"
\"
socket-name
\"
:
\"
/
path/to/the/unix/
socket
-v4
\"
"
"
\"
socket-name
\"
:
\"
/
tmp/kea4-ctrl-
socket
\"
"
" },"
"
\"
dhcp6
\"
: {"
"
\"
socket-type
\"
:
\"
unix
\"
,"
"
\"
socket-name
\"
:
\"
/
path/to/the/unix/
socket
-v6
\"
"
"
\"
socket-name
\"
:
\"
/
tmp/kea6-ctrl-
socket
\"
"
" },"
"
\"
d2
\"
: {"
"
\"
socket-type
\"
:
\"
unix
\"
,"
"
\"
socket-name
\"
:
\"
/
path/to/the/unix/
socket
-d2
\"
"
"
\"
socket-name
\"
:
\"
/
tmp/kea-ddns-ctrl-
socket
\"
"
" }"
" },"
"
\"
hooks-libraries
\"
: ["
...
...
@@ -214,15 +214,15 @@ TEST(ParserTest, keywordSubAgent) {
"
\"
control-sockets
\"
: {"
"
\"
dhcp4
\"
: {"
"
\"
socket-type
\"
:
\"
unix
\"
,"
"
\"
socket-name
\"
:
\"
/
path/to/the/unix/
socket
-v4
\"
"
"
\"
socket-name
\"
:
\"
/
tmp/kea4-ctrl-
socket
\"
"
" },"
"
\"
dhcp6
\"
: {"
"
\"
socket-type
\"
:
\"
unix
\"
,"
"
\"
socket-name
\"
:
\"
/
path/to/the/unix/
socket
-v6
\"
"
"
\"
socket-name
\"
:
\"
/
tmp/kea6-ctrl-
socket
\"
"
" },"
"
\"
d2
\"
: {"
"
\"
socket-type
\"
:
\"
unix
\"
,"
"
\"
socket-name
\"
:
\"
/
path/to/the/unix/
socket
-d2
\"
"
"
\"
socket-name
\"
:
\"
/
tmp/kea-ddns-ctrl-
socket
\"
"
" }"
" },"
"
\"
hooks-libraries
\"
: ["
...
...
src/bin/agent/tests/testdata/get_config.json
View file @
d8f63199
...
...
@@ -2,7 +2,7 @@
"Control-agent"
:
{
"control-sockets"
:
{
"d2"
:
{
"socket-name"
:
"/
path/to/the/unix/
socket
-d2
"
,
"socket-name"
:
"/
tmp/kea-ddns-ctrl-
socket"
,
"socket-type"
:
"unix"
,
"user-context"
:
{
"in-use"
:
false
...
...
@@ -10,11 +10,11 @@
},
"dhcp4"
:
{
"comment"
:
"socket to DHCP4 server"
,
"socket-name"
:
"/
path/to/the/unix/
socket
-v4
"
,
"socket-name"
:
"/
tmp/kea4-ctrl-
socket"
,
"socket-type"
:
"unix"
},
"dhcp6"
:
{
"socket-name"
:
"/
path/to/the/unix/
socket
-v6
"
,
"socket-name"
:
"/
tmp/kea6-ctrl-
socket"
,
"socket-type"
:
"unix"
}
},
...
...
src/bin/d2/d2_config.h
View file @
d8f63199
...
...
@@ -80,7 +80,7 @@ namespace d2 {
/// "control-socket":
/// {
/// "socket-type": "unix" ,
/// "socket-name": "/tmp/
d2
-ctrl-socket"
/// "socket-name": "/tmp/
kea-ddns
-ctrl-socket"
//// },
/// "tsig-keys":
//// [
...
...
src/bin/d2/tests/testdata/get_config.json
View file @
d8f63199
{
"DhcpDdns"
:
{
"control-socket"
:
{
"socket-name"
:
"/tmp/
d2
-ctrl-socket"
,
"socket-name"
:
"/tmp/
kea-ddns
-ctrl-socket"
,
"socket-type"
:
"unix"
},
"dns-server-timeout"
:
1000
,
...
...
src/bin/netconf/tests/parser_unittests.cc
View file @
d8f63199
...
...
@@ -135,7 +135,7 @@ TEST(ParserTest, keywordNetconf) {
"
\"
validate-changes
\"
: false,"
"
\"
control-socket
\"
: {"
"
\"
socket-type
\"
:
\"
unix
\"
,"
"
\"
socket-name
\"
:
\"
/
path/to/the/unix/
socket
-v4
\"
"
"
\"
socket-name
\"
:
\"
/
tmp/kea4-ctrl-
socket
\"
"
" }"
" },"
"
\"
dhcp6
\"
: {"
...
...
@@ -200,7 +200,7 @@ TEST(ParserTest, keywordSubNetconf) {
"
\"
validate-changes
\"
: false,"
"
\"
control-socket
\"
: {"
"
\"
socket-type
\"
:
\"
unix
\"
,"
"
\"
socket-name
\"
:
\"
/
path/to/the/unix/
socket
-v4
\"
"
"
\"
socket-name
\"
:
\"
/
tmp/kea4-ctrl-
socket
\"
"
" }"
" },"
"
\"
dhcp6
\"
: {"
...
...
Write
Preview
Markdown
is supported
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