summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-05-27 07:34:41 +0200
committerChristian Breunig <christian@breunig.cc>2024-05-27 07:34:41 +0200
commitf5d5dfc247aba17b7a4f0ce23dbbcb8d06ecb5b8 (patch)
treea8aced5af02ba0a80df1ea56d5d00ac0634458bf
parentb35188de4f872c76c0b8320b8f9ccefb63a081ae (diff)
downloadvyos-1x-f5d5dfc247aba17b7a4f0ce23dbbcb8d06ecb5b8.tar.gz
vyos-1x-f5d5dfc247aba17b7a4f0ce23dbbcb8d06ecb5b8.zip
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.
-rw-r--r--interface-definitions/service_dhcpv6-server.xml.in10
1 files 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>