diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-04-11 17:40:13 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-04-12 21:16:19 +0200 |
| commit | c70a815437fdeed798f9a903873e7d95320bdb12 (patch) | |
| tree | 583886ac65eecd176e64e619d44f71f067058a4f /src/conf_mode | |
| parent | 2239e47fb3b2ba66d9ec7ff1a4bf5f5cb512ff83 (diff) | |
| download | vyos-1x-c70a815437fdeed798f9a903873e7d95320bdb12.tar.gz vyos-1x-c70a815437fdeed798f9a903873e7d95320bdb12.zip | |
bgp: T3328: route-map to zebra/kernel can not be removed
Removing the Zebra/Linux Kernel route-map added by "set protocols bgp route-map"
was not removed once applied. This was because the removal must happen within
the zebra daemon and not bgpd.
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/protocols_bgp.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py index ae210cf20..6b83087bf 100755 --- a/src/conf_mode/protocols_bgp.py +++ b/src/conf_mode/protocols_bgp.py @@ -34,8 +34,6 @@ from vyos import frr from vyos import airbag airbag.enable() -frr_daemon = 'bgpd' - def get_config(config=None): if config: conf = config @@ -205,25 +203,33 @@ def generate(bgp): return None def apply(bgp): + bgp_daemon = 'bgpd' + zebra_daemon = 'zebra' + # Save original configuration prior to starting any commit actions frr_cfg = frr.FRRConfig() - frr_cfg.load_configuration(frr_daemon) + + # 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 bgp route-map [-a-zA-Z0-9.]+$', '') + frr_cfg.commit_configuration(zebra_daemon) # Generate empty helper string which can be ammended to FRR commands, it # will be either empty (default VRF) or contain the "vrf <name" statement vrf = '' if 'vrf' in bgp: vrf = ' vrf ' + bgp['vrf'] - frr_cfg.modify_section(f'^router bgp \d+{vrf}$', '') + frr_cfg.load_configuration(bgp_daemon) + frr_cfg.modify_section(f'^router bgp \d+{vrf}$', '') frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', bgp['new_frr_config']) - frr_cfg.commit_configuration(frr_daemon) + frr_cfg.commit_configuration(bgp_daemon) # If FRR config is blank, rerun the blank commit x times due to frr-reload # behavior/bug not properly clearing out on one commit. if bgp['new_frr_config'] == '': for a in range(5): - frr_cfg.commit_configuration(frr_daemon) + frr_cfg.commit_configuration(bgp_daemon) # Save configuration to /run/frr/config/frr.conf frr.save_configuration() |