Merge pull request #3525 from c-po/dhcpv6-T3493-constraintGroup

dhcpv6-server: T3493: add constraintGroup for prefix-delegation start/stop address
vyos · May 27, 2024 · 15cad14 · 15cad14
2 parents 5cd0e32 + f5d5dfc
commit 15cad14
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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>