summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-11-03 19:42:39 +0100
committerGitHub <noreply@github.com>2020-11-03 19:42:39 +0100
commit355fd1ba209225aa23183012be76485d1fd29ac3 (patch)
tree0d55409fc72bd5e4c05caaec2166492f04f54734
parent5b844448486b73da1bbbbb1401ceb9feff5bbf62 (diff)
parentdc7d01f1b9f881a564cb3ff1f77cf0c948ed9db7 (diff)
downloadvyos-1x-355fd1ba209225aa23183012be76485d1fd29ac3.tar.gz
vyos-1x-355fd1ba209225aa23183012be76485d1fd29ac3.zip
Merge pull request #593 from sever-sever/T2387
bgp-xml: T2387: Fix validators for neighbor update-source
-rw-r--r--interface-definitions/protocols-bgp.xml.in20
1 files changed, 15 insertions, 5 deletions
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index f2cc01301..6de8017f2 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -282,7 +282,7 @@
<constraint>
<validator name="ipv4-address"/>
<validator name="ipv6-address"/>
- <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|tun|vxlan|wg|wlan)[0-9]+</regex>
+ <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|vxlan|wg|wlan)[0-9]+</regex>
</constraint>
</properties>
<children>
@@ -628,7 +628,11 @@
<help>Source IP of routing updates</help>
<valueHelp>
<format>ipv4</format>
- <description>IP address of route source</description>
+ <description>IPv4 address of route source</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>IPv6 address of route source</description>
</valueHelp>
<valueHelp>
<format>&lt;interface&gt;</format>
@@ -636,7 +640,8 @@
</valueHelp>
<constraint>
<validator name="ipv4-address"/>
- <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|tun|vxlan|wg|wlan)[0-9]+</regex>
+ <validator name="ipv6-address"/>
+ <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|vxlan|wg|wlan)[0-9]+</regex>
</constraint>
</properties>
</leafNode>
@@ -1134,7 +1139,11 @@
<help>Source IP of routing updates</help>
<valueHelp>
<format>ipv4</format>
- <description>IP address of route source</description>
+ <description>IPv4 address of route source</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>IPv6 address of route source</description>
</valueHelp>
<valueHelp>
<format>&lt;interface&gt;</format>
@@ -1142,7 +1151,8 @@
</valueHelp>
<constraint>
<validator name="ipv4-address"/>
- <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|tun|vxlan|wg|wlan)[0-9]+</regex>
+ <validator name="ipv6-address"/>
+ <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|vxlan|wg|wlan)[0-9]+</regex>
</constraint>
</properties>
</leafNode>