diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-10-06 15:17:17 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-12-16 22:21:36 +0100 |
| commit | 81923562a8a164f7ff9761e976c20420a585907a (patch) | |
| tree | 8fe525e8ab4bb0d07f9eb52b52816e50bcb956cf /src/conf_mode/vrf.py | |
| parent | 7538fd4c518271a517b6753dd664fd07cd86bddd (diff) | |
| download | vyos-1x-81923562a8a164f7ff9761e976c20420a585907a.tar.gz vyos-1x-81923562a8a164f7ff9761e976c20420a585907a.zip | |
frr: T6747: make daemon definitions re-usable for both conf-mode and smoketests
Diffstat (limited to 'src/conf_mode/vrf.py')
| -rwxr-xr-x | src/conf_mode/vrf.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py index 72b178c89..6d17c192c 100755 --- a/src/conf_mode/vrf.py +++ b/src/conf_mode/vrf.py @@ -339,17 +339,13 @@ def apply(vrf): 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 frr_cfg = frr.FRRConfig() - - # The route-map used for the FIB (zebra) is part of the zebra daemon - frr_cfg.load_configuration(zebra_daemon) + frr_cfg.load_configuration(frr.mgmt_daemon) frr_cfg.modify_section(f'^vrf .+', stop_pattern='^exit-vrf', remove_stop_mark=True) if 'frr_zebra_config' in vrf: frr_cfg.add_before(frr.default_add_before, vrf['frr_zebra_config']) - frr_cfg.commit_configuration(zebra_daemon) + frr_cfg.commit_configuration() return None |