diff options
| author | Francis Dupont <fdupont@isc.org> | 2018-09-28 13:26:34 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2018-09-28 15:20:46 +0200 |
| commit | 5c7a719b1c4bbbeb364dbb78c095096ca1c93bc7 (patch) | |
| tree | ecb3ef293fd16a84c17db77a4adbcb093fe96a6b /src | |
| parent | [#,5!49], regen flex/bison (diff) | |
| download | kea-5c7a719b1c4bbbeb364dbb78c095096ca1c93bc7.tar.xz kea-5c7a719b1c4bbbeb364dbb78c095096ca1c93bc7.zip | |
[5-netconf-config] Updated examples and twist global objects
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/netconf/netconf_parser.yy | 3 | ||||
| -rw-r--r-- | src/bin/netconf/tests/parser_unittests.cc | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/netconf/netconf_parser.yy b/src/bin/netconf/netconf_parser.yy index c6ace3e2bd..21c1e3ee40 100644 --- a/src/bin/netconf/netconf_parser.yy +++ b/src/bin/netconf/netconf_parser.yy @@ -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. diff --git a/src/bin/netconf/tests/parser_unittests.cc b/src/bin/netconf/tests/parser_unittests.cc index c2ad8221f1..450d6f2993 100644 --- a/src/bin/netconf/tests/parser_unittests.cc +++ b/src/bin/netconf/tests/parser_unittests.cc @@ -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 }, " |