diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-11-02 12:16:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 12:16:26 +0100 |
| commit | b44182571426d8bf71dcc27354548ab05e0cb031 (patch) | |
| tree | 3c825c41aacfe725703ceb5b6adcd844a027c497 /interface-definitions | |
| parent | c3fc9ee32a43b938dc44fa41d98bfcc95fdbd359 (diff) | |
| parent | bcfd427dd415cde6fdce170f3abc2fb6c6b340fa (diff) | |
| download | vyos-1x-b44182571426d8bf71dcc27354548ab05e0cb031.tar.gz vyos-1x-b44182571426d8bf71dcc27354548ab05e0cb031.zip | |
Merge pull request #589 from sever-sever/T2387
bgp-xml: T2387: Fix validators and add capability for new format bgp
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i | 7 | ||||
| -rw-r--r-- | interface-definitions/protocols-bgp.xml.in | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i index dcdc0eb66..63bf582db 100644 --- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i +++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i @@ -59,6 +59,13 @@ <help>Advertise capabilities to this neighbor (IPv6)</help> </properties> <children> + <!-- Capability dynamic in the afi ipv6 does nothing T3037 --> + <leafNode name="dynamic"> + <properties> + <help>Advertise dynamic capability to this neighbor</help> + <valueless/> + </properties> + </leafNode> <node name="orf"> <properties> <help>Advertise ORF capability to this neighbor</help> diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in index e1469d6ad..f2cc01301 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>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex> + <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|tun|vxlan|wg|wlan)[0-9]+</regex> </constraint> </properties> <children> @@ -636,7 +636,7 @@ </valueHelp> <constraint> <validator name="ipv4-address"/> - <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex> + <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|tun|vxlan|wg|wlan)[0-9]+</regex> </constraint> </properties> </leafNode> @@ -1142,7 +1142,7 @@ </valueHelp> <constraint> <validator name="ipv4-address"/> - <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex> + <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|tun|vxlan|wg|wlan)[0-9]+</regex> </constraint> </properties> </leafNode> |