diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-02-28 19:48:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-28 19:48:51 +0100 |
| commit | 3e448bd51685688bdae6ec698a3923cfdeb83689 (patch) | |
| tree | fe2d66479b80af79153154c8890065fa37aa974f /interface-definitions | |
| parent | 440e116cebac31cb51507b23add9d5c5cb414513 (diff) | |
| parent | 3755dfa7612ffa7edc94537220340a00c9db13ad (diff) | |
| download | vyos-1x-3e448bd51685688bdae6ec698a3923cfdeb83689.tar.gz vyos-1x-3e448bd51685688bdae6ec698a3923cfdeb83689.zip | |
Merge pull request #5014 from natali-rs1985/T8296
vpp: T8296: Move vxlan interface from vpp section to 'interfaces vpp vxlan'
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/vpp.xml.in | 22 | ||||
| -rw-r--r-- | interface-definitions/vpp_interface_vxlan.xml.in | 35 |
2 files changed, 35 insertions, 22 deletions
diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in index 9f245aaf3..cf947a29d 100644 --- a/interface-definitions/vpp.xml.in +++ b/interface-definitions/vpp.xml.in @@ -186,28 +186,6 @@ #include <include/kernel-interface-tun.xml.i> </children> </tagNode> - <tagNode name="vxlan" owner="${vyos_conf_scripts_dir}/vpp_interfaces_vxlan.py"> - <properties> - <priority>325</priority> - <help>Virtual Extensible LAN (VXLAN) Interface</help> - <constraint> - <regex>vxlan[0-9]+</regex> - </constraint> - <constraintErrorMessage>VXLAN interface must be named vxlanN</constraintErrorMessage> - <valueHelp> - <format>vxlanN</format> - <description>VXLAN interface name</description> - </valueHelp> - </properties> - <children> - #include <include/generic-description.xml.i> - #include <include/interface/disable.xml.i> - #include <include/source-address-ipv4-ipv6.xml.i> - #include <include/interface/tunnel-remote.xml.i> - #include <include/vni.xml.i> - #include <include/kernel-interface-tap.xml.i> - </children> - </tagNode> <tagNode name="xconnect" owner="${vyos_conf_scripts_dir}/vpp_interfaces_xconnect.py"> <properties> <help>Layer 2 cross connect</help> diff --git a/interface-definitions/vpp_interface_vxlan.xml.in b/interface-definitions/vpp_interface_vxlan.xml.in new file mode 100644 index 000000000..2d0ae42ab --- /dev/null +++ b/interface-definitions/vpp_interface_vxlan.xml.in @@ -0,0 +1,35 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name='interfaces'> + <children> + <node name='vpp'> + <children> + <tagNode name="vxlan" owner="${vyos_conf_scripts_dir}/vpp_interfaces_vxlan.py"> + <properties> + <priority>325</priority> + <help>Virtual Extensible LAN (VXLAN) Interface</help> + <constraint> + <regex>vppvxlan[0-9]+</regex> + </constraint> + <constraintErrorMessage>VXLAN interface must be named vppvxlanN</constraintErrorMessage> + <valueHelp> + <format>vppvxlanN</format> + <description>VXLAN interface name</description> + </valueHelp> + </properties> + <children> + #include <include/generic-description.xml.i> + #include <include/interface/disable.xml.i> + #include <include/source-address-ipv4-ipv6.xml.i> + #include <include/interface/tunnel-remote.xml.i> + #include <include/vni.xml.i> + #include <include/interface/address-ipv4-ipv6.xml.i> + #include <include/interface/mtu-68-16000.xml.i> + #include <include/vpp/vif.xml.i> + </children> + </tagNode> + </children> + </node> + </children> + </node> +</interfaceDefinition> |