From ee494c3a1dbfca3457bcaffe89d45971348e4848 Mon Sep 17 00:00:00 2001
From: Simon <965089+sarthurdev@users.noreply.github.com>
Date: Thu, 11 Jan 2024 06:46:33 +0100
Subject: dhcp: dhcpv6: T3316: Add `subnet-id` so leases remain mapped to
 entries in the lease file (#2796)

---
 .../include/version/dhcpv6-server-version.xml.i              |  2 +-
 interface-definitions/service_dhcp-server.xml.in             | 12 ++++++++++++
 interface-definitions/service_dhcpv6-server.xml.in           | 12 ++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/version/dhcpv6-server-version.xml.i b/interface-definitions/include/version/dhcpv6-server-version.xml.i
index cb026a54a..bfef27b77 100644
--- a/interface-definitions/include/version/dhcpv6-server-version.xml.i
+++ b/interface-definitions/include/version/dhcpv6-server-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/dhcpv6-server-version.xml.i -->
-<syntaxVersion component='dhcpv6-server' version='3'></syntaxVersion>
+<syntaxVersion component='dhcpv6-server' version='4'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/service_dhcp-server.xml.in b/interface-definitions/service_dhcp-server.xml.in
index 27485b6d4..5c9d4a360 100644
--- a/interface-definitions/service_dhcp-server.xml.in
+++ b/interface-definitions/service_dhcp-server.xml.in
@@ -200,6 +200,18 @@
                       #include <include/interface/duid.xml.i>
                     </children>
                   </tagNode>
+                  <leafNode name="subnet-id">
+                    <properties>
+                      <help>Unique ID mapped to leases in the lease file</help>
+                      <valueHelp>
+                        <format>u32</format>
+                        <description>Unique subnet ID</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-4294967295"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
                 </children>
               </tagNode>
             </children>
diff --git a/interface-definitions/service_dhcpv6-server.xml.in b/interface-definitions/service_dhcpv6-server.xml.in
index 6f7f3c1da..6934ceeec 100644
--- a/interface-definitions/service_dhcpv6-server.xml.in
+++ b/interface-definitions/service_dhcpv6-server.xml.in
@@ -337,6 +337,18 @@
                       </leafNode>
                     </children>
                   </tagNode>
+                  <leafNode name="subnet-id">
+                    <properties>
+                      <help>Unique ID mapped to leases in the lease file</help>
+                      <valueHelp>
+                        <format>u32</format>
+                        <description>Unique subnet ID</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-4294967295"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
                   <node name="vendor-option">
                     <properties>
                       <help>Vendor Specific Options</help>
-- 
cgit v1.2.3