Commit 5c7a719b authored by Francis Dupont's avatar Francis Dupont

[5-netconf-config] Updated examples and twist global objects

parent 035e5845
......@@ -19,8 +19,8 @@
"control-socket":
{
"comment": "using unix/local socket",
"type": "unix",
"name": "/path/to/the/unix/socket-v4"
"socket-type": "unix",
"socket-name": "/path/to/the/unix/socket-v4"
}
}
}
......
......@@ -20,8 +20,8 @@
"model": "kea-dhcp4-server",
"control-socket":
{
"type": "unix",
"name": "/path/to/the/unix/socket-v4"
"socket-type": "unix",
"socket-name": "/path/to/the/unix/socket-v4"
}
},
......@@ -31,8 +31,8 @@
"model": "kea-dhcp6-server",
"control-socket":
{
"type": "unix",
"name": "/path/to/the/unix/socket-v6"
"socket-type": "unix",
"socket-name": "/path/to/the/unix/socket-v6"
}
},
......@@ -43,7 +43,7 @@
"model": "kea-dhcp-ddns",
"control-socket":
{
"type": "stdout",
"socket-type": "stdout",
"user-context": { "in-use": false }
}
},
......@@ -54,9 +54,8 @@
"model": "kea-ctrl-agent",
"control-socket":
{
"type": "http",
"host": "127.0.0.1",
"port": 8000
"socket-type": "http",
"socket-url": "http://127.0.0.1:8000/"
}
}
},
......
......@@ -235,10 +235,9 @@ global_objects: global_object
| global_objects COMMA global_object
;
// This represents a single top level entry, e.g. Control-netconf, Dhcp6 or DhcpDdns.
// This represents a single top level entry, e.g. Netconf or Logging.
global_object: netconf_object
| logging_object
| unknown_map_entry
;
// This define the Control-netconf object.
......
......@@ -543,7 +543,8 @@ TEST(ParserTest, errors) {
"expecting }");
testError("{ 123 }\n",
ParserContext::PARSER_NETCONF,
"<string>:1.3-5: syntax error, unexpected integer");
"<string>:1.3-5: syntax error, unexpected integer, "
"expecting Netconf or Logging");
testError("{ \"foo\" }\n",
ParserContext::PARSER_JSON,
"<string>:1.9: syntax error, unexpected }, "
......
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