Commit d8f63199 authored by Wlodzimierz Wencel's avatar Wlodzimierz Wencel Committed by Tomek Mrugalski

[#795] unit tests tweaked for new configuration

parent 72c3987d
...@@ -177,15 +177,15 @@ TEST(ParserTest, keywordAgent) { ...@@ -177,15 +177,15 @@ TEST(ParserTest, keywordAgent) {
" \"control-sockets\": {" " \"control-sockets\": {"
" \"dhcp4\": {" " \"dhcp4\": {"
" \"socket-type\": \"unix\"," " \"socket-type\": \"unix\","
" \"socket-name\": \"/path/to/the/unix/socket-v4\"" " \"socket-name\": \"/tmp/kea4-ctrl-socket\""
" }," " },"
" \"dhcp6\": {" " \"dhcp6\": {"
" \"socket-type\": \"unix\"," " \"socket-type\": \"unix\","
" \"socket-name\": \"/path/to/the/unix/socket-v6\"" " \"socket-name\": \"/tmp/kea6-ctrl-socket\""
" }," " },"
" \"d2\": {" " \"d2\": {"
" \"socket-type\": \"unix\"," " \"socket-type\": \"unix\","
" \"socket-name\": \"/path/to/the/unix/socket-d2\"" " \"socket-name\": \"/tmp/kea-ddns-ctrl-socket\""
" }" " }"
" }," " },"
" \"hooks-libraries\": [" " \"hooks-libraries\": ["
...@@ -214,15 +214,15 @@ TEST(ParserTest, keywordSubAgent) { ...@@ -214,15 +214,15 @@ TEST(ParserTest, keywordSubAgent) {
" \"control-sockets\": {" " \"control-sockets\": {"
" \"dhcp4\": {" " \"dhcp4\": {"
" \"socket-type\": \"unix\"," " \"socket-type\": \"unix\","
" \"socket-name\": \"/path/to/the/unix/socket-v4\"" " \"socket-name\": \"/tmp/kea4-ctrl-socket\""
" }," " },"
" \"dhcp6\": {" " \"dhcp6\": {"
" \"socket-type\": \"unix\"," " \"socket-type\": \"unix\","
" \"socket-name\": \"/path/to/the/unix/socket-v6\"" " \"socket-name\": \"/tmp/kea6-ctrl-socket\""
" }," " },"
" \"d2\": {" " \"d2\": {"
" \"socket-type\": \"unix\"," " \"socket-type\": \"unix\","
" \"socket-name\": \"/path/to/the/unix/socket-d2\"" " \"socket-name\": \"/tmp/kea-ddns-ctrl-socket\""
" }" " }"
" }," " },"
" \"hooks-libraries\": [" " \"hooks-libraries\": ["
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"Control-agent": { "Control-agent": {
"control-sockets": { "control-sockets": {
"d2": { "d2": {
"socket-name": "/path/to/the/unix/socket-d2", "socket-name": "/tmp/kea-ddns-ctrl-socket",
"socket-type": "unix", "socket-type": "unix",
"user-context": { "user-context": {
"in-use": false "in-use": false
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
}, },
"dhcp4": { "dhcp4": {
"comment": "socket to DHCP4 server", "comment": "socket to DHCP4 server",
"socket-name": "/path/to/the/unix/socket-v4", "socket-name": "/tmp/kea4-ctrl-socket",
"socket-type": "unix" "socket-type": "unix"
}, },
"dhcp6": { "dhcp6": {
"socket-name": "/path/to/the/unix/socket-v6", "socket-name": "/tmp/kea6-ctrl-socket",
"socket-type": "unix" "socket-type": "unix"
} }
}, },
......
...@@ -80,7 +80,7 @@ namespace d2 { ...@@ -80,7 +80,7 @@ namespace d2 {
/// "control-socket": /// "control-socket":
/// { /// {
/// "socket-type": "unix" , /// "socket-type": "unix" ,
/// "socket-name": "/tmp/d2-ctrl-socket" /// "socket-name": "/tmp/kea-ddns-ctrl-socket"
//// }, //// },
/// "tsig-keys": /// "tsig-keys":
//// [ //// [
......
{ {
"DhcpDdns": { "DhcpDdns": {
"control-socket": { "control-socket": {
"socket-name": "/tmp/d2-ctrl-socket", "socket-name": "/tmp/kea-ddns-ctrl-socket",
"socket-type": "unix" "socket-type": "unix"
}, },
"dns-server-timeout": 1000, "dns-server-timeout": 1000,
......
...@@ -135,7 +135,7 @@ TEST(ParserTest, keywordNetconf) { ...@@ -135,7 +135,7 @@ TEST(ParserTest, keywordNetconf) {
" \"validate-changes\": false," " \"validate-changes\": false,"
" \"control-socket\": {" " \"control-socket\": {"
" \"socket-type\": \"unix\"," " \"socket-type\": \"unix\","
" \"socket-name\": \"/path/to/the/unix/socket-v4\"" " \"socket-name\": \"/tmp/kea4-ctrl-socket\""
" }" " }"
" }," " },"
" \"dhcp6\": {" " \"dhcp6\": {"
...@@ -200,7 +200,7 @@ TEST(ParserTest, keywordSubNetconf) { ...@@ -200,7 +200,7 @@ TEST(ParserTest, keywordSubNetconf) {
" \"validate-changes\": false," " \"validate-changes\": false,"
" \"control-socket\": {" " \"control-socket\": {"
" \"socket-type\": \"unix\"," " \"socket-type\": \"unix\","
" \"socket-name\": \"/path/to/the/unix/socket-v4\"" " \"socket-name\": \"/tmp/kea4-ctrl-socket\""
" }" " }"
" }," " },"
" \"dhcp6\": {" " \"dhcp6\": {"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment