[#3141] delete excessive dnr.json examples

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1c971b9b9b7288fcdac4e28640b860dc1540d963..18b3b592354a8d53b97e688292e4e051602f6fce 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,7 +25,6 @@ nobase_dist_doc_DATA += examples/kea4/classify2.json
 nobase_dist_doc_DATA += examples/kea4/comments.json
 nobase_dist_doc_DATA += examples/kea4/config-backend.json
 nobase_dist_doc_DATA += examples/kea4/dhcpv4-over-dhcpv6.json
-nobase_dist_doc_DATA += examples/kea4/dnr.json
 nobase_dist_doc_DATA += examples/kea4/global-reservations.json
 nobase_dist_doc_DATA += examples/kea4/ha-load-balancing-server1-mt-with-tls.json
 nobase_dist_doc_DATA += examples/kea4/ha-load-balancing-server2-mt.json
@@ -52,7 +51,6 @@ nobase_dist_doc_DATA += examples/kea6/classify2.json
 nobase_dist_doc_DATA += examples/kea6/comments.json
 nobase_dist_doc_DATA += examples/kea6/config-backend.json
 nobase_dist_doc_DATA += examples/kea6/dhcpv4-over-dhcpv6.json
-nobase_dist_doc_DATA += examples/kea6/dnr.json
 nobase_dist_doc_DATA += examples/kea6/duid.json
 nobase_dist_doc_DATA += examples/kea6/global-reservations.json
 nobase_dist_doc_DATA += examples/kea6/ha-hot-standby-server1-with-tls.json

diff --git a/doc/examples/kea4/dnr.json b/doc/examples/kea4/dnr.json
deleted file mode 100644 (file)
index 5825c30..0000000
--- a/doc/examples/kea4/dnr.json
+++ /dev/null
@@ -1,77 +0,0 @@
-// This is an example configuration file for the DHCPv4 server in Kea.
-// The purpose of this example is to showcase how to configure
-// DHCP option for the Discovery of Network-designated Resolvers (DNR)
-// (code 162) RFC9463.
-
-
-{
-  "Dhcp4": {
-    // Option data defined globally
-    "option-data": [
-      /*
-       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      | OPTION_V4_DNR |     Length    |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      ~      DNR Instance Data #1     ~
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   ---
-      .              ...              .    |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ optional
-      ~      DNR Instance Data #n     ~    |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   ---
-
-      DNR Instance Data Format:
-       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      |    DNR Instance Data Length   |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      |       Service Priority        |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      |   ADN Length  |               |
-      +-+-+-+-+-+-+-+-+               |
-      ~  authentication-domain-name   ~
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      |  Addr Length  |               |
-      +-+-+-+-+-+-+-+-+               |
-      ~        IPv4 Address(es)       ~
-      |               +-+-+-+-+-+-+-+-+
-      |               |               |
-      +-+-+-+-+-+-+-+-+               |
-      ~Service Parameters (SvcParams) ~
-      |                               |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      */
-      // Type: uint16, uint16, uint8, FQDN, binary
-      {
-        // 2 DNR instances with IP address(es) and SvcParams included as binary type.
-        "code": 162,
-        "name": "v4-dnr",           // addresses len=8   |  IPv4 1   |  IPv4 2   |             SvcParams "key1=val1 key2=val2"            |Len2 |Prio2|  | ADN with Len=21=15hex myhost1.example.com                    |  |  IPv4 1   |  IPv4 2   |             SvcParams "key3=val3 key4=val4"            |
-        "data": "54, 3234, 23, example.some.host.org., 08 c0 a8 00 01 c0 a8 00 02 6b 65 79 31 3d 76 61 6c 31 20 6b 65 79 32 3d 76 61 6c 32 00 34 10 e1 15 07 6D 79 68 6F 73 74 31 07 65 78 61 6D 70 6C 65 03 63 6F 6D 00 08 c0 a9 00 01 c0 a9 00 02 6b 65 79 33 3d 76 61 6c 33 20 6b 65 79 34 3d 76 61 6c 34"
-      }
-    ],
-    // Kea is told to listen on eth0 interface only.
-    "interfaces-config": {
-      "interfaces": [
-        "eth0"
-      ]
-    },
-    // We need to specify the database used to store leases.
-    "lease-database": {
-      "type": "memfile"
-    },
-    // The following list defines subnets. We have only one subnet
-    // here. We tell Kea that it is directly available over local interface.
-    "subnet4": [
-      {
-        "id": 1,
-        "interface": "eth0",
-        "pools": [
-          {
-            "pool": "192.0.2.50-192.0.2.50"
-          }
-        ],
-        "subnet": "192.0.2.0/24"
-      }
-    ]
-  }
-}

diff --git a/doc/examples/kea6/dnr.json b/doc/examples/kea6/dnr.json
deleted file mode 100644 (file)
index f27fd68..0000000
--- a/doc/examples/kea6/dnr.json
+++ /dev/null
@@ -1,86 +0,0 @@
-// This is an example configuration file for the DHCPv6 server in Kea.
-// The purpose of this example is to showcase how to configure
-// DHCP option for the Discovery of Network-designated Resolvers (DNR)
-// (code 144) RFC9463.
-{
-  "Dhcp6": {
-    // Option data defined globally
-    "option-data": [
-      /*
-       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      |       Option-code             |         Option-length         |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      |       Service Priority        |         ADN Length            |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      ~                   authentication-domain-name                  ~
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      |         Addr Length           |                               |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               |
-      ~                        ipv6-address(es)                       ~
-      |                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      |                               |                               |
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               |
-      ~                 Service Parameters (SvcParams)                ~
-      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      */
-      // Type: uint16, uint16, FQDN, binary
-      {
-        // DNR with IP address(es) and SvcParams included as binary type.
-        "code": 144,
-        "name": "v6-dnr",          // addresses len=32  |                                     1st IPv6  |                                     2nd IPv6  |             SvcParams "key1=val1 key2=val2"            |
-        "data": "3234, 23, example.some.host.org., 00 20 20 01 0d b8 00 01 00 00 00 00 00 00 de ad be ef ff 02 00 00 00 00 00 00 00 00 00 00 fa ce b0 0c 6b 65 79 31 3d 76 61 6c 31 20 6b 65 79 32 3d 76 61 6c 32"
-      }
-    ],
-    // Kea is told to listen on eth0 interface only.
-    "interfaces-config": {
-      "interfaces": [ "eth0" ]
-    },
-
-    // We need to specify the database used to store leases.
-    // We'll use memfile because it doesn't require any prior set up.
-    "lease-database": {
-      "type": "memfile",
-      "persist": true,
-      "lfc-interval": 3600
-    },
-
-    // Addresses will be assigned with preferred and valid lifetimes
-    // being 3000 and 4000, respectively. Client is told to start
-    // renewing after 1000 seconds. If the server does not respond
-    // after 2000 seconds since the lease was granted, client is supposed
-    // to start REBIND procedure (emergency renewal that allows switching
-    // to a different server).
-    "preferred-lifetime": 3000,
-    "valid-lifetime": 4000,
-    "renew-timer": 1000,
-    "rebind-timer": 2000,
-
-    // The following list defines subnets. Each subnet consists of at
-    // least subnet and pool entries.
-    "subnet6": [
-      {
-        "id": 1,
-        "pools": [ { "pool": "2001:db8:1::/80" } ],
-        "subnet": "2001:db8:1::/64",
-        "interface": "eth0"
-      }
-    ],
-
-    // The following configures logging. It assumes that messages with at
-    // least informational level (info, warn, error and fatal) should be
-    // logged to stdout.
-    "loggers": [
-      {
-        "name": "kea-dhcp6",
-        "output-options": [
-          {
-            "output": "stdout"
-          }
-        ],
-        "debuglevel": 0,
-        "severity": "INFO"
-      }
-    ]
-  }
-}

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 6e8bcfbbb69a0c06d5c1d78a604a7bd10146490f..0c9a39f361b15335f376eb06e969ffca91966831 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -4746,7 +4746,7 @@ DHCPv6 option, except the minor difference of using IPv4 rather than IPv6 addres
 
 For detailed example how to configure DNR option, see :ref:`dnr6-options`.
 Examples for DNR DHCPv4 options are provided in the Kea sources in
-`dnr.json` and `all-options.json` in the `doc/examples/kea4` directory.
+`all-options.json` in the `doc/examples/kea4` directory.
 
 
 .. _host-reservation-v4:

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 506bc543f6076ce16cd155cc5974762a7ac3a404..7d9193196cb034e4f018d1e9b757f5b23b43794d 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -2146,7 +2146,7 @@ Kea currently supports the following service parameters:
 Other currently defined service parameters: mandatory (0), no-default-alpn (2), ipv4hint (4), ech (5),
 ipv6hint (6), and ohttp (8) are not usable in the DNR option.
 
-Further examples are provided in Kea sources in ``dnr.json`` and ``all-options.json`` files
+Further examples are provided in Kea sources in ``all-options.json`` file
 in the ``doc/examples/kea6`` directory. The DHCPv4 option is almost equivalent, and is described
 in :ref:`dnr4-options`.
 

diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index 521dad3124b8a2e8a483cad574e3f850028cbbc2..7063961526a6cde07bcc30a09aa0d0cdb20c147e 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -2968,7 +2968,6 @@ Dhcpv4SrvTest::checkConfigFiles() {
         "config-backend.json",
 #endif
         "dhcpv4-over-dhcpv6.json",
-        "dnr.json",
         "global-reservations.json",
         "ha-load-balancing-server1-mt-with-tls.json",
         "ha-load-balancing-server2-mt.json",

diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc
index 98f1ef8767868d30b1a12df33873cf0fcf76d059..ec32d122cce5880fd798c168affdeef5bfc6443b 100644 (file)
--- a/src/bin/dhcp4/tests/parser_unittest.cc
+++ b/src/bin/dhcp4/tests/parser_unittest.cc
@@ -302,7 +302,6 @@ TEST(ParserTest, file) {
                                "comments.json",
                                "config-backend.json",
                                "dhcpv4-over-dhcpv6.json",
-                               "dnr.json",
                                "global-reservations.json",
                                "ha-load-balancing-server1-mt-with-tls.json",
                                "ha-load-balancing-server2-mt.json",

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index a7f6648fcbbd7d99348c0f022ce9e376a93b8876..13234df3a978b872db42b58d7614be004426641d 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -337,7 +337,6 @@ Dhcpv6SrvTest::checkConfigFiles() {
         "config-backend.json",
 #endif
         "dhcpv4-over-dhcpv6.json",
-        "dnr.json",
         "duid.json",
         "global-reservations.json",
         "ha-hot-standby-server1-with-tls.json",

diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc
index 94f47bac824c3d3cf3a32bf3816980a6ae100312..a0a110be6a52e252d7bcd7d7338ae4efdb640a27 100644 (file)
--- a/src/bin/dhcp6/tests/parser_unittest.cc
+++ b/src/bin/dhcp6/tests/parser_unittest.cc
@@ -309,7 +309,6 @@ TEST(ParserTest, file) {
     configs.push_back("comments.json");
     configs.push_back("config-backend.json");
     configs.push_back("dhcpv4-over-dhcpv6.json");
-    configs.push_back("dnr.json");
     configs.push_back("duid.json");
     configs.push_back("global-reservations.json");
     configs.push_back("ha-hot-standby-server1-with-tls.json");

diff --git a/src/lib/yang/tests/adaptor_config_unittests.cc b/src/lib/yang/tests/adaptor_config_unittests.cc
index 7b9a464bffe940459f1a9fad797f76d7d5680813..ed698b0039d826e915584cc3379f68598cf785d7 100644 (file)
--- a/src/lib/yang/tests/adaptor_config_unittests.cc
+++ b/src/lib/yang/tests/adaptor_config_unittests.cc
@@ -71,7 +71,6 @@ TEST_F(AdaptorConfigTest, loadExamples4) {
         "comments.json",
         "config-backend.json",
         "dhcpv4-over-dhcpv6.json",
-        "dnr.json",
         "global-reservations.json",
         "ha-load-balancing-server1-mt-with-tls.json",
         "ha-load-balancing-server2-mt.json",
@@ -110,7 +109,6 @@ TEST_F(AdaptorConfigTest, loadExamples6) {
         "comments.json",
         "config-backend.json",
         "dhcpv4-over-dhcpv6.json",
-        "dnr.json",
         "duid.json",
         "global-reservations.json",
         "ha-hot-standby-server1-with-tls.json",

diff --git a/src/lib/yang/tests/config_unittests.cc b/src/lib/yang/tests/config_unittests.cc
index 99f9e1c9c30ed0424334b2e35af2280ea725d8d5..5a859d967c6becc82789d5054984f72995cdbc1d 100644 (file)
--- a/src/lib/yang/tests/config_unittests.cc
+++ b/src/lib/yang/tests/config_unittests.cc
@@ -283,7 +283,6 @@ TEST_F(ConfigTestKeaV4, examples4) {
         "comments.json",
         "config-backend.json",
         "dhcpv4-over-dhcpv6.json",
-        "dnr.json",
         "global-reservations.json",
         "ha-load-balancing-server1-mt-with-tls.json",
         "ha-load-balancing-server2-mt.json",
@@ -324,7 +323,6 @@ TEST_F(ConfigTestKeaV6, examples6) {
         "comments.json",
         "config-backend.json",
         "dhcpv4-over-dhcpv6.json",
-        "dnr.json",
         "duid.json",
         "global-reservations.json",
         "ha-hot-standby-server1-with-tls.json",