[#2866] Checkpoint before last use chasing

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index b23622bb6d565c27a896a9b723367f6edd3f82b3..0ef885fcd0be803ad6102a7e9a8adbbe4b1a18ce 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -1212,6 +1212,12 @@ This identifier will not change for this subnet unless the ``id``
 parameter is removed or set to 0. The value of 0 forces auto-generation
 of the subnet identifier.
 
+.. note::
+
+   The auto-generation of subnet identifier will be removed in a future
+   release. From 2.4.0 a subnet without an ``id`` entry or with the zero
+   value raises a warning at configuration time.
+
 .. _ipv4-subnet-prefix:
 
 IPv4 Subnet Prefix

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 245d740eefc3fd041c6e087a5d78bd849e0ed5e2..b1b94667b6525516c177071056a8c442831d576b 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -993,6 +993,12 @@ This identifier will not change for this subnet unless the ``id``
 parameter is removed or set to 0. The value of 0 forces auto-generation
 of the subnet identifier.
 
+.. note::
+
+   The auto-generation of subnet identifier will be removed in a future
+   release. From 2.4.0 a subnet without an ``id`` entry or with the zero
+   value raises a warning at configuration time.
+
 .. _ipv6-subnet-prefix:
 
 IPv6 Subnet Prefix

diff --git a/src/lib/cc/tests/json_feed_unittests.cc b/src/lib/cc/tests/json_feed_unittests.cc
index 84739f7f43592c10ab92aba21b3ff221b27f54cd..747d14212de3560cdc27807b31fd19baee462b5f 100644 (file)
--- a/src/lib/cc/tests/json_feed_unittests.cc
+++ b/src/lib/cc/tests/json_feed_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2023 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -367,6 +367,7 @@ TEST_F(JSONFeedTest, bashComment4) {
         "\"subnet4\": [ { "
         "    \"pools\": [ { \"pool\": \"192.0.2.1 - 192.0.2.100\" } ],"
         "    \"subnet\": \"192.0.2.0/24\", "
+        "    \"id\": 1, "
         "    \"interface\": \"eth0\""
         " } ],"
         "\"valid-lifetime\": 4000 } }";
@@ -389,6 +390,7 @@ TEST_F(JSONFeedTest, bashCommentsInline4) {
         "\"subnet4\": [ { "
         "    \"pools\": [ { \"pool\": \"192.0.2.1 - 192.0.2.100\" } ],"
         "    \"subnet\": \"192.0.2.0/24\", "
+        "    \"id\": 1, "
         "    \"interface\": \"eth0\""
         " } ],"
         "\"valid-lifetime\": 4000 } }";
@@ -412,6 +414,7 @@ TEST_F(JSONFeedTest, cppComments6) {
         "\"subnet6\": [ { "
         "    \"pools\": [ { \"pool\": \"2001:db8:1::/64\" } ],"
         "    \"subnet\": \"2001:db8:1::/48\", "
+        "    \"id\": 1, "
         "    \"interface\": \"eth0\""
         " } ],"
         "\"valid-lifetime\": 4000 } }";
@@ -436,6 +439,7 @@ TEST_F(JSONFeedTest, multilineComments6) {
         "\"subnet6\": [ { "
         "    \"pools\": [ { \"pool\": \"2001:db8:1::/64\" } ],"
         "    \"subnet\": \"2001:db8:1::/48\", "
+        "    \"id\": 1, "
         "    \"interface\": \"eth0\""
         " } ],"
         "\"valid-lifetime\": 4000 } }";