diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-04-13 15:07:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-13 15:07:50 +0100 |
| commit | 0439599a8e31ee1a4252a2c38bb512f414388870 (patch) | |
| tree | 74fdaf45958ca6cd209a4aa3c45bc5b5bc307127 /src/conf_mode/protocols_static.py | |
| parent | 78d846824df05682f63c2dc7d894aa501ed9f63f (diff) | |
| parent | 7d642a2862dcd0c7c2f80ac42ea9427970804d06 (diff) | |
| download | vyos-1x-0439599a8e31ee1a4252a2c38bb512f414388870.tar.gz vyos-1x-0439599a8e31ee1a4252a2c38bb512f414388870.zip | |
Merge pull request #1943 from c-po/t5150-frr
T5150: implementation of new Kernel/Zebra route-map support
Diffstat (limited to 'src/conf_mode/protocols_static.py')
| -rwxr-xr-x | src/conf_mode/protocols_static.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py index 3e5ebb805..7b6150696 100755 --- a/src/conf_mode/protocols_static.py +++ b/src/conf_mode/protocols_static.py @@ -105,20 +105,14 @@ def generate(static): def apply(static): static_daemon = 'staticd' - 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.modify_section(r'^ip protocol static route-map [-a-zA-Z0-9.]+', '') - frr_cfg.commit_configuration(zebra_daemon) frr_cfg.load_configuration(static_daemon) if 'vrf' in static: vrf = static['vrf'] - frr_cfg.modify_section(f'^vrf {vrf}', stop_pattern='^exit', remove_stop_mark=True) + frr_cfg.modify_section(f'^vrf {vrf}', stop_pattern='^exit-vrf', remove_stop_mark=True) else: frr_cfg.modify_section(r'^ip route .*') frr_cfg.modify_section(r'^ipv6 route .*') |