mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 18:08:16 +00:00
Code Issues Releases Wiki Activity

[#3003] output_options alias for output-options

Browse Source
This commit is contained in:
Razvan Becheriu 2023-08-21 08:10:45 +03:00
parent 00de180563
commit 150ef07994
111 changed files with 196 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/examples/agent/simple.json
View File

@ -126,7 +126,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-ctrl-agent", "name": "kea-ctrl-agent",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-ctrl-agent.log", "output": "/var/log/kea-ctrl-agent.log",
// Several additional parameters are possible in addition // Several additional parameters are possible in addition

2
doc/examples/ddns/all-keys-netconf.json
View File

@ -152,7 +152,7 @@
"name": "kea-dhcp-ddns", "name": "kea-dhcp-ddns",
// Configures how the log should be output. // Configures how the log should be output.
"output_options": [ "output-options": [
{ {
// Determines whether the log should be flushed to a file. // Determines whether the log should be flushed to a file.
"flush": true, "flush": true,

2
doc/examples/ddns/all-keys.json
View File

@ -152,7 +152,7 @@
"name": "kea-dhcp-ddns", "name": "kea-dhcp-ddns",
// Configures how the log should be output. // Configures how the log should be output.
"output_options": [ "output-options": [
{ {
// Determines whether the log should be flushed to a file. // Determines whether the log should be flushed to a file.
"flush": true, "flush": true,

2
doc/examples/ddns/sample1.json
View File

@ -148,7 +148,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp-ddns", "name": "kea-dhcp-ddns",
"output_options": [ "output-options": [
{ {
"output": "stdout", "output": "stdout",
// Several additional parameters are possible in addition // Several additional parameters are possible in addition

2
doc/examples/kea4/advanced.json
View File

@ -184,7 +184,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout", "output": "stdout",
// Several additional parameters are possible in addition // Several additional parameters are possible in addition

2
doc/examples/kea4/all-keys-netconf.json
View File

@ -1211,7 +1211,7 @@
"name": "kea-dhcp4", "name": "kea-dhcp4",
// Configures how the log should be output. // Configures how the log should be output.
"output_options": [ "output-options": [
{ {
// Determines whether the log should be flushed to a file. // Determines whether the log should be flushed to a file.
"flush": true, "flush": true,

2
doc/examples/kea4/all-keys.json
View File

@ -1239,7 +1239,7 @@
"name": "kea-dhcp4", "name": "kea-dhcp4",
// Configures how the log should be output. // Configures how the log should be output.
"output_options": [ "output-options": [
{ {
// Determines whether the log should be flushed to a file. // Determines whether the log should be flushed to a file.
"flush": true, "flush": true,

2
doc/examples/kea4/backends.json
View File

@ -92,7 +92,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/classify.json
View File

@ -134,7 +134,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/classify2.json
View File

@ -167,7 +167,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/config-backend.json
View File

@ -78,7 +78,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/dhcpv4-over-dhcpv6.json
View File

@ -34,7 +34,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "/tmp/kea-dhcp4.log" "output": "/tmp/kea-dhcp4.log"
} }

2
doc/examples/kea4/global-reservations.json
View File

@ -165,7 +165,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

4
doc/examples/kea4/ha-load-balancing-server1-mt-with-tls.json
View File

@ -259,7 +259,7 @@
// component. It tells DHCPv4 server to write all log messages (on // component. It tells DHCPv4 server to write all log messages (on
// severity INFO or more) to a file. // severity INFO or more) to a file.
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }
@ -271,7 +271,7 @@
// This section specifies configuration of the HA hook library-specific // This section specifies configuration of the HA hook library-specific
// logger. // logger.
"name": "kea-dhcp4.ha-hooks", "name": "kea-dhcp4.ha-hooks",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

4
doc/examples/kea4/ha-load-balancing-server2-mt.json
View File

@ -242,7 +242,7 @@
// component. It tells DHCPv4 server to write all log messages (on // component. It tells DHCPv4 server to write all log messages (on
// severity INFO or more) to a file. // severity INFO or more) to a file.
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }
@ -254,7 +254,7 @@
// This section specifies configuration of the HA hook library-specific // This section specifies configuration of the HA hook library-specific
// logger. // logger.
"name": "kea-dhcp4.ha-hooks", "name": "kea-dhcp4.ha-hooks",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/leases-expiration.json
View File

@ -63,7 +63,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/multiple-options.json
View File

@ -174,7 +174,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/mysql-reservations.json
View File

@ -90,7 +90,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/pgsql-reservations.json
View File

@ -88,7 +88,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/reservations.json
View File

@ -170,7 +170,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/several-subnets.json
View File

@ -73,7 +73,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/single-subnet.json
View File

@ -47,7 +47,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea4/with-ddns.json
View File

@ -72,7 +72,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/advanced.json
View File

@ -164,7 +164,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout", "output": "stdout",
// Several additional parameters are possible in addition // Several additional parameters are possible in addition

2
doc/examples/kea6/all-keys-netconf.json
View File

@ -1185,7 +1185,7 @@
"name": "kea-dhcp6", "name": "kea-dhcp6",
// Configures how the log should be output. // Configures how the log should be output.
"output_options": [ "output-options": [
{ {
// Determines whether the log should be flushed to a file. // Determines whether the log should be flushed to a file.
"flush": true, "flush": true,

2
doc/examples/kea6/all-keys.json
View File

@ -1213,7 +1213,7 @@
"name": "kea-dhcp6", "name": "kea-dhcp6",
// Configures how the log should be output. // Configures how the log should be output.
"output_options": [ "output-options": [
{ {
// Determines whether the log should be flushed to a file. // Determines whether the log should be flushed to a file.
"flush": true, "flush": true,

2
doc/examples/kea6/backends.json
View File

@ -93,7 +93,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/classify.json
View File

@ -99,7 +99,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/classify2.json
View File

@ -136,7 +136,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/config-backend.json
View File

@ -78,7 +78,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/dhcpv4-over-dhcpv6.json
View File

@ -44,7 +44,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "/tmp/kea-dhcp6.log" "output": "/tmp/kea-dhcp6.log"
} }

2
doc/examples/kea6/dnr.json
View File

@ -73,7 +73,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/duid.json
View File

@ -66,7 +66,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/global-reservations.json
View File

@ -160,7 +160,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

4
doc/examples/kea6/ha-hot-standby-server1-with-tls.json
View File

@ -144,7 +144,7 @@
// component. It tells DHCPv6 server to write all log messages (on // component. It tells DHCPv6 server to write all log messages (on
// severity INFO or more) to a file. // severity INFO or more) to a file.
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }
@ -156,7 +156,7 @@
// This section specifies configuration of the HA hook library-specific // This section specifies configuration of the HA hook library-specific
// logger. // logger.
"name": "kea-dhcp6.ha-hooks", "name": "kea-dhcp6.ha-hooks",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

4
doc/examples/kea6/ha-hot-standby-server2.json
View File

@ -135,7 +135,7 @@
// component. It tells DHCPv6 server to write all log messages (on // component. It tells DHCPv6 server to write all log messages (on
// severity INFO or more) to a file. // severity INFO or more) to a file.
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }
@ -147,7 +147,7 @@
// This section specifies configuration of the HA hook library-specific // This section specifies configuration of the HA hook library-specific
// logger. // logger.
"name": "kea-dhcp6.ha-hooks", "name": "kea-dhcp6.ha-hooks",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/leases-expiration.json
View File

@ -71,7 +71,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/multiple-options.json
View File

@ -170,7 +170,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/mysql-reservations.json
View File

@ -87,7 +87,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/pgsql-reservations.json
View File

@ -84,7 +84,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/reservations.json
View File

@ -157,7 +157,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/several-subnets.json
View File

@ -47,7 +47,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/simple.json
View File

@ -49,7 +49,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/softwire46.json
View File

@ -76,7 +76,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-debug.log" "output": "/var/log/kea-debug.log"
} }

2
doc/examples/kea6/tee-times.json
View File

@ -59,7 +59,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/kea6/with-ddns.json
View File

@ -75,7 +75,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
} }

2
doc/examples/netconf/kea-dhcp6-operations/netconf.json
View File

@ -17,7 +17,7 @@
[ [
{ {
"name": "kea-netconf", "name": "kea-netconf",
"output_options": "output-options":
[ [
{ {
"output": "stderr" "output": "stderr"

2
doc/examples/netconf/simple-dhcp4.json
View File

@ -90,7 +90,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-netconf", "name": "kea-netconf",
"output_options": [ "output-options": [
{ {
// "output": "/var/log/kea-netconf.log", // "output": "/var/log/kea-netconf.log",
"output": "stdout", "output": "stdout",

2
doc/examples/netconf/simple-dhcp6.json
View File

@ -91,7 +91,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-netconf", "name": "kea-netconf",
"output_options": [ "output-options": [
{ {
// "output": "/var/log/kea-netconf.log", // "output": "/var/log/kea-netconf.log",
"output": "stdout", "output": "stdout",

2
doc/examples/template-ha-mt-tls/kea-ca-1.conf
View File

@ -65,7 +65,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-ctrl-agent", "name": "kea-ctrl-agent",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-ctrl-agent.log", "output": "/var/log/kea-ctrl-agent.log",

2
doc/examples/template-ha-mt-tls/kea-ca-2.conf
View File

@ -65,7 +65,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-ctrl-agent", "name": "kea-ctrl-agent",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-ctrl-agent.log", "output": "/var/log/kea-ctrl-agent.log",

2
doc/examples/template-ha-mt-tls/kea-dhcp4-1.conf
View File

@ -223,7 +223,7 @@
// will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel // will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel
// (range 0 to 99) is used only when logging on DEBUG level. // (range 0 to 99) is used only when logging on DEBUG level.
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-dhcp4.log", "output": "/var/log/kea-dhcp4.log",
"maxsize": 2048000, "maxsize": 2048000,

2
doc/examples/template-ha-mt-tls/kea-dhcp4-2.conf
View File

@ -223,7 +223,7 @@
// will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel // will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel
// (range 0 to 99) is used only when logging on DEBUG level. // (range 0 to 99) is used only when logging on DEBUG level.
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-dhcp4.log", "output": "/var/log/kea-dhcp4.log",
"maxsize": 2048000, "maxsize": 2048000,

2
doc/examples/template-power-user-home/kea-ca-1.conf
View File

@ -41,7 +41,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-ctrl-agent", "name": "kea-ctrl-agent",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-ctrl-agent.log", "output": "/var/log/kea-ctrl-agent.log",

2
doc/examples/template-power-user-home/kea-ca-2.conf
View File

@ -41,7 +41,7 @@
"loggers": [ "loggers": [
{ {
"name": "kea-ctrl-agent", "name": "kea-ctrl-agent",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-ctrl-agent.log", "output": "/var/log/kea-ctrl-agent.log",

2
doc/examples/template-power-user-home/kea-dhcp4-1.conf
View File

@ -212,7 +212,7 @@
// will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel // will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel
// (range 0 to 99) is used only when logging on DEBUG level. // (range 0 to 99) is used only when logging on DEBUG level.
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-dhcp4.log", "output": "/var/log/kea-dhcp4.log",
"maxsize": 2048000, "maxsize": 2048000,

2
doc/examples/template-power-user-home/kea-dhcp4-2.conf
View File

@ -212,7 +212,7 @@
// will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel // will be rotated once it grows to 2MB and up to 4 files will be kept. The debuglevel
// (range 0 to 99) is used only when logging on DEBUG level. // (range 0 to 99) is used only when logging on DEBUG level.
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "/var/log/kea-dhcp4.log", "output": "/var/log/kea-dhcp4.log",
"maxsize": 2048000, "maxsize": 2048000,

2
src/bin/admin/tests/memfile_tests.sh.in
View File

@ -121,7 +121,7 @@ memfile_init_test() {
{ {
"debuglevel": 99, "debuglevel": 99,
"name": "kea-dhcpx", "name": "kea-dhcpx",
"output_options": [ "output-options": [
{ {
"output": "@abs_top_builddir@/src/bin/admin/tests/kea.log" "output": "@abs_top_builddir@/src/bin/admin/tests/kea.log"
} }

8
src/bin/agent/agent_parser.cc
View File

@ -1697,16 +1697,16 @@ namespace isc { namespace agent {
case 185: // $@39: %empty case 185: // $@39: %empty
#line 791 "agent_parser.yy" #line 791 "agent_parser.yy"
{ {
ctx.unique("output_options", ctx.loc2pos(yystack_[0].location)); ctx.unique("output-options", ctx.loc2pos(yystack_[0].location));
ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} }
#line 1707 "agent_parser.cc" #line 1707 "agent_parser.cc"
break; break;
case 186: // output_options_list: "output_options" $@39 ":" "[" output_options_list_content "]" case 186: // output_options_list: "output-options" $@39 ":" "[" output_options_list_content "]"
#line 797 "agent_parser.yy" #line 797 "agent_parser.yy"
{ {
ctx.stack_.pop_back(); ctx.stack_.pop_back();
@ -2454,7 +2454,7 @@ namespace isc { namespace agent {
"\"key-file\"", "\"cert-required\"", "\"control-sockets\"", "\"dhcp4\"", "\"key-file\"", "\"cert-required\"", "\"control-sockets\"", "\"dhcp4\"",
"\"dhcp6\"", "\"d2\"", "\"socket-name\"", "\"socket-type\"", "\"unix\"", "\"dhcp6\"", "\"d2\"", "\"socket-name\"", "\"socket-type\"", "\"unix\"",
"\"hooks-libraries\"", "\"library\"", "\"parameters\"", "\"loggers\"", "\"hooks-libraries\"", "\"library\"", "\"parameters\"", "\"loggers\"",
"\"name\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", "\"name\"", "\"output-options\"", "\"output\"", "\"debuglevel\"",
"\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"",
"START_JSON", "START_AGENT", "START_SUB_AGENT", "\"constant string\"", "START_JSON", "START_AGENT", "START_SUB_AGENT", "\"constant string\"",
"\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start",

4
src/bin/agent/agent_parser.h
View File

@ -531,7 +531,7 @@ namespace isc { namespace agent {
TOKEN_PARAMETERS = 293, // "parameters" TOKEN_PARAMETERS = 293, // "parameters"
TOKEN_LOGGERS = 294, // "loggers" TOKEN_LOGGERS = 294, // "loggers"
TOKEN_NAME = 295, // "name" TOKEN_NAME = 295, // "name"
TOKEN_OUTPUT_OPTIONS = 296, // "output_options" TOKEN_OUTPUT_OPTIONS = 296, // "output-options"
TOKEN_OUTPUT = 297, // "output" TOKEN_OUTPUT = 297, // "output"
TOKEN_DEBUGLEVEL = 298, // "debuglevel" TOKEN_DEBUGLEVEL = 298, // "debuglevel"
TOKEN_SEVERITY = 299, // "severity" TOKEN_SEVERITY = 299, // "severity"
@ -605,7 +605,7 @@ namespace isc { namespace agent {
S_PARAMETERS = 38, // "parameters" S_PARAMETERS = 38, // "parameters"
S_LOGGERS = 39, // "loggers" S_LOGGERS = 39, // "loggers"
S_NAME = 40, // "name" S_NAME = 40, // "name"
S_OUTPUT_OPTIONS = 41, // "output_options" S_OUTPUT_OPTIONS = 41, // "output-options"
S_OUTPUT = 42, // "output" S_OUTPUT = 42, // "output"
S_DEBUGLEVEL = 43, // "debuglevel" S_DEBUGLEVEL = 43, // "debuglevel"
S_SEVERITY = 44, // "severity" S_SEVERITY = 44, // "severity"

6
src/bin/agent/agent_parser.yy
View File

@ -90,7 +90,7 @@ using namespace std;
LOGGERS "loggers" LOGGERS "loggers"
NAME "name" NAME "name"
OUTPUT_OPTIONS "output_options" OUTPUT_OPTIONS "output-options"
OUTPUT "output" OUTPUT "output"
DEBUGLEVEL "debuglevel" DEBUGLEVEL "debuglevel"
SEVERITY "severity" SEVERITY "severity"
@ -789,9 +789,9 @@ severity: SEVERITY {
}; };
output_options_list: OUTPUT_OPTIONS { output_options_list: OUTPUT_OPTIONS {
ctx.unique("output_options", ctx.loc2pos(@1)); ctx.unique("output-options", ctx.loc2pos(@1));
ElementPtr l(new ListElement(ctx.loc2pos(@1))); ElementPtr l(new ListElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET {

2
src/bin/agent/parser_context.h
View File

@ -227,7 +227,7 @@ public:
///< Used while parsing Control-agent/loggers structures. ///< Used while parsing Control-agent/loggers structures.
LOGGERS, LOGGERS,
///< Used while parsing Control-agent/loggers/output_options structures. ///< Used while parsing Control-agent/loggers/output-options structures.
OUTPUT_OPTIONS OUTPUT_OPTIONS
} LexerContext; } LexerContext;

2
src/bin/agent/tests/ca_process_tests.sh.in
View File

@ -32,7 +32,7 @@ CONFIG="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-ctrl-agent\", \"name\": \"kea-ctrl-agent\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }

6
src/bin/agent/tests/parser_unittests.cc
View File

@ -285,12 +285,12 @@ TEST(ParserTest, embbededComments) {
testParser(txt, ParserContext::PARSER_AGENT, false); testParser(txt, ParserContext::PARSER_AGENT, false);
} }
// Test that output-options is an alias of output_options. // Test that output_options is an alias of output-options.
TEST(ParserTest, outputDashOptions) { TEST(ParserTest, outputDashOptions) {
string txt = "{ \"Control-agent\": {" string txt = "{ \"Control-agent\": {"
" \"loggers\": [ { " " \"loggers\": [ { "
" \"name\": \"kea-ctrl-agent\"," " \"name\": \"kea-ctrl-agent\","
" \"output-options\": [ { \"output\": \"stdout\" } ]," " \"output_options\": [ { \"output\": \"stdout\" } ],"
" \"severity\": \"INFO\" } ]" " \"severity\": \"INFO\" } ]"
"} }"; "} }";
testParser(txt, ParserContext::PARSER_AGENT, false); testParser(txt, ParserContext::PARSER_AGENT, false);
@ -912,7 +912,7 @@ TEST_F(TrailingCommasTest, tests) {
{ {
"debuglevel": 99, "debuglevel": 99,
"name": "kea-ctrl-agent", "name": "kea-ctrl-agent",
"output_options": [ "output-options": [
{ {
"output": "stdout", "output": "stdout",
}, },

12
src/bin/d2/d2_lexer.cc
View File

@ -1,6 +1,6 @@
#line 1 "d2_lexer.cc" #line 2 "d2_lexer.cc"
#line 3 "d2_lexer.cc" #line 4 "d2_lexer.cc"
#define YY_INT_ALIGNED short int #define YY_INT_ALIGNED short int
@ -1142,7 +1142,7 @@ unsigned int comment_start_line = 0;
/* To avoid the call to exit... oops! */ /* To avoid the call to exit... oops! */
#define YY_FATAL_ERROR(msg) isc::d2::D2ParserContext::fatal(msg) #define YY_FATAL_ERROR(msg) isc::d2::D2ParserContext::fatal(msg)
#line 1145 "d2_lexer.cc" #line 1146 "d2_lexer.cc"
/* noyywrap disables automatic rewinding for the next file to parse. Since we /* noyywrap disables automatic rewinding for the next file to parse. Since we
always parse only a single string, there's no need to do any wraps. And always parse only a single string, there's no need to do any wraps. And
using yywrap requires linking with -lfl, which provides the default yywrap using yywrap requires linking with -lfl, which provides the default yywrap
@ -1168,8 +1168,8 @@ unsigned int comment_start_line = 0;
by moving it ahead by yyleng bytes. yyleng specifies the length of the by moving it ahead by yyleng bytes. yyleng specifies the length of the
currently matched token. */ currently matched token. */
#define YY_USER_ACTION driver.loc_.columns(yyleng); #define YY_USER_ACTION driver.loc_.columns(yyleng);
#line 1171 "d2_lexer.cc"
#line 1172 "d2_lexer.cc" #line 1172 "d2_lexer.cc"
#line 1173 "d2_lexer.cc"
#define INITIAL 0 #define INITIAL 0
#define COMMENT 1 #define COMMENT 1
@ -1489,7 +1489,7 @@ YY_DECL
} }
#line 1492 "d2_lexer.cc" #line 1493 "d2_lexer.cc"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{ {
@ -2483,7 +2483,7 @@ YY_RULE_SETUP
#line 826 "d2_lexer.ll" #line 826 "d2_lexer.ll"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 2486 "d2_lexer.cc" #line 2487 "d2_lexer.cc"
case YY_END_OF_BUFFER: case YY_END_OF_BUFFER:
{ {

8
src/bin/d2/d2_parser.cc
View File

@ -1940,16 +1940,16 @@ namespace isc { namespace d2 {
case 235: // $@54: %empty case 235: // $@54: %empty
#line 915 "d2_parser.yy" #line 915 "d2_parser.yy"
{ {
ctx.unique("output_options", ctx.loc2pos(yystack_[0].location)); ctx.unique("output-options", ctx.loc2pos(yystack_[0].location));
ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} }
#line 1950 "d2_parser.cc" #line 1950 "d2_parser.cc"
break; break;
case 236: // output_options_list: "output_options" $@54 ":" "[" output_options_list_content "]" case 236: // output_options_list: "output-options" $@54 ":" "[" output_options_list_content "]"
#line 921 "d2_parser.yy" #line 921 "d2_parser.yy"
{ {
ctx.stack_.pop_back(); ctx.stack_.pop_back();
@ -2744,7 +2744,7 @@ namespace isc { namespace d2 {
"\"dns-servers\"", "\"hostname\"", "\"tsig-keys\"", "\"algorithm\"", "\"dns-servers\"", "\"hostname\"", "\"tsig-keys\"", "\"algorithm\"",
"\"digest-bits\"", "\"secret\"", "\"control-socket\"", "\"socket-type\"", "\"digest-bits\"", "\"secret\"", "\"control-socket\"", "\"socket-type\"",
"\"socket-name\"", "\"hooks-libraries\"", "\"library\"", "\"socket-name\"", "\"hooks-libraries\"", "\"library\"",
"\"parameters\"", "\"loggers\"", "\"name\"", "\"output_options\"", "\"parameters\"", "\"loggers\"", "\"name\"", "\"output-options\"",
"\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"",
"\"maxsize\"", "\"maxver\"", "\"pattern\"", "TOPLEVEL_JSON", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "TOPLEVEL_JSON",
"TOPLEVEL_DHCPDDNS", "SUB_DHCPDDNS", "SUB_TSIG_KEY", "SUB_TSIG_KEYS", "TOPLEVEL_DHCPDDNS", "SUB_DHCPDDNS", "SUB_TSIG_KEY", "SUB_TSIG_KEYS",

4
src/bin/d2/d2_parser.h
View File

@ -529,7 +529,7 @@ namespace isc { namespace d2 {
TOKEN_PARAMETERS = 291, // "parameters" TOKEN_PARAMETERS = 291, // "parameters"
TOKEN_LOGGERS = 292, // "loggers" TOKEN_LOGGERS = 292, // "loggers"
TOKEN_NAME = 293, // "name" TOKEN_NAME = 293, // "name"
TOKEN_OUTPUT_OPTIONS = 294, // "output_options" TOKEN_OUTPUT_OPTIONS = 294, // "output-options"
TOKEN_OUTPUT = 295, // "output" TOKEN_OUTPUT = 295, // "output"
TOKEN_DEBUGLEVEL = 296, // "debuglevel" TOKEN_DEBUGLEVEL = 296, // "debuglevel"
TOKEN_SEVERITY = 297, // "severity" TOKEN_SEVERITY = 297, // "severity"
@ -608,7 +608,7 @@ namespace isc { namespace d2 {
S_PARAMETERS = 36, // "parameters" S_PARAMETERS = 36, // "parameters"
S_LOGGERS = 37, // "loggers" S_LOGGERS = 37, // "loggers"
S_NAME = 38, // "name" S_NAME = 38, // "name"
S_OUTPUT_OPTIONS = 39, // "output_options" S_OUTPUT_OPTIONS = 39, // "output-options"
S_OUTPUT = 40, // "output" S_OUTPUT = 40, // "output"
S_DEBUGLEVEL = 41, // "debuglevel" S_DEBUGLEVEL = 41, // "debuglevel"
S_SEVERITY = 42, // "severity" S_SEVERITY = 42, // "severity"

6
src/bin/d2/d2_parser.yy
View File

@ -86,7 +86,7 @@ using namespace std;
LOGGERS "loggers" LOGGERS "loggers"
NAME "name" NAME "name"
OUTPUT_OPTIONS "output_options" OUTPUT_OPTIONS "output-options"
OUTPUT "output" OUTPUT "output"
DEBUGLEVEL "debuglevel" DEBUGLEVEL "debuglevel"
SEVERITY "severity" SEVERITY "severity"
@ -913,9 +913,9 @@ severity: SEVERITY {
}; };
output_options_list: OUTPUT_OPTIONS { output_options_list: OUTPUT_OPTIONS {
ctx.unique("output_options", ctx.loc2pos(@1)); ctx.unique("output-options", ctx.loc2pos(@1));
ElementPtr l(new ListElement(ctx.loc2pos(@1))); ElementPtr l(new ListElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET {

2
src/bin/d2/parser_context.h
View File

@ -260,7 +260,7 @@ public:
/// Used while parsing DhcpDdns/loggers structures. /// Used while parsing DhcpDdns/loggers structures.
LOGGERS, LOGGERS,
/// Used while parsing DhcpDdns/loggers/output_options structures. /// Used while parsing DhcpDdns/loggers/output-options structures.
OUTPUT_OPTIONS, OUTPUT_OPTIONS,
/// Used while parsing DhcpDdns/ncr-protocol /// Used while parsing DhcpDdns/ncr-protocol

8
src/bin/d2/tests/d2_process_tests.sh.in
View File

@ -32,7 +32,7 @@ CONFIG="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp-ddns\", \"name\": \"kea-dhcp-ddns\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -55,7 +55,7 @@ CONFIG_BAD_SYNTAX="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp-ddns\", \"name\": \"kea-dhcp-ddns\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -78,7 +78,7 @@ CONFIG_BAD_VALUE="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp-ddns\", \"name\": \"kea-dhcp-ddns\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -102,7 +102,7 @@ CONFIG_INVALID="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp-ddns\", \"name\": \"kea-dhcp-ddns\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }

6
src/bin/d2/tests/parser_unittest.cc
View File

@ -240,14 +240,14 @@ TEST(ParserTest, embbededComments) {
testParser(txt, D2ParserContext::PARSER_DHCPDDNS, false); testParser(txt, D2ParserContext::PARSER_DHCPDDNS, false);
} }
// Test that output-options is an alias of output_options. // Test that output_options is an alias of output-options.
TEST(ParserTest, outputDashOptions) { TEST(ParserTest, outputDashOptions) {
string txt = string txt =
"{ \"DhcpDdns\" : \n" "{ \"DhcpDdns\" : \n"
"{ \n" "{ \n"
" \"loggers\": [ {\n" " \"loggers\": [ {\n"
" \"name\": \"kea-dhcp-ddns\",\n" " \"name\": \"kea-dhcp-ddns\",\n"
" \"output-options\": [ { \"output\": \"stdout\" } ],\n" " \"output_options\": [ { \"output\": \"stdout\" } ],\n"
" \"severity\": \"INFO\" } ]\n" " \"severity\": \"INFO\" } ]\n"
" } \n" " } \n"
"} \n"; "} \n";
@ -851,7 +851,7 @@ TEST_F(TrailingCommasTest, tests) {
"loggers": [ "loggers": [
{ {
"name": "kea-dhcp-ddns", "name": "kea-dhcp-ddns",
"output_options": [ "output-options": [
{ {
"output": "stdout" "output": "stdout"
}, },

2
src/bin/d2/tests/testdata/get_config.json vendored
View File

@ -46,7 +46,7 @@
{ {
"debuglevel": 0, "debuglevel": 0,
"name": "kea-dhcp-ddns", "name": "kea-dhcp-ddns",
"output_options": [ "output-options": [
{ {
"flush": true, "flush": true,
"output": "stdout", "output": "stdout",

8
src/bin/dhcp4/dhcp4_parser.cc
View File

@ -4597,16 +4597,16 @@ namespace isc { namespace dhcp {
case 830: // $@132: %empty case 830: // $@132: %empty
#line 2908 "dhcp4_parser.yy" #line 2908 "dhcp4_parser.yy"
{ {
ctx.unique("output_options", ctx.loc2pos(yystack_[0].location)); ctx.unique("output-options", ctx.loc2pos(yystack_[0].location));
ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} }
#line 4607 "dhcp4_parser.cc" #line 4607 "dhcp4_parser.cc"
break; break;
case 831: // output_options_list: "output_options" $@132 ":" "[" output_options_list_content "]" case 831: // output_options_list: "output-options" $@132 ":" "[" output_options_list_content "]"
#line 2914 "dhcp4_parser.yy" #line 2914 "dhcp4_parser.yy"
{ {
ctx.stack_.pop_back(); ctx.stack_.pop_back();
@ -6192,7 +6192,7 @@ namespace isc { namespace dhcp {
"\"when-present\"", "\"never\"", "\"always\"", "\"when-not-present\"", "\"when-present\"", "\"never\"", "\"always\"", "\"when-not-present\"",
"\"hostname-char-set\"", "\"hostname-char-replacement\"", "\"hostname-char-set\"", "\"hostname-char-replacement\"",
"\"early-global-reservations-lookup\"", "\"ip-reservations-unique\"", "\"early-global-reservations-lookup\"", "\"ip-reservations-unique\"",
"\"reservations-lookup-first\"", "\"loggers\"", "\"output_options\"", "\"reservations-lookup-first\"", "\"loggers\"", "\"output-options\"",
"\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"",
"\"maxsize\"", "\"maxver\"", "\"pattern\"", "\"compatibility\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "\"compatibility\"",
"\"lenient-option-parsing\"", "\"ignore-dhcp-server-identifier\"", "\"lenient-option-parsing\"", "\"ignore-dhcp-server-identifier\"",

4
src/bin/dhcp4/dhcp4_parser.h
View File

@ -691,7 +691,7 @@ namespace isc { namespace dhcp {
TOKEN_IP_RESERVATIONS_UNIQUE = 446, // "ip-reservations-unique" TOKEN_IP_RESERVATIONS_UNIQUE = 446, // "ip-reservations-unique"
TOKEN_RESERVATIONS_LOOKUP_FIRST = 447, // "reservations-lookup-first" TOKEN_RESERVATIONS_LOOKUP_FIRST = 447, // "reservations-lookup-first"
TOKEN_LOGGERS = 448, // "loggers" TOKEN_LOGGERS = 448, // "loggers"
TOKEN_OUTPUT_OPTIONS = 449, // "output_options" TOKEN_OUTPUT_OPTIONS = 449, // "output-options"
TOKEN_OUTPUT = 450, // "output" TOKEN_OUTPUT = 450, // "output"
TOKEN_DEBUGLEVEL = 451, // "debuglevel" TOKEN_DEBUGLEVEL = 451, // "debuglevel"
TOKEN_SEVERITY = 452, // "severity" TOKEN_SEVERITY = 452, // "severity"
@ -933,7 +933,7 @@ namespace isc { namespace dhcp {
S_IP_RESERVATIONS_UNIQUE = 191, // "ip-reservations-unique" S_IP_RESERVATIONS_UNIQUE = 191, // "ip-reservations-unique"
S_RESERVATIONS_LOOKUP_FIRST = 192, // "reservations-lookup-first" S_RESERVATIONS_LOOKUP_FIRST = 192, // "reservations-lookup-first"
S_LOGGERS = 193, // "loggers" S_LOGGERS = 193, // "loggers"
S_OUTPUT_OPTIONS = 194, // "output_options" S_OUTPUT_OPTIONS = 194, // "output-options"
S_OUTPUT = 195, // "output" S_OUTPUT = 195, // "output"
S_DEBUGLEVEL = 196, // "debuglevel" S_DEBUGLEVEL = 196, // "debuglevel"
S_SEVERITY = 197, // "severity" S_SEVERITY = 197, // "severity"

6
src/bin/dhcp4/dhcp4_parser.yy
View File

@ -259,7 +259,7 @@ using namespace std;
RESERVATIONS_LOOKUP_FIRST "reservations-lookup-first" RESERVATIONS_LOOKUP_FIRST "reservations-lookup-first"
LOGGERS "loggers" LOGGERS "loggers"
OUTPUT_OPTIONS "output_options" OUTPUT_OPTIONS "output-options"
OUTPUT "output" OUTPUT "output"
DEBUGLEVEL "debuglevel" DEBUGLEVEL "debuglevel"
SEVERITY "severity" SEVERITY "severity"
@ -2906,9 +2906,9 @@ severity: SEVERITY {
}; };
output_options_list: OUTPUT_OPTIONS { output_options_list: OUTPUT_OPTIONS {
ctx.unique("output_options", ctx.loc2pos(@1)); ctx.unique("output-options", ctx.loc2pos(@1));
ElementPtr l(new ListElement(ctx.loc2pos(@1))); ElementPtr l(new ListElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET {

2
src/bin/dhcp4/parser_context.h
View File

@ -314,7 +314,7 @@ public:
/// Used while parsing Dhcp4/loggers structures. /// Used while parsing Dhcp4/loggers structures.
LOGGERS, LOGGERS,
/// Used while parsing Dhcp4/loggers/output_options structures. /// Used while parsing Dhcp4/loggers/output-options structures.
OUTPUT_OPTIONS, OUTPUT_OPTIONS,
/// Used while parsing Dhcp4/dhcp-ddns. /// Used while parsing Dhcp4/dhcp-ddns.

4
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
View File

@ -790,7 +790,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configSet) {
" ,\"loggers\": [ { \n" " ,\"loggers\": [ { \n"
" \"name\": \"kea\", \n" " \"name\": \"kea\", \n"
" \"severity\": \"FATAL\", \n" " \"severity\": \"FATAL\", \n"
" \"output_options\": [{ \n" " \"output-options\": [{ \n"
" \"output\": \"/dev/null\" \n" " \"output\": \"/dev/null\" \n"
" }] \n" " }] \n"
" }] \n"; " }] \n";
@ -1005,7 +1005,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configTest) {
" ,\"loggers\": [ { \n" " ,\"loggers\": [ { \n"
" \"name\": \"kea\", \n" " \"name\": \"kea\", \n"
" \"severity\": \"FATAL\", \n" " \"severity\": \"FATAL\", \n"
" \"output_options\": [{ \n" " \"output-options\": [{ \n"
" \"output\": \"/dev/null\" \n" " \"output\": \"/dev/null\" \n"
" }] \n" " }] \n"
" }] \n"; " }] \n";

12
src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
View File

@ -56,7 +56,7 @@ CONFIG="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp4\", \"name\": \"kea-dhcp4\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -92,7 +92,7 @@ CONFIG_BAD_SYNTAX="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp4\", \"name\": \"kea-dhcp4\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -128,7 +128,7 @@ CONFIG_BAD_VALUES="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp4\", \"name\": \"kea-dhcp4\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -164,7 +164,7 @@ CONFIG_INVALID="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp4\", \"name\": \"kea-dhcp4\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -216,7 +216,7 @@ INVALID_CONFIG_HOOKS_LOAD="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp4\", \"name\": \"kea-dhcp4\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -268,7 +268,7 @@ INVALID_CONFIG_HOOKS_CALLOUT_FAIL="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp4\", \"name\": \"kea-dhcp4\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }

6
src/bin/dhcp4/tests/parser_unittest.cc
View File

@ -241,7 +241,7 @@ TEST(ParserTest, embbededComments) {
testParser(txt, Parser4Context::PARSER_DHCP4, false); testParser(txt, Parser4Context::PARSER_DHCP4, false);
} }
// Test that output-options is an alias of output_options. // Test that output_options is an alias of output-options.
TEST(ParserTest, outputDashOptions) { TEST(ParserTest, outputDashOptions) {
string txt = "{ \"Dhcp4\": { \"interfaces-config\": {" string txt = "{ \"Dhcp4\": { \"interfaces-config\": {"
" \"interfaces\": [ \"*\" ]" " \"interfaces\": [ \"*\" ]"
@ -251,7 +251,7 @@ TEST(ParserTest, outputDashOptions) {
"\"valid-lifetime\": 4000,\n" "\"valid-lifetime\": 4000,\n"
"\"loggers\": [ { " "\"loggers\": [ { "
" \"name\": \"kea-dhcp4\"," " \"name\": \"kea-dhcp4\","
" \"output-options\": [ { \"output\": \"stdout\" } ]," " \"output_options\": [ { \"output\": \"stdout\" } ],"
" \"severity\": \"INFO\" } ]\n" " \"severity\": \"INFO\" } ]\n"
"} }"; "} }";
testParser(txt, Parser4Context::PARSER_DHCP4, false); testParser(txt, Parser4Context::PARSER_DHCP4, false);
@ -950,7 +950,7 @@ TEST_F(TrailingCommasTest, tests) {
{ {
"debuglevel": 99, "debuglevel": 99,
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
"output": "stdout", "output": "stdout",
}, },

8
src/bin/dhcp6/dhcp6_parser.cc
View File

@ -4760,16 +4760,16 @@ namespace isc { namespace dhcp {
case 869: // $@137: %empty case 869: // $@137: %empty
#line 3054 "dhcp6_parser.yy" #line 3054 "dhcp6_parser.yy"
{ {
ctx.unique("output_options", ctx.loc2pos(yystack_[0].location)); ctx.unique("output-options", ctx.loc2pos(yystack_[0].location));
ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} }
#line 4770 "dhcp6_parser.cc" #line 4770 "dhcp6_parser.cc"
break; break;
case 870: // output_options_list: "output_options" $@137 ":" "[" output_options_list_content "]" case 870: // output_options_list: "output-options" $@137 ":" "[" output_options_list_content "]"
#line 3060 "dhcp6_parser.yy" #line 3060 "dhcp6_parser.yy"
{ {
ctx.stack_.pop_back(); ctx.stack_.pop_back();
@ -6363,7 +6363,7 @@ namespace isc { namespace dhcp {
"\"when-not-present\"", "\"hostname-char-set\"", "\"when-not-present\"", "\"hostname-char-set\"",
"\"hostname-char-replacement\"", "\"early-global-reservations-lookup\"", "\"hostname-char-replacement\"", "\"early-global-reservations-lookup\"",
"\"ip-reservations-unique\"", "\"reservations-lookup-first\"", "\"ip-reservations-unique\"", "\"reservations-lookup-first\"",
"\"loggers\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", "\"loggers\"", "\"output-options\"", "\"output\"", "\"debuglevel\"",
"\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"",
"\"compatibility\"", "\"lenient-option-parsing\"", "TOPLEVEL_JSON", "\"compatibility\"", "\"lenient-option-parsing\"", "TOPLEVEL_JSON",
"TOPLEVEL_DHCP6", "SUB_DHCP6", "SUB_INTERFACES6", "SUB_SUBNET6", "TOPLEVEL_DHCP6", "SUB_DHCP6", "SUB_INTERFACES6", "SUB_SUBNET6",

4
src/bin/dhcp6/dhcp6_parser.h
View File

@ -697,7 +697,7 @@ namespace isc { namespace dhcp {
TOKEN_IP_RESERVATIONS_UNIQUE = 453, // "ip-reservations-unique" TOKEN_IP_RESERVATIONS_UNIQUE = 453, // "ip-reservations-unique"
TOKEN_RESERVATIONS_LOOKUP_FIRST = 454, // "reservations-lookup-first" TOKEN_RESERVATIONS_LOOKUP_FIRST = 454, // "reservations-lookup-first"
TOKEN_LOGGERS = 455, // "loggers" TOKEN_LOGGERS = 455, // "loggers"
TOKEN_OUTPUT_OPTIONS = 456, // "output_options" TOKEN_OUTPUT_OPTIONS = 456, // "output-options"
TOKEN_OUTPUT = 457, // "output" TOKEN_OUTPUT = 457, // "output"
TOKEN_DEBUGLEVEL = 458, // "debuglevel" TOKEN_DEBUGLEVEL = 458, // "debuglevel"
TOKEN_SEVERITY = 459, // "severity" TOKEN_SEVERITY = 459, // "severity"
@ -944,7 +944,7 @@ namespace isc { namespace dhcp {
S_IP_RESERVATIONS_UNIQUE = 198, // "ip-reservations-unique" S_IP_RESERVATIONS_UNIQUE = 198, // "ip-reservations-unique"
S_RESERVATIONS_LOOKUP_FIRST = 199, // "reservations-lookup-first" S_RESERVATIONS_LOOKUP_FIRST = 199, // "reservations-lookup-first"
S_LOGGERS = 200, // "loggers" S_LOGGERS = 200, // "loggers"
S_OUTPUT_OPTIONS = 201, // "output_options" S_OUTPUT_OPTIONS = 201, // "output-options"
S_OUTPUT = 202, // "output" S_OUTPUT = 202, // "output"
S_DEBUGLEVEL = 203, // "debuglevel" S_DEBUGLEVEL = 203, // "debuglevel"
S_SEVERITY = 204, // "severity" S_SEVERITY = 204, // "severity"

6
src/bin/dhcp6/dhcp6_parser.yy
View File

@ -266,7 +266,7 @@ using namespace std;
RESERVATIONS_LOOKUP_FIRST "reservations-lookup-first" RESERVATIONS_LOOKUP_FIRST "reservations-lookup-first"
LOGGERS "loggers" LOGGERS "loggers"
OUTPUT_OPTIONS "output_options" OUTPUT_OPTIONS "output-options"
OUTPUT "output" OUTPUT "output"
DEBUGLEVEL "debuglevel" DEBUGLEVEL "debuglevel"
SEVERITY "severity" SEVERITY "severity"
@ -3052,9 +3052,9 @@ severity: SEVERITY {
}; };
output_options_list: OUTPUT_OPTIONS { output_options_list: OUTPUT_OPTIONS {
ctx.unique("output_options", ctx.loc2pos(@1)); ctx.unique("output-options", ctx.loc2pos(@1));
ElementPtr l(new ListElement(ctx.loc2pos(@1))); ElementPtr l(new ListElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET {

2
src/bin/dhcp6/parser_context.h
View File

@ -320,7 +320,7 @@ public:
/// Used while parsing Dhcp6/loggers structures. /// Used while parsing Dhcp6/loggers structures.
LOGGERS, LOGGERS,
/// Used while parsing Dhcp6/loggers/output_options structures. /// Used while parsing Dhcp6/loggers/output-options structures.
OUTPUT_OPTIONS, OUTPUT_OPTIONS,
/// Used while parsing Dhcp6/dhcp-ddns. /// Used while parsing Dhcp6/dhcp-ddns.

4
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
View File

@ -703,7 +703,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configSet) {
" ,\"loggers\": [ { \n" " ,\"loggers\": [ { \n"
" \"name\": \"kea\", \n" " \"name\": \"kea\", \n"
" \"severity\": \"FATAL\", \n" " \"severity\": \"FATAL\", \n"
" \"output_options\": [{ \n" " \"output-options\": [{ \n"
" \"output\": \"/dev/null\" \n" " \"output\": \"/dev/null\" \n"
" }] \n" " }] \n"
" }] \n"; " }] \n";
@ -919,7 +919,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configTest) {
" ,\"loggers\": [ { \n" " ,\"loggers\": [ { \n"
" \"name\": \"kea\", \n" " \"name\": \"kea\", \n"
" \"severity\": \"FATAL\", \n" " \"severity\": \"FATAL\", \n"
" \"output_options\": [{ \n" " \"output-options\": [{ \n"
" \"output\": \"/dev/null\" \n" " \"output\": \"/dev/null\" \n"
" }] \n" " }] \n"
" }] \n"; " }] \n";

10
src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
View File

@ -61,7 +61,7 @@ CONFIG="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp6\", \"name\": \"kea-dhcp6\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -98,7 +98,7 @@ CONFIG_BAD_SYNTAX="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp6\", \"name\": \"kea-dhcp6\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -135,7 +135,7 @@ CONFIG_INVALID="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp6\", \"name\": \"kea-dhcp6\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -228,7 +228,7 @@ INVALID_CONFIG_HOOKS_LOAD="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp6\", \"name\": \"kea-dhcp6\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -285,7 +285,7 @@ INVALID_CONFIG_HOOKS_CALLOUT_FAIL="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp6\", \"name\": \"kea-dhcp6\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }

6
src/bin/dhcp6/tests/parser_unittest.cc
View File

@ -246,7 +246,7 @@ TEST(ParserTest, embbededComments) {
testParser(txt, Parser6Context::PARSER_DHCP6, false); testParser(txt, Parser6Context::PARSER_DHCP6, false);
} }
// Test that output-options is an alias of output_options. // Test that output_options is an alias of output-options.
TEST(ParserTest, outputDashOptions) { TEST(ParserTest, outputDashOptions) {
string txt = "{ \"Dhcp6\": { \"interfaces-config\": {" string txt = "{ \"Dhcp6\": { \"interfaces-config\": {"
" \"interfaces\": [ \"*\" ]" " \"interfaces\": [ \"*\" ]"
@ -257,7 +257,7 @@ TEST(ParserTest, outputDashOptions) {
"\"valid-lifetime\": 4000,\n" "\"valid-lifetime\": 4000,\n"
"\"loggers\": [ { " "\"loggers\": [ { "
" \"name\": \"kea-dhcp6\"," " \"name\": \"kea-dhcp6\","
" \"output-options\": [ { \"output\": \"stdout\" } ]," " \"output_options\": [ { \"output\": \"stdout\" } ],"
" \"severity\": \"INFO\" } ]\n" " \"severity\": \"INFO\" } ]\n"
"} }"; "} }";
testParser(txt, Parser6Context::PARSER_DHCP6, false); testParser(txt, Parser6Context::PARSER_DHCP6, false);
@ -941,7 +941,7 @@ TEST_F(TrailingCommasTest, tests) {
{ {
"debuglevel": 99, "debuglevel": 99,
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
"output": "stdout", "output": "stdout",
}, },

2
src/bin/keactrl/kea-ctrl-agent.conf.pre
View File

@ -64,7 +64,7 @@
{ {
// This specifies the logging for Control Agent daemon. // This specifies the logging for Control Agent daemon.
"name": "kea-ctrl-agent", "name": "kea-ctrl-agent",
"output_options": [ "output-options": [
{ {
// Specifies the output file. There are several special values // Specifies the output file. There are several special values
// supported: // supported:

2
src/bin/keactrl/kea-dhcp-ddns.conf.pre
View File

@ -35,7 +35,7 @@
{ {
// This specifies the logging for D2 (DHCP-DDNS) daemon. // This specifies the logging for D2 (DHCP-DDNS) daemon.
"name": "kea-dhcp-ddns", "name": "kea-dhcp-ddns",
"output_options": [ "output-options": [
{ {
// Specifies the output file. There are several special values // Specifies the output file. There are several special values
// supported: // supported:

2
src/bin/keactrl/kea-dhcp4.conf.pre
View File

@ -427,7 +427,7 @@
// component. It tells DHCPv4 server to write all log messages (on // component. It tells DHCPv4 server to write all log messages (on
// severity INFO or more) to a file. // severity INFO or more) to a file.
"name": "kea-dhcp4", "name": "kea-dhcp4",
"output_options": [ "output-options": [
{ {
// Specifies the output file. There are several special values // Specifies the output file. There are several special values
// supported: // supported:

2
src/bin/keactrl/kea-dhcp6.conf.pre
View File

@ -386,7 +386,7 @@
// This specifies the logging for kea-dhcp6 logger, i.e. all logs // This specifies the logging for kea-dhcp6 logger, i.e. all logs
// generated by Kea DHCPv6 server. // generated by Kea DHCPv6 server.
"name": "kea-dhcp6", "name": "kea-dhcp6",
"output_options": [ "output-options": [
{ {
// Specifies the output file. There are several special values // Specifies the output file. There are several special values
// supported: // supported:

2
src/bin/keactrl/kea-netconf.conf.pre
View File

@ -60,7 +60,7 @@
{ {
// This specifies the logging for Netconf daemon. // This specifies the logging for Netconf daemon.
"name": "kea-netconf", "name": "kea-netconf",
"output_options": [ "output-options": [
{ {
// Specifies the output file. There are several special values // Specifies the output file. There are several special values
// supported: // supported:

10
src/bin/keactrl/tests/keactrl_tests.sh.in
View File

@ -92,7 +92,7 @@ dhcp4_config="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp4\", \"name\": \"kea-dhcp4\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -131,7 +131,7 @@ dhcp6_config="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp6\", \"name\": \"kea-dhcp6\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -154,7 +154,7 @@ dhcp_ddns_config="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-dhcp-ddns\", \"name\": \"kea-dhcp-ddns\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -173,7 +173,7 @@ control_agent_config="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-ctrl-agent\", \"name\": \"kea-ctrl-agent\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }
@ -190,7 +190,7 @@ netconf_config="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-netconf\", \"name\": \"kea-netconf\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }

8
src/bin/netconf/netconf_parser.cc
View File

@ -1498,16 +1498,16 @@ namespace isc { namespace netconf {
case 155: // $@29: %empty case 155: // $@29: %empty
#line 680 "netconf_parser.yy" #line 680 "netconf_parser.yy"
{ {
ctx.unique("output_options", ctx.loc2pos(yystack_[0].location)); ctx.unique("output-options", ctx.loc2pos(yystack_[0].location));
ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} }
#line 1508 "netconf_parser.cc" #line 1508 "netconf_parser.cc"
break; break;
case 156: // output_options_list: "output_options" $@29 ":" "[" output_options_list_content "]" case 156: // output_options_list: "output-options" $@29 ":" "[" output_options_list_content "]"
#line 686 "netconf_parser.yy" #line 686 "netconf_parser.yy"
{ {
ctx.stack_.pop_back(); ctx.stack_.pop_back();
@ -2221,7 +2221,7 @@ namespace isc { namespace netconf {
"\"control-socket\"", "\"socket-type\"", "\"unix\"", "\"http\"", "\"control-socket\"", "\"socket-type\"", "\"unix\"", "\"http\"",
"\"stdout\"", "\"socket-name\"", "\"socket-url\"", "\"hooks-libraries\"", "\"stdout\"", "\"socket-name\"", "\"socket-url\"", "\"hooks-libraries\"",
"\"library\"", "\"parameters\"", "\"loggers\"", "\"name\"", "\"library\"", "\"parameters\"", "\"loggers\"", "\"name\"",
"\"output_options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", "\"output-options\"", "\"output\"", "\"debuglevel\"", "\"severity\"",
"\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "START_JSON", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "START_JSON",
"START_NETCONF", "START_SUB_NETCONF", "\"constant string\"", "START_NETCONF", "START_SUB_NETCONF", "\"constant string\"",
"\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start",

4
src/bin/netconf/netconf_parser.h
View File

@ -526,7 +526,7 @@ namespace isc { namespace netconf {
TOKEN_PARAMETERS = 286, // "parameters" TOKEN_PARAMETERS = 286, // "parameters"
TOKEN_LOGGERS = 287, // "loggers" TOKEN_LOGGERS = 287, // "loggers"
TOKEN_NAME = 288, // "name" TOKEN_NAME = 288, // "name"
TOKEN_OUTPUT_OPTIONS = 289, // "output_options" TOKEN_OUTPUT_OPTIONS = 289, // "output-options"
TOKEN_OUTPUT = 290, // "output" TOKEN_OUTPUT = 290, // "output"
TOKEN_DEBUGLEVEL = 291, // "debuglevel" TOKEN_DEBUGLEVEL = 291, // "debuglevel"
TOKEN_SEVERITY = 292, // "severity" TOKEN_SEVERITY = 292, // "severity"
@ -593,7 +593,7 @@ namespace isc { namespace netconf {
S_PARAMETERS = 31, // "parameters" S_PARAMETERS = 31, // "parameters"
S_LOGGERS = 32, // "loggers" S_LOGGERS = 32, // "loggers"
S_NAME = 33, // "name" S_NAME = 33, // "name"
S_OUTPUT_OPTIONS = 34, // "output_options" S_OUTPUT_OPTIONS = 34, // "output-options"
S_OUTPUT = 35, // "output" S_OUTPUT = 35, // "output"
S_DEBUGLEVEL = 36, // "debuglevel" S_DEBUGLEVEL = 36, // "debuglevel"
S_SEVERITY = 37, // "severity" S_SEVERITY = 37, // "severity"

6
src/bin/netconf/netconf_parser.yy
View File

@ -85,7 +85,7 @@ using namespace std;
LOGGERS "loggers" LOGGERS "loggers"
NAME "name" NAME "name"
OUTPUT_OPTIONS "output_options" OUTPUT_OPTIONS "output-options"
OUTPUT "output" OUTPUT "output"
DEBUGLEVEL "debuglevel" DEBUGLEVEL "debuglevel"
SEVERITY "severity" SEVERITY "severity"
@ -678,9 +678,9 @@ severity: SEVERITY {
}; };
output_options_list: OUTPUT_OPTIONS { output_options_list: OUTPUT_OPTIONS {
ctx.unique("output_options", ctx.loc2pos(@1)); ctx.unique("output-options", ctx.loc2pos(@1));
ElementPtr l(new ListElement(ctx.loc2pos(@1))); ElementPtr l(new ListElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("output_options", l); ctx.stack_.back()->set("output-options", l);
ctx.stack_.push_back(l); ctx.stack_.push_back(l);
ctx.enter(ctx.OUTPUT_OPTIONS); ctx.enter(ctx.OUTPUT_OPTIONS);
} COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET {

2
src/bin/netconf/parser_context.h
View File

@ -222,7 +222,7 @@ public:
///< Used while parsing Netconf/loggers structures. ///< Used while parsing Netconf/loggers structures.
LOGGERS, LOGGERS,
///< Used while parsing Netconf/loggers/output_options structures. ///< Used while parsing Netconf/loggers/output-options structures.
OUTPUT_OPTIONS OUTPUT_OPTIONS
} LexerContext; } LexerContext;

4
src/bin/netconf/tests/parser_unittests.cc
View File

@ -344,12 +344,12 @@ TEST(ParserTest, embbededComments) {
testParser(txt, ParserContext::PARSER_NETCONF, false); testParser(txt, ParserContext::PARSER_NETCONF, false);
} }
// Test that output-options is an alias of output_options. // Test that output_options is an alias of output-options.
TEST(ParserTest, outputDashOptions) { TEST(ParserTest, outputDashOptions) {
string txt= "{ \"Netconf\": {" string txt= "{ \"Netconf\": {"
" \"loggers\": [ { " " \"loggers\": [ { "
" \"name\": \"kea-netconf\"," " \"name\": \"kea-netconf\","
" \"output-options\": [ { \"output\": \"stdout\" } ]," " \"output_options\": [ { \"output\": \"stdout\" } ],"
" \"severity\": \"INFO\" } ]" " \"severity\": \"INFO\" } ]"
"} }"; "} }";
testParser(txt, ParserContext::PARSER_NETCONF, false); testParser(txt, ParserContext::PARSER_NETCONF, false);

2
src/bin/netconf/tests/shtests/netconf_tests.sh.in
View File

@ -35,7 +35,7 @@ CONFIG="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-netconf\", \"name\": \"kea-netconf\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }

2
src/bin/shell/tests/basic_auth_tests.sh.in
View File

@ -43,7 +43,7 @@ CONFIG="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-ctrl-agent\", \"name\": \"kea-ctrl-agent\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }

2
src/bin/shell/tests/shell_process_tests.sh.in
View File

@ -32,7 +32,7 @@ CONFIG="{
\"loggers\": [ \"loggers\": [
{ {
\"name\": \"kea-ctrl-agent\", \"name\": \"kea-ctrl-agent\",
\"output_options\": [ \"output-options\": [
{ {
\"output\": \"$LOG_FILE\" \"output\": \"$LOG_FILE\"
} }

Some files were not shown because too many files have changed in this diff Show More