Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vxlan: T6401: Avoid calling get_vxlan_vni_filter() unless we need it #3573

Merged
merged 1 commit into from
Jun 6, 2024
Merged

vxlan: T6401: Avoid calling get_vxlan_vni_filter() unless we need it #3573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions python/vyos/ifconfig/vxlan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,13 @@ def set_vlan_vni_mapping(self, state):
raise ValueError('Value out of range')

if 'vlan_to_vni_removed' in self.config:
cur_vni_filter = get_vxlan_vni_filter(self.ifname)
cur_vni_filter = None
if dict_search('parameters.vni_filter', self.config) != None:
cur_vni_filter = get_vxlan_vni_filter(self.ifname)

for vlan, vlan_config in self.config['vlan_to_vni_removed'].items():
# If VNI filtering is enabled, remove matching VNI filter
if dict_search('parameters.vni_filter', self.config) != None:
if cur_vni_filter != None:
vni = vlan_config['vni']
if vni in cur_vni_filter:
self._cmd(f'bridge vni delete dev {self.ifname} vni {vni}')
Expand Down
Loading