diff options
111 files changed, 196 insertions, 196 deletions
diff --git a/doc/examples/agent/simple.json b/doc/examples/agent/simple.json index a7227de04f..5e82b99530 100644 --- a/doc/examples/agent/simple.json +++ b/doc/examples/agent/simple.json @@ -126,7 +126,7 @@ "loggers": [ { "name": "kea-ctrl-agent", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-ctrl-agent.log", // Several additional parameters are possible in addition diff --git a/doc/examples/ddns/all-keys-netconf.json b/doc/examples/ddns/all-keys-netconf.json index 2ea6fad859..642258dc35 100644 --- a/doc/examples/ddns/all-keys-netconf.json +++ b/doc/examples/ddns/all-keys-netconf.json @@ -152,7 +152,7 @@ "name": "kea-dhcp-ddns", // Configures how the log should be output. - "output_options": [ + "output-options": [ { // Determines whether the log should be flushed to a file. "flush": true, diff --git a/doc/examples/ddns/all-keys.json b/doc/examples/ddns/all-keys.json index 674c9860cf..6907d178fe 100644 --- a/doc/examples/ddns/all-keys.json +++ b/doc/examples/ddns/all-keys.json @@ -152,7 +152,7 @@ "name": "kea-dhcp-ddns", // Configures how the log should be output. - "output_options": [ + "output-options": [ { // Determines whether the log should be flushed to a file. "flush": true, diff --git a/doc/examples/ddns/sample1.json b/doc/examples/ddns/sample1.json index 7ff4960c9a..4c8190ea03 100644 --- a/doc/examples/ddns/sample1.json +++ b/doc/examples/ddns/sample1.json @@ -148,7 +148,7 @@ "loggers": [ { "name": "kea-dhcp-ddns", - "output_options": [ + "output-options": [ { "output": "stdout", // Several additional parameters are possible in addition diff --git a/doc/examples/kea4/advanced.json b/doc/examples/kea4/advanced.json index 9191226aaf..16a949831f 100644 --- a/doc/examples/kea4/advanced.json +++ b/doc/examples/kea4/advanced.json @@ -184,7 +184,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout", // Several additional parameters are possible in addition diff --git a/doc/examples/kea4/all-keys-netconf.json b/doc/examples/kea4/all-keys-netconf.json index 022eb0f214..c5cf9036f4 100644 --- a/doc/examples/kea4/all-keys-netconf.json +++ b/doc/examples/kea4/all-keys-netconf.json @@ -1211,7 +1211,7 @@ "name": "kea-dhcp4", // Configures how the log should be output. - "output_options": [ + "output-options": [ { // Determines whether the log should be flushed to a file. "flush": true, diff --git a/doc/examples/kea4/all-keys.json b/doc/examples/kea4/all-keys.json index db647dcbcd..4334c25eb8 100644 --- a/doc/examples/kea4/all-keys.json +++ b/doc/examples/kea4/all-keys.json @@ -1239,7 +1239,7 @@ "name": "kea-dhcp4", // Configures how the log should be output. - "output_options": [ + "output-options": [ { // Determines whether the log should be flushed to a file. "flush": true, diff --git a/doc/examples/kea4/backends.json b/doc/examples/kea4/backends.json index d8e037bdae..e7c1a48b3b 100644 --- a/doc/examples/kea4/backends.json +++ b/doc/examples/kea4/backends.json @@ -92,7 +92,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/classify.json b/doc/examples/kea4/classify.json index 47bbdcbc1b..9af06d8377 100644 --- a/doc/examples/kea4/classify.json +++ b/doc/examples/kea4/classify.json @@ -134,7 +134,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/classify2.json b/doc/examples/kea4/classify2.json index ec9d58b7ff..3bb48d20b2 100644 --- a/doc/examples/kea4/classify2.json +++ b/doc/examples/kea4/classify2.json @@ -167,7 +167,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/config-backend.json b/doc/examples/kea4/config-backend.json index 272243a1ff..82d36fb041 100644 --- a/doc/examples/kea4/config-backend.json +++ b/doc/examples/kea4/config-backend.json @@ -78,7 +78,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/dhcpv4-over-dhcpv6.json b/doc/examples/kea4/dhcpv4-over-dhcpv6.json index a2b3d43fb8..c622c4225e 100644 --- a/doc/examples/kea4/dhcpv4-over-dhcpv6.json +++ b/doc/examples/kea4/dhcpv4-over-dhcpv6.json @@ -34,7 +34,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "/tmp/kea-dhcp4.log" } diff --git a/doc/examples/kea4/global-reservations.json b/doc/examples/kea4/global-reservations.json index 8171eb50cf..37cba508f5 100644 --- a/doc/examples/kea4/global-reservations.json +++ b/doc/examples/kea4/global-reservations.json @@ -165,7 +165,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/ha-load-balancing-server1-mt-with-tls.json b/doc/examples/kea4/ha-load-balancing-server1-mt-with-tls.json index 5e6802647c..91912169f0 100644 --- a/doc/examples/kea4/ha-load-balancing-server1-mt-with-tls.json +++ b/doc/examples/kea4/ha-load-balancing-server1-mt-with-tls.json @@ -259,7 +259,7 @@ // component. It tells DHCPv4 server to write all log messages (on // severity INFO or more) to a file. "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } @@ -271,7 +271,7 @@ // This section specifies configuration of the HA hook library-specific // logger. "name": "kea-dhcp4.ha-hooks", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/ha-load-balancing-server2-mt.json b/doc/examples/kea4/ha-load-balancing-server2-mt.json index ddfadb0cfd..ab31cfa692 100644 --- a/doc/examples/kea4/ha-load-balancing-server2-mt.json +++ b/doc/examples/kea4/ha-load-balancing-server2-mt.json @@ -242,7 +242,7 @@ // component. It tells DHCPv4 server to write all log messages (on // severity INFO or more) to a file. "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } @@ -254,7 +254,7 @@ // This section specifies configuration of the HA hook library-specific // logger. "name": "kea-dhcp4.ha-hooks", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/leases-expiration.json b/doc/examples/kea4/leases-expiration.json index 629b12654b..427eb40061 100644 --- a/doc/examples/kea4/leases-expiration.json +++ b/doc/examples/kea4/leases-expiration.json @@ -63,7 +63,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/multiple-options.json b/doc/examples/kea4/multiple-options.json index 8252d503b8..d8495b00c7 100644 --- a/doc/examples/kea4/multiple-options.json +++ b/doc/examples/kea4/multiple-options.json @@ -174,7 +174,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/mysql-reservations.json b/doc/examples/kea4/mysql-reservations.json index c44c463542..e8c0c22e1a 100644 --- a/doc/examples/kea4/mysql-reservations.json +++ b/doc/examples/kea4/mysql-reservations.json @@ -90,7 +90,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/pgsql-reservations.json b/doc/examples/kea4/pgsql-reservations.json index 7d9bd669ba..6941fd00b9 100644 --- a/doc/examples/kea4/pgsql-reservations.json +++ b/doc/examples/kea4/pgsql-reservations.json @@ -88,7 +88,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/reservations.json b/doc/examples/kea4/reservations.json index 58070bf3b4..da44c1b4bc 100644 --- a/doc/examples/kea4/reservations.json +++ b/doc/examples/kea4/reservations.json @@ -170,7 +170,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/several-subnets.json b/doc/examples/kea4/several-subnets.json index bcdf3a70ee..6a9e1f557f 100644 --- a/doc/examples/kea4/several-subnets.json +++ b/doc/examples/kea4/several-subnets.json @@ -73,7 +73,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/single-subnet.json b/doc/examples/kea4/single-subnet.json index 49457fecb0..4a2880ba1b 100644 --- a/doc/examples/kea4/single-subnet.json +++ b/doc/examples/kea4/single-subnet.json @@ -47,7 +47,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea4/with-ddns.json b/doc/examples/kea4/with-ddns.json index 9d06cd3bf4..f479c57715 100644 --- a/doc/examples/kea4/with-ddns.json +++ b/doc/examples/kea4/with-ddns.json @@ -72,7 +72,7 @@ "loggers": [ { "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/advanced.json b/doc/examples/kea6/advanced.json index 995f693715..02ff310f9c 100644 --- a/doc/examples/kea6/advanced.json +++ b/doc/examples/kea6/advanced.json @@ -164,7 +164,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout", // Several additional parameters are possible in addition diff --git a/doc/examples/kea6/all-keys-netconf.json b/doc/examples/kea6/all-keys-netconf.json index 4d8a1b04a8..e9254aa04d 100644 --- a/doc/examples/kea6/all-keys-netconf.json +++ b/doc/examples/kea6/all-keys-netconf.json @@ -1185,7 +1185,7 @@ "name": "kea-dhcp6", // Configures how the log should be output. - "output_options": [ + "output-options": [ { // Determines whether the log should be flushed to a file. "flush": true, diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json index 82fa9c81ab..fac0218af5 100644 --- a/doc/examples/kea6/all-keys.json +++ b/doc/examples/kea6/all-keys.json @@ -1213,7 +1213,7 @@ "name": "kea-dhcp6", // Configures how the log should be output. - "output_options": [ + "output-options": [ { // Determines whether the log should be flushed to a file. "flush": true, diff --git a/doc/examples/kea6/backends.json b/doc/examples/kea6/backends.json index 52ed3ec599..df1072cfb1 100644 --- a/doc/examples/kea6/backends.json +++ b/doc/examples/kea6/backends.json @@ -93,7 +93,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/classify.json b/doc/examples/kea6/classify.json index 796926c683..41c2a2d9f3 100644 --- a/doc/examples/kea6/classify.json +++ b/doc/examples/kea6/classify.json @@ -99,7 +99,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/classify2.json b/doc/examples/kea6/classify2.json index ffdf32d808..78542f48ad 100644 --- a/doc/examples/kea6/classify2.json +++ b/doc/examples/kea6/classify2.json @@ -136,7 +136,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/config-backend.json b/doc/examples/kea6/config-backend.json index 4793ee2e0d..d269f3f120 100644 --- a/doc/examples/kea6/config-backend.json +++ b/doc/examples/kea6/config-backend.json @@ -78,7 +78,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/dhcpv4-over-dhcpv6.json b/doc/examples/kea6/dhcpv4-over-dhcpv6.json index f09a18c50b..56e371e3ce 100644 --- a/doc/examples/kea6/dhcpv4-over-dhcpv6.json +++ b/doc/examples/kea6/dhcpv4-over-dhcpv6.json @@ -44,7 +44,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "/tmp/kea-dhcp6.log" } diff --git a/doc/examples/kea6/dnr.json b/doc/examples/kea6/dnr.json index e902f5f209..48893f765d 100644 --- a/doc/examples/kea6/dnr.json +++ b/doc/examples/kea6/dnr.json @@ -73,7 +73,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/duid.json b/doc/examples/kea6/duid.json index 0bc3753d11..223d4c3021 100644 --- a/doc/examples/kea6/duid.json +++ b/doc/examples/kea6/duid.json @@ -66,7 +66,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/global-reservations.json b/doc/examples/kea6/global-reservations.json index 59cc873cd4..b98b3e0ede 100644 --- a/doc/examples/kea6/global-reservations.json +++ b/doc/examples/kea6/global-reservations.json @@ -160,7 +160,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/ha-hot-standby-server1-with-tls.json b/doc/examples/kea6/ha-hot-standby-server1-with-tls.json index 3a586f9c16..9fab5429c9 100644 --- a/doc/examples/kea6/ha-hot-standby-server1-with-tls.json +++ b/doc/examples/kea6/ha-hot-standby-server1-with-tls.json @@ -144,7 +144,7 @@ // component. It tells DHCPv6 server to write all log messages (on // severity INFO or more) to a file. "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } @@ -156,7 +156,7 @@ // This section specifies configuration of the HA hook library-specific // logger. "name": "kea-dhcp6.ha-hooks", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/ha-hot-standby-server2.json b/doc/examples/kea6/ha-hot-standby-server2.json index 43c751bf12..6a9a680ed9 100644 --- a/doc/examples/kea6/ha-hot-standby-server2.json +++ b/doc/examples/kea6/ha-hot-standby-server2.json @@ -135,7 +135,7 @@ // component. It tells DHCPv6 server to write all log messages (on // severity INFO or more) to a file. "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } @@ -147,7 +147,7 @@ // This section specifies configuration of the HA hook library-specific // logger. "name": "kea-dhcp6.ha-hooks", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/leases-expiration.json b/doc/examples/kea6/leases-expiration.json index 46a410ff3a..d70b7631a9 100644 --- a/doc/examples/kea6/leases-expiration.json +++ b/doc/examples/kea6/leases-expiration.json @@ -71,7 +71,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/multiple-options.json b/doc/examples/kea6/multiple-options.json index eae1d8e74b..03d83fea68 100644 --- a/doc/examples/kea6/multiple-options.json +++ b/doc/examples/kea6/multiple-options.json @@ -170,7 +170,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/mysql-reservations.json b/doc/examples/kea6/mysql-reservations.json index 74beb2c631..cc1acc3c69 100644 --- a/doc/examples/kea6/mysql-reservations.json +++ b/doc/examples/kea6/mysql-reservations.json @@ -87,7 +87,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/pgsql-reservations.json b/doc/examples/kea6/pgsql-reservations.json index 6c61019650..6da8d150d6 100644 --- a/doc/examples/kea6/pgsql-reservations.json +++ b/doc/examples/kea6/pgsql-reservations.json @@ -84,7 +84,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/reservations.json b/doc/examples/kea6/reservations.json index 95a0e9df1b..c793cb8c42 100644 --- a/doc/examples/kea6/reservations.json +++ b/doc/examples/kea6/reservations.json @@ -157,7 +157,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/several-subnets.json b/doc/examples/kea6/several-subnets.json index b32b56a3aa..063ddb4410 100644 --- a/doc/examples/kea6/several-subnets.json +++ b/doc/examples/kea6/several-subnets.json @@ -47,7 +47,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/simple.json b/doc/examples/kea6/simple.json index 06e51e93bf..3b6d3d518f 100644 --- a/doc/examples/kea6/simple.json +++ b/doc/examples/kea6/simple.json @@ -49,7 +49,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/softwire46.json b/doc/examples/kea6/softwire46.json index e04821f22f..bbc810c599 100644 --- a/doc/examples/kea6/softwire46.json +++ b/doc/examples/kea6/softwire46.json @@ -76,7 +76,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-debug.log" } diff --git a/doc/examples/kea6/tee-times.json b/doc/examples/kea6/tee-times.json index 5db9c98d57..e69cc09e86 100644 --- a/doc/examples/kea6/tee-times.json +++ b/doc/examples/kea6/tee-times.json @@ -59,7 +59,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/kea6/with-ddns.json b/doc/examples/kea6/with-ddns.json index cbddfc64be..4f2de1f5ac 100644 --- a/doc/examples/kea6/with-ddns.json +++ b/doc/examples/kea6/with-ddns.json @@ -75,7 +75,7 @@ "loggers": [ { "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout" } diff --git a/doc/examples/netconf/kea-dhcp6-operations/netconf.json b/doc/examples/netconf/kea-dhcp6-operations/netconf.json index 1a8cd2113a..653a40c7eb 100644 --- a/doc/examples/netconf/kea-dhcp6-operations/netconf.json +++ b/doc/examples/netconf/kea-dhcp6-operations/netconf.json @@ -17,7 +17,7 @@ [ { "name": "kea-netconf", - "output_options": + "output-options": [ { "output": "stderr" diff --git a/doc/examples/netconf/simple-dhcp4.json b/doc/examples/netconf/simple-dhcp4.json index 309badf862..887c673065 100644 --- a/doc/examples/netconf/simple-dhcp4.json +++ b/doc/examples/netconf/simple-dhcp4.json @@ -90,7 +90,7 @@ "loggers": [ { "name": "kea-netconf", - "output_options": [ + "output-options": [ { // "output": "/var/log/kea-netconf.log", "output": "stdout", diff --git a/doc/examples/netconf/simple-dhcp6.json b/doc/examples/netconf/simple-dhcp6.json index 91e57bece3..1829a44a2b 100644 --- a/doc/examples/netconf/simple-dhcp6.json +++ b/doc/examples/netconf/simple-dhcp6.json @@ -91,7 +91,7 @@ "loggers": [ { "name": "kea-netconf", - "output_options": [ + "output-options": [ { // "output": "/var/log/kea-netconf.log", "output": "stdout", diff --git a/doc/examples/template-ha-mt-tls/kea-ca-1.conf b/doc/examples/template-ha-mt-tls/kea-ca-1.conf index cec984bff5..765dd9cc21 100644 --- a/doc/examples/template-ha-mt-tls/kea-ca-1.conf +++ b/doc/examples/template-ha-mt-tls/kea-ca-1.conf @@ -65,7 +65,7 @@ "loggers": [ { "name": "kea-ctrl-agent", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-ctrl-agent.log", diff --git a/doc/examples/template-ha-mt-tls/kea-ca-2.conf b/doc/examples/template-ha-mt-tls/kea-ca-2.conf index 3835a49f48..72eb73b1b1 100644 --- a/doc/examples/template-ha-mt-tls/kea-ca-2.conf +++ b/doc/examples/template-ha-mt-tls/kea-ca-2.conf @@ -65,7 +65,7 @@ "loggers": [ { "name": "kea-ctrl-agent", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-ctrl-agent.log", diff --git a/doc/examples/template-ha-mt-tls/kea-dhcp4-1.conf b/doc/examples/template-ha-mt-tls/kea-dhcp4-1.conf index 5b4ae2fa1f..0dc11983e5 100644 --- a/doc/examples/template-ha-mt-tls/kea-dhcp4-1.conf +++ b/doc/examples/template-ha-mt-tls/kea-dhcp4-1.conf @@ -223,7 +223,7 @@ // 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. "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-dhcp4.log", "maxsize": 2048000, diff --git a/doc/examples/template-ha-mt-tls/kea-dhcp4-2.conf b/doc/examples/template-ha-mt-tls/kea-dhcp4-2.conf index f1b48ae4be..070569b2a7 100644 --- a/doc/examples/template-ha-mt-tls/kea-dhcp4-2.conf +++ b/doc/examples/template-ha-mt-tls/kea-dhcp4-2.conf @@ -223,7 +223,7 @@ // 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. "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-dhcp4.log", "maxsize": 2048000, diff --git a/doc/examples/template-power-user-home/kea-ca-1.conf b/doc/examples/template-power-user-home/kea-ca-1.conf index 04945c8a3e..9139008794 100644 --- a/doc/examples/template-power-user-home/kea-ca-1.conf +++ b/doc/examples/template-power-user-home/kea-ca-1.conf @@ -41,7 +41,7 @@ "loggers": [ { "name": "kea-ctrl-agent", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-ctrl-agent.log", diff --git a/doc/examples/template-power-user-home/kea-ca-2.conf b/doc/examples/template-power-user-home/kea-ca-2.conf index c876012aff..f36c850aba 100644 --- a/doc/examples/template-power-user-home/kea-ca-2.conf +++ b/doc/examples/template-power-user-home/kea-ca-2.conf @@ -41,7 +41,7 @@ "loggers": [ { "name": "kea-ctrl-agent", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-ctrl-agent.log", diff --git a/doc/examples/template-power-user-home/kea-dhcp4-1.conf b/doc/examples/template-power-user-home/kea-dhcp4-1.conf index 48b8c2eb86..d4a9d70560 100644 --- a/doc/examples/template-power-user-home/kea-dhcp4-1.conf +++ b/doc/examples/template-power-user-home/kea-dhcp4-1.conf @@ -212,7 +212,7 @@ // 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. "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-dhcp4.log", "maxsize": 2048000, diff --git a/doc/examples/template-power-user-home/kea-dhcp4-2.conf b/doc/examples/template-power-user-home/kea-dhcp4-2.conf index 29d8f4ca06..f75a99775e 100644 --- a/doc/examples/template-power-user-home/kea-dhcp4-2.conf +++ b/doc/examples/template-power-user-home/kea-dhcp4-2.conf @@ -212,7 +212,7 @@ // 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. "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "/var/log/kea-dhcp4.log", "maxsize": 2048000, diff --git a/src/bin/admin/tests/memfile_tests.sh.in b/src/bin/admin/tests/memfile_tests.sh.in index 9a71b87a16..ad10109d5f 100644 --- a/src/bin/admin/tests/memfile_tests.sh.in +++ b/src/bin/admin/tests/memfile_tests.sh.in @@ -121,7 +121,7 @@ memfile_init_test() { { "debuglevel": 99, "name": "kea-dhcpx", - "output_options": [ + "output-options": [ { "output": "@abs_top_builddir@/src/bin/admin/tests/kea.log" } diff --git a/src/bin/agent/agent_parser.cc b/src/bin/agent/agent_parser.cc index 9ec41583bf..d3090edcb2 100644 --- a/src/bin/agent/agent_parser.cc +++ b/src/bin/agent/agent_parser.cc @@ -1697,16 +1697,16 @@ namespace isc { namespace agent { case 185: // $@39: %empty #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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } #line 1707 "agent_parser.cc" 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" { ctx.stack_.pop_back(); @@ -2454,7 +2454,7 @@ namespace isc { namespace agent { "\"key-file\"", "\"cert-required\"", "\"control-sockets\"", "\"dhcp4\"", "\"dhcp6\"", "\"d2\"", "\"socket-name\"", "\"socket-type\"", "\"unix\"", "\"hooks-libraries\"", "\"library\"", "\"parameters\"", "\"loggers\"", - "\"name\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", + "\"name\"", "\"output-options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "START_JSON", "START_AGENT", "START_SUB_AGENT", "\"constant string\"", "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", diff --git a/src/bin/agent/agent_parser.h b/src/bin/agent/agent_parser.h index 55e0573ea3..5612faaa1c 100644 --- a/src/bin/agent/agent_parser.h +++ b/src/bin/agent/agent_parser.h @@ -531,7 +531,7 @@ namespace isc { namespace agent { TOKEN_PARAMETERS = 293, // "parameters" TOKEN_LOGGERS = 294, // "loggers" TOKEN_NAME = 295, // "name" - TOKEN_OUTPUT_OPTIONS = 296, // "output_options" + TOKEN_OUTPUT_OPTIONS = 296, // "output-options" TOKEN_OUTPUT = 297, // "output" TOKEN_DEBUGLEVEL = 298, // "debuglevel" TOKEN_SEVERITY = 299, // "severity" @@ -605,7 +605,7 @@ namespace isc { namespace agent { S_PARAMETERS = 38, // "parameters" S_LOGGERS = 39, // "loggers" S_NAME = 40, // "name" - S_OUTPUT_OPTIONS = 41, // "output_options" + S_OUTPUT_OPTIONS = 41, // "output-options" S_OUTPUT = 42, // "output" S_DEBUGLEVEL = 43, // "debuglevel" S_SEVERITY = 44, // "severity" diff --git a/src/bin/agent/agent_parser.yy b/src/bin/agent/agent_parser.yy index 39a1a737fc..8531a7fa9b 100644 --- a/src/bin/agent/agent_parser.yy +++ b/src/bin/agent/agent_parser.yy @@ -90,7 +90,7 @@ using namespace std; LOGGERS "loggers" NAME "name" - OUTPUT_OPTIONS "output_options" + OUTPUT_OPTIONS "output-options" OUTPUT "output" DEBUGLEVEL "debuglevel" SEVERITY "severity" @@ -789,9 +789,9 @@ severity: SEVERITY { }; 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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { diff --git a/src/bin/agent/parser_context.h b/src/bin/agent/parser_context.h index a6816d713e..fbc502a20c 100644 --- a/src/bin/agent/parser_context.h +++ b/src/bin/agent/parser_context.h @@ -227,7 +227,7 @@ public: ///< Used while parsing Control-agent/loggers structures. LOGGERS, - ///< Used while parsing Control-agent/loggers/output_options structures. + ///< Used while parsing Control-agent/loggers/output-options structures. OUTPUT_OPTIONS } LexerContext; diff --git a/src/bin/agent/tests/ca_process_tests.sh.in b/src/bin/agent/tests/ca_process_tests.sh.in index b5331523ec..0aa2f11e3f 100644 --- a/src/bin/agent/tests/ca_process_tests.sh.in +++ b/src/bin/agent/tests/ca_process_tests.sh.in @@ -32,7 +32,7 @@ CONFIG="{ \"loggers\": [ { \"name\": \"kea-ctrl-agent\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } diff --git a/src/bin/agent/tests/parser_unittests.cc b/src/bin/agent/tests/parser_unittests.cc index dfbc14d7df..166d6f99aa 100644 --- a/src/bin/agent/tests/parser_unittests.cc +++ b/src/bin/agent/tests/parser_unittests.cc @@ -285,12 +285,12 @@ TEST(ParserTest, embbededComments) { 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) { string txt = "{ \"Control-agent\": {" " \"loggers\": [ { " " \"name\": \"kea-ctrl-agent\"," - " \"output-options\": [ { \"output\": \"stdout\" } ]," + " \"output_options\": [ { \"output\": \"stdout\" } ]," " \"severity\": \"INFO\" } ]" "} }"; testParser(txt, ParserContext::PARSER_AGENT, false); @@ -912,7 +912,7 @@ TEST_F(TrailingCommasTest, tests) { { "debuglevel": 99, "name": "kea-ctrl-agent", - "output_options": [ + "output-options": [ { "output": "stdout", }, diff --git a/src/bin/d2/d2_lexer.cc b/src/bin/d2/d2_lexer.cc index 750b90492f..f56c4c955b 100644 --- a/src/bin/d2/d2_lexer.cc +++ b/src/bin/d2/d2_lexer.cc @@ -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 @@ -1142,7 +1142,7 @@ unsigned int comment_start_line = 0; /* To avoid the call to exit... oops! */ #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 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 @@ -1168,8 +1168,8 @@ unsigned int comment_start_line = 0; by moving it ahead by yyleng bytes. yyleng specifies the length of the currently matched token. */ #define YY_USER_ACTION driver.loc_.columns(yyleng); -#line 1171 "d2_lexer.cc" #line 1172 "d2_lexer.cc" +#line 1173 "d2_lexer.cc" #define INITIAL 0 #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 */ { @@ -2483,7 +2483,7 @@ YY_RULE_SETUP #line 826 "d2_lexer.ll" ECHO; YY_BREAK -#line 2486 "d2_lexer.cc" +#line 2487 "d2_lexer.cc" case YY_END_OF_BUFFER: { diff --git a/src/bin/d2/d2_parser.cc b/src/bin/d2/d2_parser.cc index 10bd6b2c86..91ba8048fe 100644 --- a/src/bin/d2/d2_parser.cc +++ b/src/bin/d2/d2_parser.cc @@ -1940,16 +1940,16 @@ namespace isc { namespace d2 { case 235: // $@54: %empty #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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } #line 1950 "d2_parser.cc" 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" { ctx.stack_.pop_back(); @@ -2744,7 +2744,7 @@ namespace isc { namespace d2 { "\"dns-servers\"", "\"hostname\"", "\"tsig-keys\"", "\"algorithm\"", "\"digest-bits\"", "\"secret\"", "\"control-socket\"", "\"socket-type\"", "\"socket-name\"", "\"hooks-libraries\"", "\"library\"", - "\"parameters\"", "\"loggers\"", "\"name\"", "\"output_options\"", + "\"parameters\"", "\"loggers\"", "\"name\"", "\"output-options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "TOPLEVEL_JSON", "TOPLEVEL_DHCPDDNS", "SUB_DHCPDDNS", "SUB_TSIG_KEY", "SUB_TSIG_KEYS", diff --git a/src/bin/d2/d2_parser.h b/src/bin/d2/d2_parser.h index 352e62f6cc..c729ccd8f5 100644 --- a/src/bin/d2/d2_parser.h +++ b/src/bin/d2/d2_parser.h @@ -529,7 +529,7 @@ namespace isc { namespace d2 { TOKEN_PARAMETERS = 291, // "parameters" TOKEN_LOGGERS = 292, // "loggers" TOKEN_NAME = 293, // "name" - TOKEN_OUTPUT_OPTIONS = 294, // "output_options" + TOKEN_OUTPUT_OPTIONS = 294, // "output-options" TOKEN_OUTPUT = 295, // "output" TOKEN_DEBUGLEVEL = 296, // "debuglevel" TOKEN_SEVERITY = 297, // "severity" @@ -608,7 +608,7 @@ namespace isc { namespace d2 { S_PARAMETERS = 36, // "parameters" S_LOGGERS = 37, // "loggers" S_NAME = 38, // "name" - S_OUTPUT_OPTIONS = 39, // "output_options" + S_OUTPUT_OPTIONS = 39, // "output-options" S_OUTPUT = 40, // "output" S_DEBUGLEVEL = 41, // "debuglevel" S_SEVERITY = 42, // "severity" diff --git a/src/bin/d2/d2_parser.yy b/src/bin/d2/d2_parser.yy index d8a0aaad2a..d3185de2d6 100644 --- a/src/bin/d2/d2_parser.yy +++ b/src/bin/d2/d2_parser.yy @@ -86,7 +86,7 @@ using namespace std; LOGGERS "loggers" NAME "name" - OUTPUT_OPTIONS "output_options" + OUTPUT_OPTIONS "output-options" OUTPUT "output" DEBUGLEVEL "debuglevel" SEVERITY "severity" @@ -913,9 +913,9 @@ severity: SEVERITY { }; 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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { diff --git a/src/bin/d2/parser_context.h b/src/bin/d2/parser_context.h index e838ffde16..c7eb59f8be 100644 --- a/src/bin/d2/parser_context.h +++ b/src/bin/d2/parser_context.h @@ -260,7 +260,7 @@ public: /// Used while parsing DhcpDdns/loggers structures. LOGGERS, - /// Used while parsing DhcpDdns/loggers/output_options structures. + /// Used while parsing DhcpDdns/loggers/output-options structures. OUTPUT_OPTIONS, /// Used while parsing DhcpDdns/ncr-protocol diff --git a/src/bin/d2/tests/d2_process_tests.sh.in b/src/bin/d2/tests/d2_process_tests.sh.in index 895b9a2d92..3a4dad432e 100644 --- a/src/bin/d2/tests/d2_process_tests.sh.in +++ b/src/bin/d2/tests/d2_process_tests.sh.in @@ -32,7 +32,7 @@ CONFIG="{ \"loggers\": [ { \"name\": \"kea-dhcp-ddns\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -55,7 +55,7 @@ CONFIG_BAD_SYNTAX="{ \"loggers\": [ { \"name\": \"kea-dhcp-ddns\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -78,7 +78,7 @@ CONFIG_BAD_VALUE="{ \"loggers\": [ { \"name\": \"kea-dhcp-ddns\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -102,7 +102,7 @@ CONFIG_INVALID="{ \"loggers\": [ { \"name\": \"kea-dhcp-ddns\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } diff --git a/src/bin/d2/tests/parser_unittest.cc b/src/bin/d2/tests/parser_unittest.cc index 9f741654e7..7190fbdd1b 100644 --- a/src/bin/d2/tests/parser_unittest.cc +++ b/src/bin/d2/tests/parser_unittest.cc @@ -240,14 +240,14 @@ TEST(ParserTest, embbededComments) { 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) { string txt = "{ \"DhcpDdns\" : \n" "{ \n" " \"loggers\": [ {\n" " \"name\": \"kea-dhcp-ddns\",\n" - " \"output-options\": [ { \"output\": \"stdout\" } ],\n" + " \"output_options\": [ { \"output\": \"stdout\" } ],\n" " \"severity\": \"INFO\" } ]\n" " } \n" "} \n"; @@ -851,7 +851,7 @@ TEST_F(TrailingCommasTest, tests) { "loggers": [ { "name": "kea-dhcp-ddns", - "output_options": [ + "output-options": [ { "output": "stdout" }, diff --git a/src/bin/d2/tests/testdata/get_config.json b/src/bin/d2/tests/testdata/get_config.json index d9613a3610..1eb0424357 100644 --- a/src/bin/d2/tests/testdata/get_config.json +++ b/src/bin/d2/tests/testdata/get_config.json @@ -46,7 +46,7 @@ { "debuglevel": 0, "name": "kea-dhcp-ddns", - "output_options": [ + "output-options": [ { "flush": true, "output": "stdout", diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc index 2b20e340b1..0d79fb0841 100644 --- a/src/bin/dhcp4/dhcp4_parser.cc +++ b/src/bin/dhcp4/dhcp4_parser.cc @@ -4597,16 +4597,16 @@ namespace isc { namespace dhcp { case 830: // $@132: %empty #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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } #line 4607 "dhcp4_parser.cc" 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" { ctx.stack_.pop_back(); @@ -6192,7 +6192,7 @@ namespace isc { namespace dhcp { "\"when-present\"", "\"never\"", "\"always\"", "\"when-not-present\"", "\"hostname-char-set\"", "\"hostname-char-replacement\"", "\"early-global-reservations-lookup\"", "\"ip-reservations-unique\"", - "\"reservations-lookup-first\"", "\"loggers\"", "\"output_options\"", + "\"reservations-lookup-first\"", "\"loggers\"", "\"output-options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "\"compatibility\"", "\"lenient-option-parsing\"", "\"ignore-dhcp-server-identifier\"", diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h index 93dc2948a3..97b6230626 100644 --- a/src/bin/dhcp4/dhcp4_parser.h +++ b/src/bin/dhcp4/dhcp4_parser.h @@ -691,7 +691,7 @@ namespace isc { namespace dhcp { TOKEN_IP_RESERVATIONS_UNIQUE = 446, // "ip-reservations-unique" TOKEN_RESERVATIONS_LOOKUP_FIRST = 447, // "reservations-lookup-first" TOKEN_LOGGERS = 448, // "loggers" - TOKEN_OUTPUT_OPTIONS = 449, // "output_options" + TOKEN_OUTPUT_OPTIONS = 449, // "output-options" TOKEN_OUTPUT = 450, // "output" TOKEN_DEBUGLEVEL = 451, // "debuglevel" TOKEN_SEVERITY = 452, // "severity" @@ -933,7 +933,7 @@ namespace isc { namespace dhcp { S_IP_RESERVATIONS_UNIQUE = 191, // "ip-reservations-unique" S_RESERVATIONS_LOOKUP_FIRST = 192, // "reservations-lookup-first" S_LOGGERS = 193, // "loggers" - S_OUTPUT_OPTIONS = 194, // "output_options" + S_OUTPUT_OPTIONS = 194, // "output-options" S_OUTPUT = 195, // "output" S_DEBUGLEVEL = 196, // "debuglevel" S_SEVERITY = 197, // "severity" diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy index 5d3f500b1b..bd5393f6f9 100644 --- a/src/bin/dhcp4/dhcp4_parser.yy +++ b/src/bin/dhcp4/dhcp4_parser.yy @@ -259,7 +259,7 @@ using namespace std; RESERVATIONS_LOOKUP_FIRST "reservations-lookup-first" LOGGERS "loggers" - OUTPUT_OPTIONS "output_options" + OUTPUT_OPTIONS "output-options" OUTPUT "output" DEBUGLEVEL "debuglevel" SEVERITY "severity" @@ -2906,9 +2906,9 @@ severity: SEVERITY { }; 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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { diff --git a/src/bin/dhcp4/parser_context.h b/src/bin/dhcp4/parser_context.h index 1ed11d2ab3..404e586e1e 100644 --- a/src/bin/dhcp4/parser_context.h +++ b/src/bin/dhcp4/parser_context.h @@ -314,7 +314,7 @@ public: /// Used while parsing Dhcp4/loggers structures. LOGGERS, - /// Used while parsing Dhcp4/loggers/output_options structures. + /// Used while parsing Dhcp4/loggers/output-options structures. OUTPUT_OPTIONS, /// Used while parsing Dhcp4/dhcp-ddns. diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc index 88d685f3e6..e9fdcc072e 100644 --- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc +++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc @@ -790,7 +790,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configSet) { " ,\"loggers\": [ { \n" " \"name\": \"kea\", \n" " \"severity\": \"FATAL\", \n" - " \"output_options\": [{ \n" + " \"output-options\": [{ \n" " \"output\": \"/dev/null\" \n" " }] \n" " }] \n"; @@ -1005,7 +1005,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configTest) { " ,\"loggers\": [ { \n" " \"name\": \"kea\", \n" " \"severity\": \"FATAL\", \n" - " \"output_options\": [{ \n" + " \"output-options\": [{ \n" " \"output\": \"/dev/null\" \n" " }] \n" " }] \n"; diff --git a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in index 76e7177094..10243ede22 100644 --- a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in +++ b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in @@ -56,7 +56,7 @@ CONFIG="{ \"loggers\": [ { \"name\": \"kea-dhcp4\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -92,7 +92,7 @@ CONFIG_BAD_SYNTAX="{ \"loggers\": [ { \"name\": \"kea-dhcp4\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -128,7 +128,7 @@ CONFIG_BAD_VALUES="{ \"loggers\": [ { \"name\": \"kea-dhcp4\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -164,7 +164,7 @@ CONFIG_INVALID="{ \"loggers\": [ { \"name\": \"kea-dhcp4\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -216,7 +216,7 @@ INVALID_CONFIG_HOOKS_LOAD="{ \"loggers\": [ { \"name\": \"kea-dhcp4\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -268,7 +268,7 @@ INVALID_CONFIG_HOOKS_CALLOUT_FAIL="{ \"loggers\": [ { \"name\": \"kea-dhcp4\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc index fa30408693..48c92783cd 100644 --- a/src/bin/dhcp4/tests/parser_unittest.cc +++ b/src/bin/dhcp4/tests/parser_unittest.cc @@ -241,7 +241,7 @@ TEST(ParserTest, embbededComments) { 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) { string txt = "{ \"Dhcp4\": { \"interfaces-config\": {" " \"interfaces\": [ \"*\" ]" @@ -251,7 +251,7 @@ TEST(ParserTest, outputDashOptions) { "\"valid-lifetime\": 4000,\n" "\"loggers\": [ { " " \"name\": \"kea-dhcp4\"," - " \"output-options\": [ { \"output\": \"stdout\" } ]," + " \"output_options\": [ { \"output\": \"stdout\" } ]," " \"severity\": \"INFO\" } ]\n" "} }"; testParser(txt, Parser4Context::PARSER_DHCP4, false); @@ -950,7 +950,7 @@ TEST_F(TrailingCommasTest, tests) { { "debuglevel": 99, "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { "output": "stdout", }, diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc index 546d2fea78..23814f7887 100644 --- a/src/bin/dhcp6/dhcp6_parser.cc +++ b/src/bin/dhcp6/dhcp6_parser.cc @@ -4760,16 +4760,16 @@ namespace isc { namespace dhcp { case 869: // $@137: %empty #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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } #line 4770 "dhcp6_parser.cc" 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" { ctx.stack_.pop_back(); @@ -6363,7 +6363,7 @@ namespace isc { namespace dhcp { "\"when-not-present\"", "\"hostname-char-set\"", "\"hostname-char-replacement\"", "\"early-global-reservations-lookup\"", "\"ip-reservations-unique\"", "\"reservations-lookup-first\"", - "\"loggers\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", + "\"loggers\"", "\"output-options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "\"compatibility\"", "\"lenient-option-parsing\"", "TOPLEVEL_JSON", "TOPLEVEL_DHCP6", "SUB_DHCP6", "SUB_INTERFACES6", "SUB_SUBNET6", diff --git a/src/bin/dhcp6/dhcp6_parser.h b/src/bin/dhcp6/dhcp6_parser.h index abc8f39de3..dfffdfe425 100644 --- a/src/bin/dhcp6/dhcp6_parser.h +++ b/src/bin/dhcp6/dhcp6_parser.h @@ -697,7 +697,7 @@ namespace isc { namespace dhcp { TOKEN_IP_RESERVATIONS_UNIQUE = 453, // "ip-reservations-unique" TOKEN_RESERVATIONS_LOOKUP_FIRST = 454, // "reservations-lookup-first" TOKEN_LOGGERS = 455, // "loggers" - TOKEN_OUTPUT_OPTIONS = 456, // "output_options" + TOKEN_OUTPUT_OPTIONS = 456, // "output-options" TOKEN_OUTPUT = 457, // "output" TOKEN_DEBUGLEVEL = 458, // "debuglevel" TOKEN_SEVERITY = 459, // "severity" @@ -944,7 +944,7 @@ namespace isc { namespace dhcp { S_IP_RESERVATIONS_UNIQUE = 198, // "ip-reservations-unique" S_RESERVATIONS_LOOKUP_FIRST = 199, // "reservations-lookup-first" S_LOGGERS = 200, // "loggers" - S_OUTPUT_OPTIONS = 201, // "output_options" + S_OUTPUT_OPTIONS = 201, // "output-options" S_OUTPUT = 202, // "output" S_DEBUGLEVEL = 203, // "debuglevel" S_SEVERITY = 204, // "severity" diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy index 12fa254c4f..d1b0bb5b6b 100644 --- a/src/bin/dhcp6/dhcp6_parser.yy +++ b/src/bin/dhcp6/dhcp6_parser.yy @@ -266,7 +266,7 @@ using namespace std; RESERVATIONS_LOOKUP_FIRST "reservations-lookup-first" LOGGERS "loggers" - OUTPUT_OPTIONS "output_options" + OUTPUT_OPTIONS "output-options" OUTPUT "output" DEBUGLEVEL "debuglevel" SEVERITY "severity" @@ -3052,9 +3052,9 @@ severity: SEVERITY { }; 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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { diff --git a/src/bin/dhcp6/parser_context.h b/src/bin/dhcp6/parser_context.h index 42cb464feb..ff6e9d9635 100644 --- a/src/bin/dhcp6/parser_context.h +++ b/src/bin/dhcp6/parser_context.h @@ -320,7 +320,7 @@ public: /// Used while parsing Dhcp6/loggers structures. LOGGERS, - /// Used while parsing Dhcp6/loggers/output_options structures. + /// Used while parsing Dhcp6/loggers/output-options structures. OUTPUT_OPTIONS, /// Used while parsing Dhcp6/dhcp-ddns. diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc index fa6d6e549b..0b981e86f3 100644 --- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc +++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc @@ -703,7 +703,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configSet) { " ,\"loggers\": [ { \n" " \"name\": \"kea\", \n" " \"severity\": \"FATAL\", \n" - " \"output_options\": [{ \n" + " \"output-options\": [{ \n" " \"output\": \"/dev/null\" \n" " }] \n" " }] \n"; @@ -919,7 +919,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configTest) { " ,\"loggers\": [ { \n" " \"name\": \"kea\", \n" " \"severity\": \"FATAL\", \n" - " \"output_options\": [{ \n" + " \"output-options\": [{ \n" " \"output\": \"/dev/null\" \n" " }] \n" " }] \n"; diff --git a/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in b/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in index 0857287937..afed5211a6 100644 --- a/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in +++ b/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in @@ -61,7 +61,7 @@ CONFIG="{ \"loggers\": [ { \"name\": \"kea-dhcp6\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -98,7 +98,7 @@ CONFIG_BAD_SYNTAX="{ \"loggers\": [ { \"name\": \"kea-dhcp6\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -135,7 +135,7 @@ CONFIG_INVALID="{ \"loggers\": [ { \"name\": \"kea-dhcp6\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -228,7 +228,7 @@ INVALID_CONFIG_HOOKS_LOAD="{ \"loggers\": [ { \"name\": \"kea-dhcp6\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -285,7 +285,7 @@ INVALID_CONFIG_HOOKS_CALLOUT_FAIL="{ \"loggers\": [ { \"name\": \"kea-dhcp6\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc index ddeea949cf..d7f45f5219 100644 --- a/src/bin/dhcp6/tests/parser_unittest.cc +++ b/src/bin/dhcp6/tests/parser_unittest.cc @@ -246,7 +246,7 @@ TEST(ParserTest, embbededComments) { 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) { string txt = "{ \"Dhcp6\": { \"interfaces-config\": {" " \"interfaces\": [ \"*\" ]" @@ -257,7 +257,7 @@ TEST(ParserTest, outputDashOptions) { "\"valid-lifetime\": 4000,\n" "\"loggers\": [ { " " \"name\": \"kea-dhcp6\"," - " \"output-options\": [ { \"output\": \"stdout\" } ]," + " \"output_options\": [ { \"output\": \"stdout\" } ]," " \"severity\": \"INFO\" } ]\n" "} }"; testParser(txt, Parser6Context::PARSER_DHCP6, false); @@ -941,7 +941,7 @@ TEST_F(TrailingCommasTest, tests) { { "debuglevel": 99, "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { "output": "stdout", }, diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre index e6ae8b8ac6..d8e04296ce 100644 --- a/src/bin/keactrl/kea-ctrl-agent.conf.pre +++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre @@ -64,7 +64,7 @@ { // This specifies the logging for Control Agent daemon. "name": "kea-ctrl-agent", - "output_options": [ + "output-options": [ { // Specifies the output file. There are several special values // supported: diff --git a/src/bin/keactrl/kea-dhcp-ddns.conf.pre b/src/bin/keactrl/kea-dhcp-ddns.conf.pre index 07c204283a..b75b51f390 100644 --- a/src/bin/keactrl/kea-dhcp-ddns.conf.pre +++ b/src/bin/keactrl/kea-dhcp-ddns.conf.pre @@ -35,7 +35,7 @@ { // This specifies the logging for D2 (DHCP-DDNS) daemon. "name": "kea-dhcp-ddns", - "output_options": [ + "output-options": [ { // Specifies the output file. There are several special values // supported: diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre index 6edb8a14c7..55af9dbf61 100644 --- a/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre @@ -427,7 +427,7 @@ // component. It tells DHCPv4 server to write all log messages (on // severity INFO or more) to a file. "name": "kea-dhcp4", - "output_options": [ + "output-options": [ { // Specifies the output file. There are several special values // supported: diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre index b167e1ffe0..271021b2f8 100644 --- a/src/bin/keactrl/kea-dhcp6.conf.pre +++ b/src/bin/keactrl/kea-dhcp6.conf.pre @@ -386,7 +386,7 @@ // This specifies the logging for kea-dhcp6 logger, i.e. all logs // generated by Kea DHCPv6 server. "name": "kea-dhcp6", - "output_options": [ + "output-options": [ { // Specifies the output file. There are several special values // supported: diff --git a/src/bin/keactrl/kea-netconf.conf.pre b/src/bin/keactrl/kea-netconf.conf.pre index 37d15b14a1..c8a3878b41 100644 --- a/src/bin/keactrl/kea-netconf.conf.pre +++ b/src/bin/keactrl/kea-netconf.conf.pre @@ -60,7 +60,7 @@ { // This specifies the logging for Netconf daemon. "name": "kea-netconf", - "output_options": [ + "output-options": [ { // Specifies the output file. There are several special values // supported: diff --git a/src/bin/keactrl/tests/keactrl_tests.sh.in b/src/bin/keactrl/tests/keactrl_tests.sh.in index b4b49cb625..da2aa775c6 100644 --- a/src/bin/keactrl/tests/keactrl_tests.sh.in +++ b/src/bin/keactrl/tests/keactrl_tests.sh.in @@ -92,7 +92,7 @@ dhcp4_config="{ \"loggers\": [ { \"name\": \"kea-dhcp4\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -131,7 +131,7 @@ dhcp6_config="{ \"loggers\": [ { \"name\": \"kea-dhcp6\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -154,7 +154,7 @@ dhcp_ddns_config="{ \"loggers\": [ { \"name\": \"kea-dhcp-ddns\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -173,7 +173,7 @@ control_agent_config="{ \"loggers\": [ { \"name\": \"kea-ctrl-agent\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } @@ -190,7 +190,7 @@ netconf_config="{ \"loggers\": [ { \"name\": \"kea-netconf\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } diff --git a/src/bin/netconf/netconf_parser.cc b/src/bin/netconf/netconf_parser.cc index bb96708f25..ff6536d6e7 100644 --- a/src/bin/netconf/netconf_parser.cc +++ b/src/bin/netconf/netconf_parser.cc @@ -1498,16 +1498,16 @@ namespace isc { namespace netconf { case 155: // $@29: %empty #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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } #line 1508 "netconf_parser.cc" 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" { ctx.stack_.pop_back(); @@ -2221,7 +2221,7 @@ namespace isc { namespace netconf { "\"control-socket\"", "\"socket-type\"", "\"unix\"", "\"http\"", "\"stdout\"", "\"socket-name\"", "\"socket-url\"", "\"hooks-libraries\"", "\"library\"", "\"parameters\"", "\"loggers\"", "\"name\"", - "\"output_options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", + "\"output-options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", "START_JSON", "START_NETCONF", "START_SUB_NETCONF", "\"constant string\"", "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", diff --git a/src/bin/netconf/netconf_parser.h b/src/bin/netconf/netconf_parser.h index 54266fac8e..584ba5a62a 100644 --- a/src/bin/netconf/netconf_parser.h +++ b/src/bin/netconf/netconf_parser.h @@ -526,7 +526,7 @@ namespace isc { namespace netconf { TOKEN_PARAMETERS = 286, // "parameters" TOKEN_LOGGERS = 287, // "loggers" TOKEN_NAME = 288, // "name" - TOKEN_OUTPUT_OPTIONS = 289, // "output_options" + TOKEN_OUTPUT_OPTIONS = 289, // "output-options" TOKEN_OUTPUT = 290, // "output" TOKEN_DEBUGLEVEL = 291, // "debuglevel" TOKEN_SEVERITY = 292, // "severity" @@ -593,7 +593,7 @@ namespace isc { namespace netconf { S_PARAMETERS = 31, // "parameters" S_LOGGERS = 32, // "loggers" S_NAME = 33, // "name" - S_OUTPUT_OPTIONS = 34, // "output_options" + S_OUTPUT_OPTIONS = 34, // "output-options" S_OUTPUT = 35, // "output" S_DEBUGLEVEL = 36, // "debuglevel" S_SEVERITY = 37, // "severity" diff --git a/src/bin/netconf/netconf_parser.yy b/src/bin/netconf/netconf_parser.yy index db3e79a534..eb2ec7bb63 100644 --- a/src/bin/netconf/netconf_parser.yy +++ b/src/bin/netconf/netconf_parser.yy @@ -85,7 +85,7 @@ using namespace std; LOGGERS "loggers" NAME "name" - OUTPUT_OPTIONS "output_options" + OUTPUT_OPTIONS "output-options" OUTPUT "output" DEBUGLEVEL "debuglevel" SEVERITY "severity" @@ -678,9 +678,9 @@ severity: SEVERITY { }; 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))); - ctx.stack_.back()->set("output_options", l); + ctx.stack_.back()->set("output-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } COLON LSQUARE_BRACKET output_options_list_content RSQUARE_BRACKET { diff --git a/src/bin/netconf/parser_context.h b/src/bin/netconf/parser_context.h index cb62152ab4..68a8b6078d 100644 --- a/src/bin/netconf/parser_context.h +++ b/src/bin/netconf/parser_context.h @@ -222,7 +222,7 @@ public: ///< Used while parsing Netconf/loggers structures. LOGGERS, - ///< Used while parsing Netconf/loggers/output_options structures. + ///< Used while parsing Netconf/loggers/output-options structures. OUTPUT_OPTIONS } LexerContext; diff --git a/src/bin/netconf/tests/parser_unittests.cc b/src/bin/netconf/tests/parser_unittests.cc index 504c4f208f..d4ef6c1d35 100644 --- a/src/bin/netconf/tests/parser_unittests.cc +++ b/src/bin/netconf/tests/parser_unittests.cc @@ -344,12 +344,12 @@ TEST(ParserTest, embbededComments) { 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) { string txt= "{ \"Netconf\": {" " \"loggers\": [ { " " \"name\": \"kea-netconf\"," - " \"output-options\": [ { \"output\": \"stdout\" } ]," + " \"output_options\": [ { \"output\": \"stdout\" } ]," " \"severity\": \"INFO\" } ]" "} }"; testParser(txt, ParserContext::PARSER_NETCONF, false); diff --git a/src/bin/netconf/tests/shtests/netconf_tests.sh.in b/src/bin/netconf/tests/shtests/netconf_tests.sh.in index b6ba611223..df8196e705 100644 --- a/src/bin/netconf/tests/shtests/netconf_tests.sh.in +++ b/src/bin/netconf/tests/shtests/netconf_tests.sh.in @@ -35,7 +35,7 @@ CONFIG="{ \"loggers\": [ { \"name\": \"kea-netconf\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } diff --git a/src/bin/shell/tests/basic_auth_tests.sh.in b/src/bin/shell/tests/basic_auth_tests.sh.in index 36ea16c2fc..0d8b2b8c9d 100644 --- a/src/bin/shell/tests/basic_auth_tests.sh.in +++ b/src/bin/shell/tests/basic_auth_tests.sh.in @@ -43,7 +43,7 @@ CONFIG="{ \"loggers\": [ { \"name\": \"kea-ctrl-agent\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } diff --git a/src/bin/shell/tests/shell_process_tests.sh.in b/src/bin/shell/tests/shell_process_tests.sh.in index 5f2e00a149..514bb2797b 100644 --- a/src/bin/shell/tests/shell_process_tests.sh.in +++ b/src/bin/shell/tests/shell_process_tests.sh.in @@ -32,7 +32,7 @@ CONFIG="{ \"loggers\": [ { \"name\": \"kea-ctrl-agent\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"$LOG_FILE\" } diff --git a/src/bin/shell/tests/tls_ca_process_tests.sh.in b/src/bin/shell/tests/tls_ca_process_tests.sh.in index 2c23188c08..e8937b8d12 100644 --- a/src/bin/shell/tests/tls_ca_process_tests.sh.in +++ b/src/bin/shell/tests/tls_ca_process_tests.sh.in @@ -37,7 +37,7 @@ CONFIG_NONE="{ \"loggers\": [ { \"name\": \"kea-ctrl-agent\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"${LOG_FILE}\" } @@ -61,7 +61,7 @@ CONFIG_NOCR="{ \"loggers\": [ { \"name\": \"kea-ctrl-agent\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"${LOG_FILE}\" } @@ -85,7 +85,7 @@ CONFIG="{ \"loggers\": [ { \"name\": \"kea-ctrl-agent\", - \"output_options\": [ + \"output-options\": [ { \"output\": \"${LOG_FILE}\" } diff --git a/src/lib/process/log_parser.cc b/src/lib/process/log_parser.cc index 258aa4eaf5..ef410bba14 100644 --- a/src/lib/process/log_parser.cc +++ b/src/lib/process/log_parser.cc @@ -104,7 +104,7 @@ void LogConfigParser::parseConfigEntry(isc::data::ConstElementPtr entry) { info.debuglevel_ = 99; } - isc::data::ConstElementPtr output_options = entry->get("output_options"); + isc::data::ConstElementPtr output_options = entry->get("output-options"); if (output_options) { parseOutputOptions(info.destinations_, output_options); @@ -116,7 +116,7 @@ void LogConfigParser::parseConfigEntry(isc::data::ConstElementPtr entry) { void LogConfigParser::parseOutputOptions(std::vector<LoggingDestination>& destination, isc::data::ConstElementPtr output_options) { if (!output_options) { - isc_throw(BadValue, "Missing 'output_options' structure in 'loggers'"); + isc_throw(BadValue, "Missing 'output-options' structure in 'loggers'"); } BOOST_FOREACH(ConstElementPtr output_option, output_options->listValue()) { @@ -125,7 +125,7 @@ void LogConfigParser::parseOutputOptions(std::vector<LoggingDestination>& destin isc::data::ConstElementPtr output = output_option->get("output"); if (!output) { - isc_throw(BadValue, "output_options entry does not have a mandatory 'output' " + isc_throw(BadValue, "output-options entry does not have a mandatory 'output' " "element (" << output_option->getPosition() << ")"); } dest.output_ = output->stringValue(); diff --git a/src/lib/process/log_parser.h b/src/lib/process/log_parser.h index 92209bd17f..899a613149 100644 --- a/src/lib/process/log_parser.h +++ b/src/lib/process/log_parser.h @@ -23,7 +23,7 @@ namespace process { /// The data structures converted to JSON format have the following syntax: /// { /// "name": "kea", -/// "output_options": [ +/// "output-options": [ /// { /// "output": "/home/thomson/kea-inst/kea-warn.log", /// "maxver": 8, @@ -66,7 +66,7 @@ private: /// @brief parses one structure in Server/loggers. void parseConfigEntry(isc::data::ConstElementPtr entry); - /// @brief Parses output_options structure + /// @brief Parses output-options structure /// /// @ref @c LogConfigParser for an example in JSON format. /// diff --git a/src/lib/process/logging_info.cc b/src/lib/process/logging_info.cc index a32119d39d..10a4d3b0c9 100644 --- a/src/lib/process/logging_info.cc +++ b/src/lib/process/logging_info.cc @@ -168,13 +168,13 @@ LoggingInfo::toElement() const { contextToElement(result); // Set name result->set("name", Element::create(name_)); - // Set output_options if not empty + // Set output-options if not empty if (!destinations_.empty()) { ElementPtr options = Element::createList(); for (auto const& dest : destinations_) { options->add(dest.toElement()); } - result->set("output_options", options); + result->set("output-options", options); } // Set severity std::string severity; diff --git a/src/lib/process/logging_info.h b/src/lib/process/logging_info.h index 7660fe0a64..0617d998db 100644 --- a/src/lib/process/logging_info.h +++ b/src/lib/process/logging_info.h @@ -66,7 +66,7 @@ public: /// The structure in JSON form has the following syntax: /// { /// "name": "*", -/// "output_options": [ +/// "output-options": [ /// { /// "output": "/path/to/the/logfile.log", /// "maxver": 8, diff --git a/src/lib/process/tests/daemon_unittest.cc b/src/lib/process/tests/daemon_unittest.cc index bd80e25a65..791b55b002 100644 --- a/src/lib/process/tests/daemon_unittest.cc +++ b/src/lib/process/tests/daemon_unittest.cc @@ -283,7 +283,7 @@ TEST_F(DaemonTest, parsingConsoleOutput) { "{ \"loggers\": [" " {" " \"name\": \"kea\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"stdout\"" " }" diff --git a/src/lib/process/tests/log_parser_unittests.cc b/src/lib/process/tests/log_parser_unittests.cc index 0341dd7b2b..43c30541d7 100644 --- a/src/lib/process/tests/log_parser_unittests.cc +++ b/src/lib/process/tests/log_parser_unittests.cc @@ -98,7 +98,7 @@ TEST_F(LoggingTest, parsingConsoleOutput) { "{ \"loggers\": [" " {" " \"name\": \"kea\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"stdout\"," " \"flush\": true" @@ -140,7 +140,7 @@ TEST_F(LoggingTest, parsingNoSeverity) { "{ \"loggers\": [" " {" " \"name\": \"kea\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"stdout\"," " \"flush\": true" @@ -188,7 +188,7 @@ TEST_F(LoggingTest, parsingFile) { "{ \"loggers\": [" " {" " \"name\": \"kea\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"logfile.txt\"" " }" @@ -233,7 +233,7 @@ TEST_F(LoggingTest, multipleLoggers) { "{ \"loggers\": [" " {" " \"name\": \"kea\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"logfile.txt\"," " \"flush\": true" @@ -243,7 +243,7 @@ TEST_F(LoggingTest, multipleLoggers) { " }," " {" " \"name\": \"wombat\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"logfile2.txt\"," " \"flush\": false" @@ -292,7 +292,7 @@ TEST_F(LoggingTest, multipleLoggingDestinations) { "{ \"loggers\": [" " {" " \"name\": \"kea\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"logfile.txt\"" " }," @@ -341,7 +341,7 @@ TEST_F(LoggingTest, logRotate) { "{ \"loggers\": [" " {" " \"name\": \"kea\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"" << TEST_LOG_NAME << "\"," << @@ -399,7 +399,7 @@ TEST_F(LoggingTest, validPattern) { "{ \"loggers\": [" " {" " \"name\": \"kea\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"stdout\"," " \"pattern\": \"mylog %m\\n\"" @@ -438,7 +438,7 @@ TEST_F(LoggingTest, emptyPattern) { "{ \"loggers\": [" " {" " \"name\": \"kea\"," - " \"output_options\": [" + " \"output-options\": [" " {" " \"output\": \"stdout\"," " \"pattern\": \"\"" @@ -478,7 +478,7 @@ void testMaxSize(uint64_t maxsize_candidate, uint64_t expected_maxsize) { "debuglevel": 99, "name": "kea", - "output_options": [ + "output-options": [ { "output": "kea.test.log", "flush": true, diff --git a/src/lib/process/tests/logging_info_unittests.cc b/src/lib/process/tests/logging_info_unittests.cc index 388a8a57ee..1e19ec5608 100644 --- a/src/lib/process/tests/logging_info_unittests.cc +++ b/src/lib/process/tests/logging_info_unittests.cc @@ -89,7 +89,7 @@ TEST_F(LoggingInfoTest, defaults) { std::string header = "{\n"; std::string begin = "\"name\": \"kea\",\n" - "\"output_options\": [ {\n" + "\"output-options\": [ {\n" " \"output\": \"stdout\", \"flush\": true, \"pattern\": \"\" } ],\n" "\"severity\": \""; std::string dbglvl = "\",\n\"debuglevel\": "; diff --git a/src/lib/yang/tests/translator_logger_unittests.cc b/src/lib/yang/tests/translator_logger_unittests.cc index 365e4bd474..469df79469 100644 --- a/src/lib/yang/tests/translator_logger_unittests.cc +++ b/src/lib/yang/tests/translator_logger_unittests.cc @@ -85,7 +85,7 @@ TEST_F(TranslatorLoggersTestv6, get) { ASSERT_TRUE(severity); ASSERT_EQ(Element::string, severity->getType()); EXPECT_EQ("WARN", severity->stringValue()); - ConstElementPtr options = logger->get("output_options"); + ConstElementPtr options = logger->get("output-options"); ASSERT_TRUE(options); ASSERT_EQ(1, options->size()); ConstElementPtr option = options->get(0); @@ -114,7 +114,7 @@ TEST_F(TranslatorLoggersTestv4, set) { ElementPtr logger = Element::createMap(); logger->set("name", Element::create("foo")); logger->set("severity", Element::create("WARN")); - logger->set("output_options", options); + logger->set("output-options", options); ElementPtr loggers = Element::createList(); loggers->add(logger); ASSERT_NO_THROW_LOG(translator_->setLoggers(xpath, loggers)); @@ -135,7 +135,7 @@ TEST_F(TranslatorLoggersTestv4, set) { ASSERT_TRUE(severity); ASSERT_EQ(Element::string, severity->getType()); EXPECT_EQ("WARN", severity->stringValue()); - ConstElementPtr got_os = logger->get("output_options"); + ConstElementPtr got_os = logger->get("output-options"); ASSERT_TRUE(got_os); ASSERT_EQ(1, got_os->size()); ConstElementPtr got_o = got_os->get(0); diff --git a/src/lib/yang/translator_logger.cc b/src/lib/yang/translator_logger.cc index bff43db77d..d2d8994b91 100644 --- a/src/lib/yang/translator_logger.cc +++ b/src/lib/yang/translator_logger.cc @@ -53,7 +53,7 @@ TranslatorLogger::getLoggerKea(DataNode const& data_node) { ConstElementPtr options = getOutputOptions(data_node); if (options) { - result->set("output_options", options); + result->set("output-options", options); } return (result->empty() ? ElementPtr() : result); @@ -106,7 +106,7 @@ TranslatorLogger::setLoggerKea(string const& xpath, ConstElementPtr elem) { checkAndSetLeaf(elem, xpath, "severity", LeafBaseType::Enum); checkAndSetUserContext(elem, xpath); - ConstElementPtr options = elem->get("output_options"); + ConstElementPtr options = elem->get("output-options"); if (options && !options->empty()) { setOutputOptions(xpath, options); } diff --git a/src/lib/yang/translator_logger.h b/src/lib/yang/translator_logger.h index 6d54dc4b25..cc58dc9d01 100644 --- a/src/lib/yang/translator_logger.h +++ b/src/lib/yang/translator_logger.h @@ -18,7 +18,7 @@ namespace yang { /// @code /// { /// "name": <name>, -/// "output_options": [ <output options> ], +/// "output-options": [ <output options> ], /// "severity": <severity>, /// "debuglevel": <debug level>, /// "user-context": { <json map> }, @@ -58,7 +58,7 @@ namespace yang { /// { /// "name": "foo", /// "severity": "WARN", -/// "output_options": +/// "output-options": /// [ /// { /// "output": "/bar", |