summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-04-18 16:12:43 +0200
committerGitHub <noreply@github.com>2024-04-18 16:12:43 +0200
commit3a50e87584a89047d8a5644f1b1d7b4805ab8238 (patch)
treece2614332d2f721b9a7d1020527da76740541ae6 /src
parentfc3fd89a6fa4a02147348563a7573349b9d9a39f (diff)
parentce0bc35f8b5ff80a7b8fbfdf1b9ccc10c5c254fd (diff)
downloadvyos-1x-3a50e87584a89047d8a5644f1b1d7b4805ab8238.tar.gz
vyos-1x-3a50e87584a89047d8a5644f1b1d7b4805ab8238.zip
Merge pull request #3326 from sever-sever/T6221
T6221: Return default ip rule values after deleting VRF
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/vrf.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index 1fc813189..587309005 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -315,6 +315,20 @@ def apply(vrf):
for chain, rule in nftables_rules.items():
cmd(f'nft flush chain inet vrf_zones {chain}')
+ # Return default ip rule values
+ if 'name' not in vrf:
+ for afi in ['-4', '-6']:
+ # move lookup local to pref 0 (from 32765)
+ if not has_rule(afi, 0, 'local'):
+ call(f'ip {afi} rule add pref 0 from all lookup local')
+ if has_rule(afi, 32765, 'local'):
+ call(f'ip {afi} rule del pref 32765 table local')
+
+ if has_rule(afi, 1000, 'l3mdev'):
+ call(f'ip {afi} rule del pref 1000 l3mdev protocol kernel')
+ if has_rule(afi, 2000, 'l3mdev'):
+ call(f'ip {afi} rule del pref 2000 l3mdev unreachable')
+
# Apply FRR filters
zebra_daemon = 'zebra'
# Save original configuration prior to starting any commit actions