summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-30 17:37:04 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-30 15:40:13 +0000
commit7fa7b5a6fce7ffd7862c9ba07c8b7a25ce056045 (patch)
treec95d4b61d4fe65e26916010922dac4571eb6d8c6 /interface-definitions
parent8fcd1d1d3976d54486e9129eb031ddeaf429aa75 (diff)
downloadvyos-1x-7fa7b5a6fce7ffd7862c9ba07c8b7a25ce056045.tar.gz
vyos-1x-7fa7b5a6fce7ffd7862c9ba07c8b7a25ce056045.zip
dhcpv6-server: T2406: merge sip-server-{address,name} to sip-server node
The subnet specific nodes sip-server-address & sip-server-name do the same for the user - specify a SIP server. Only the backend is rendered in a different way, as ISC DHCPv6 expects different options. There is absolutely no need for the user to distinguish between both two nodes.
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/dhcpv6-server.xml.in17
1 files changed, 6 insertions, 11 deletions
diff --git a/interface-definitions/dhcpv6-server.xml.in b/interface-definitions/dhcpv6-server.xml.in
index 7d4c0de23..03c826cbf 100644
--- a/interface-definitions/dhcpv6-server.xml.in
+++ b/interface-definitions/dhcpv6-server.xml.in
@@ -243,29 +243,24 @@
</tagNode>
</children>
</node>
- <leafNode name="sip-server-address">
+ <leafNode name="sip-server">
<properties>
<help>IPv6 address of SIP server</help>
<valueHelp>
<format>ipv6</format>
<description>IPv6 address of SIP server</description>
</valueHelp>
+ <valueHelp>
+ <format>hostname</format>
+ <description>FQDN of SIP server</description>
+ </valueHelp>
<constraint>
<validator name="ipv6-address"/>
+ <validator name="fqdn"/>
</constraint>
<multi/>
</properties>
</leafNode>
- <leafNode name="sip-server-name">
- <properties>
- <help>SIP server name</help>
- <constraint>
- <regex>[-_a-zA-Z0-9.]+</regex>
- </constraint>
- <constraintErrorMessage>Invalid SIP server name. May only contain letters, numbers and .-_</constraintErrorMessage>
- <multi/>
- </properties>
- </leafNode>
<leafNode name="sntp-server">
<properties>
<help>IPv6 address of an SNTP server for client to use</help>