From d95200e96763e4a7ed02577b1b177c84abb77838 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Fri, 16 Dec 2022 11:41:33 +0100
Subject: dhcp: T3316: Migrate dhcp/dhcpv6 server to Kea

---
 interface-definitions/include/dhcp/ping-check.xml.i               | 8 --------
 interface-definitions/include/version/dhcp-server-version.xml.i   | 2 +-
 interface-definitions/include/version/dhcpv6-server-version.xml.i | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 interface-definitions/include/dhcp/ping-check.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/dhcp/ping-check.xml.i b/interface-definitions/include/dhcp/ping-check.xml.i
deleted file mode 100644
index a506f68e4..000000000
--- a/interface-definitions/include/dhcp/ping-check.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from dhcp/ping-check.xml.i -->
-<leafNode name="ping-check">
-  <properties>
-    <help>Sends ICMP Echo request to the address being assigned</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/version/dhcp-server-version.xml.i b/interface-definitions/include/version/dhcp-server-version.xml.i
index 330cb7d1b..7c4b5633e 100644
--- a/interface-definitions/include/version/dhcp-server-version.xml.i
+++ b/interface-definitions/include/version/dhcp-server-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/dhcp-server-version.xml.i -->
-<syntaxVersion component='dhcp-server' version='6'></syntaxVersion>
+<syntaxVersion component='dhcp-server' version='7'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/dhcpv6-server-version.xml.i b/interface-definitions/include/version/dhcpv6-server-version.xml.i
index 4b2cf40aa..ae4178c90 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='1'></syntaxVersion>
+<syntaxVersion component='dhcpv6-server' version='2'></syntaxVersion>
 <!-- include end -->
-- 
cgit v1.2.3


From 4484a7398482caffdd5e0a74f73f46b162785bf3 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Wed, 26 Jul 2023 23:16:33 +0200
Subject: dhcp: T3316: Add captive portal v4/v6 options

---
 interface-definitions/dhcp-server.xml.in                |  1 +
 interface-definitions/dhcpv6-server.xml.in              |  1 +
 interface-definitions/include/dhcp/captive-portal.xml.i | 11 +++++++++++
 python/vyos/kea.py                                      |  6 ++++--
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 interface-definitions/include/dhcp/captive-portal.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 948f19048..0fa06c534 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -145,6 +145,7 @@
                       </constraint>
                     </properties>
                   </leafNode>
+                  #include <include/dhcp/captive-portal.xml.i>
                   <leafNode name="client-prefix-length">
                     <properties>
                       <help>Specifies the clients subnet mask as per RFC 950. If unset, subnet declaration is used.</help>
diff --git a/interface-definitions/dhcpv6-server.xml.in b/interface-definitions/dhcpv6-server.xml.in
index 16d0f9b01..b37f79434 100644
--- a/interface-definitions/dhcpv6-server.xml.in
+++ b/interface-definitions/dhcpv6-server.xml.in
@@ -135,6 +135,7 @@
                       </tagNode>
                     </children>
                   </node>
+                  #include <include/dhcp/captive-portal.xml.i>
                   #include <include/dhcp/domain-search.xml.i>
                   <node name="lease-time">
                     <properties>
diff --git a/interface-definitions/include/dhcp/captive-portal.xml.i b/interface-definitions/include/dhcp/captive-portal.xml.i
new file mode 100644
index 000000000..643f055a8
--- /dev/null
+++ b/interface-definitions/include/dhcp/captive-portal.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from dhcp/captive-portal.xml.i -->
+<leafNode name="captive-portal">
+  <properties>
+    <help>Captive portal API endpoint</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Captive portal API endpoint</description>
+    </valueHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/python/vyos/kea.py b/python/vyos/kea.py
index 0ee6871e7..fa2948233 100644
--- a/python/vyos/kea.py
+++ b/python/vyos/kea.py
@@ -40,7 +40,8 @@ kea4_options = {
     'bootfile_size': 'boot-size',
     'time_offset': 'time-offset',
     'wpad_url': 'wpad-url',
-    'ipv6_only_preferred': 'v6-only-preferred'
+    'ipv6_only_preferred': 'v6-only-preferred',
+    'captive_portal': 'v4-captive-portal'
 }
 
 kea6_options = {
@@ -51,7 +52,8 @@ kea6_options = {
     'nis_server': 'nis-servers',
     'nisplus_domain': 'nisp-domain-name',
     'nisplus_server': 'nisp-servers',
-    'sntp_server': 'sntp-servers'
+    'sntp_server': 'sntp-servers',
+    'captive_portal': 'v6-captive-portal'
 }
 
 def kea_parse_options(config):
-- 
cgit v1.2.3