diff options
author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2024-04-18 07:23:38 +0000 |
---|---|---|
committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-04-18 14:13:35 +0000 |
commit | 6d15ae068e4764d2f824ea519d4e9bcec8caf373 (patch) | |
tree | 5202c65159c9e97014b09a1267f8c62df0a5d2d9 /src | |
parent | e8f93864cf727fef9fc16d50ef79419a5955b656 (diff) | |
download | vyos-1x-6d15ae068e4764d2f824ea519d4e9bcec8caf373.tar.gz vyos-1x-6d15ae068e4764d2f824ea519d4e9bcec8caf373.zip |
T6221: Return default ip rule values after deleting VRF
Fix for restoring default ip rule values after deleting VRF
Defult values:
```
$ ip rule
0: from all lookup local
32766: from all lookup main
32767: from all lookup default
```
After adding and deleting a VRF we get unexpected values:
```
$ ip rule
1000: from all lookup [l3mdev-table]
2000: from all lookup [l3mdev-table] unreachable
32765: from all lookup local
32766: from all lookup main
32767: from all lookup default
```
(cherry picked from commit ce0bc35f8b5ff80a7b8fbfdf1b9ccc10c5c254fd)
Diffstat (limited to 'src')
-rwxr-xr-x | src/conf_mode/vrf.py | 14 |
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 |