From 77c7dfac383578ad6fabb9b3786681c267d0beb7 Mon Sep 17 00:00:00 2001
From: David Vølker <david@voelker.dk>
Date: Mon, 14 Apr 2025 20:23:12 +0200
Subject: kea: T7310: add support for RFC-5417 (option 138) (#4430)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* dhcp-server: T7310: add support for option 138 CAPWAP AC to KEA

* kea: T7310: Update data/templates/dhcp-server/kea-dhcp4.conf.j2

Co-authored-by: Simon <965089+sarthurdev@users.noreply.github.com>

* kea: T7310: Update python/vyos/kea.py

Co-authored-by: Simon <965089+sarthurdev@users.noreply.github.com>

* kea: T7310:  add smoketest for capwap-ac-v4

* kea: T7310: Update python/vyos/kea.py

Co-authored-by: Simon <965089+sarthurdev@users.noreply.github.com>

---------

Co-authored-by: David Vølker <davvol@davvol.dk>
Co-authored-by: Simon <965089+sarthurdev@users.noreply.github.com>
---
 interface-definitions/include/dhcp/option-v4.xml.i | 12 ++++++++++++
 interface-definitions/include/dhcp/option-v6.xml.i | 12 ++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/dhcp/option-v4.xml.i b/interface-definitions/include/dhcp/option-v4.xml.i
index bd6fc6043..08fbcca4a 100644
--- a/interface-definitions/include/dhcp/option-v4.xml.i
+++ b/interface-definitions/include/dhcp/option-v4.xml.i
@@ -59,6 +59,18 @@
         <constraintErrorMessage>DHCP client prefix length must be 0 to 32</constraintErrorMessage>
       </properties>
     </leafNode>
+    <leafNode name="capwap-controller">
+      <properties>
+        <help>IP address of CAPWAP access controller (Option 138)</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>CAPWAP AC controller</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
     <leafNode name="default-router">
       <properties>
         <help>IP address of default router</help>
diff --git a/interface-definitions/include/dhcp/option-v6.xml.i b/interface-definitions/include/dhcp/option-v6.xml.i
index e1897f52d..202843ddf 100644
--- a/interface-definitions/include/dhcp/option-v6.xml.i
+++ b/interface-definitions/include/dhcp/option-v6.xml.i
@@ -7,6 +7,18 @@
     #include <include/dhcp/captive-portal.xml.i>
     #include <include/dhcp/domain-search.xml.i>
     #include <include/name-server-ipv6.xml.i>
+    <leafNode name="capwap-controller">
+      <properties>
+        <help>IP address of CAPWAP access controller (Option 52)</help>
+        <valueHelp>
+          <format>ipv6</format>
+          <description>CAPWAP AC controller</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
     <leafNode name="nis-domain">
       <properties>
         <help>NIS domain name for client to use</help>
-- 
cgit v1.2.3