From f5d5dfc247aba17b7a4f0ce23dbbcb8d06ecb5b8 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 27 May 2024 07:34:41 +0200
Subject: dhcpv6-server: T3493: add constraintGroup for prefix-delegation
 start/stop address

In addition for testing that the supplied IPv6 address ends with ::, we also
verify that it's a proper IPv6 address, just in case.
---
 interface-definitions/service_dhcpv6-server.xml.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/interface-definitions/service_dhcpv6-server.xml.in b/interface-definitions/service_dhcpv6-server.xml.in
index effba3884..589eb709c 100644
--- a/interface-definitions/service_dhcpv6-server.xml.in
+++ b/interface-definitions/service_dhcpv6-server.xml.in
@@ -228,10 +228,11 @@
                             <format>ipv6</format>
                             <description>IPv6 address used in prefix delegation</description>
                           </valueHelp>
-                          <constraint>
+                          <constraintGroup>
+                            <validator name="ipv6-address"/>
                             <!-- IPv6 address used MUST end with :: -->
                             <regex>([a-fA-F0-9]{1,4}:)+:</regex>
-                          </constraint>
+                          </constraintGroup>
                         </properties>
                         <children>
                           <leafNode name="prefix-length">
@@ -254,10 +255,11 @@
                                 <format>ipv6</format>
                                 <description>IPv6 address used in prefix delegation</description>
                               </valueHelp>
-                              <constraint>
+                              <constraintGroup>
+                                <validator name="ipv6-address"/>
                                 <!-- IPv6 address used MUST end with :: -->
                                 <regex>([a-fA-F0-9]{1,4}:)+:</regex>
-                              </constraint>
+                              </constraintGroup>
                             </properties>
                           </leafNode>
                         </children>
-- 
cgit v1.2.3