diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-08-11 20:55:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-11 20:55:11 +0200 |
| commit | 7b42041ec7035a822bede3df4abbacb683f6d314 (patch) | |
| tree | a78693f2ea6726a79e4ac46e032df3227fd3c73b | |
| parent | 6fa4978e8bd57b3e50357a87eee4d884aba431ef (diff) | |
| parent | 38c5df79121096b13c423e8afef5897188e87351 (diff) | |
| download | vyos-1x-7b42041ec7035a822bede3df4abbacb683f6d314.tar.gz vyos-1x-7b42041ec7035a822bede3df4abbacb683f6d314.zip | |
Merge pull request #4645 from l0crian1/add-vni-map-description
vxlan: T7468: add VLAN-to-VNI mapping description
| -rw-r--r-- | interface-definitions/interfaces_vxlan.xml.in | 1 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces_vxlan.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/interface-definitions/interfaces_vxlan.xml.in b/interface-definitions/interfaces_vxlan.xml.in index f4cd4fcd2..0698d20b9 100644 --- a/interface-definitions/interfaces_vxlan.xml.in +++ b/interface-definitions/interfaces_vxlan.xml.in @@ -128,6 +128,7 @@ <constraintErrorMessage>Not a valid VLAN ID or range, VLAN ID must be between 0 and 4094</constraintErrorMessage> </properties> <children> + #include <include/generic-description.xml.i> <leafNode name="vni"> <properties> <help>Virtual Network Identifier</help> diff --git a/src/conf_mode/interfaces_vxlan.py b/src/conf_mode/interfaces_vxlan.py index 34eb3ef5c..81ebf8dda 100755 --- a/src/conf_mode/interfaces_vxlan.py +++ b/src/conf_mode/interfaces_vxlan.py @@ -66,7 +66,8 @@ def get_config(config=None): vxlan.update({'vlan_to_vni_removed': {}}) for vlan in tmp: vni = leaf_node_changed(conf, base + [ifname, 'vlan-to-vni', vlan, 'vni']) - vxlan['vlan_to_vni_removed'].update({vlan : {'vni' : vni[0]}}) + if vni: + vxlan['vlan_to_vni_removed'].update({vlan : {'vni' : vni[0]}}) # We need to verify that no other VXLAN tunnel is configured when external # mode is in use - Linux Kernel limitation |