diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-04-21 13:38:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 13:38:13 +0100 |
| commit | 821bc4f511460123e958b8eaa2e588e4623fbfe6 (patch) | |
| tree | ca5283d32a34969fa95b9ee1f1421bf7f28db5bd /interface-definitions/vrf.xml.in | |
| parent | dcba3685345b0624c13f83211628136076feac79 (diff) | |
| parent | 97ef83ada9c42913bae3c80e0f2432bdf901312a (diff) | |
| download | vyos-1x-821bc4f511460123e958b8eaa2e588e4623fbfe6.tar.gz vyos-1x-821bc4f511460123e958b8eaa2e588e4623fbfe6.zip | |
Merge branch 'current' into current
Diffstat (limited to 'interface-definitions/vrf.xml.in')
| -rw-r--r-- | interface-definitions/vrf.xml.in | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in index 96c6d8be2..a7efe146a 100644 --- a/interface-definitions/vrf.xml.in +++ b/interface-definitions/vrf.xml.in @@ -34,6 +34,7 @@ </properties> <children> #include <include/interface/disable-forwarding.xml.i> + #include <include/system-ip-protocol.xml.i> </children> </node> <node name="ipv6"> @@ -42,6 +43,7 @@ </properties> <children> #include <include/interface/disable-forwarding.xml.i> + #include <include/system-ipv6-protocol.xml.i> </children> </node> <node name="protocols"> @@ -119,20 +121,7 @@ <constraintErrorMessage>VRF routing table must be in range from 100 to 65535</constraintErrorMessage> </properties> </leafNode> - <leafNode name="vni" owner="${vyos_conf_scripts_dir}/vrf_vni.py"> - <properties> - <help>Virtual Network Identifier</help> - <!-- priority must be after BGP --> - <priority>822</priority> - <valueHelp> - <format>u32:0-16777214</format> - <description>VXLAN virtual network identifier</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-16777214"/> - </constraint> - </properties> - </leafNode> + #include <include/vni.xml.i> </children> </tagNode> </children> |