diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-11-27 10:32:01 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-11-27 10:32:01 +0100 |
| commit | ea3c7785d06ed341487efb800c141fa7a7797ba7 (patch) | |
| tree | 059a597089379c38de08d724ec2094015e4e8ee7 /src/conf_mode/protocols_ospf.py | |
| parent | 1c15e9de76f81383a32e60d2af54444dbb0474a1 (diff) | |
| download | vyos-1x-ea3c7785d06ed341487efb800c141fa7a7797ba7.tar.gz vyos-1x-ea3c7785d06ed341487efb800c141fa7a7797ba7.zip | |
frr: T3753: add default_add_before mnemonic for routing protocols to re-use code
Diffstat (limited to 'src/conf_mode/protocols_ospf.py')
| -rwxr-xr-x | src/conf_mode/protocols_ospf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py index 6ccda2e5a..71eb39205 100755 --- a/src/conf_mode/protocols_ospf.py +++ b/src/conf_mode/protocols_ospf.py @@ -210,7 +210,7 @@ def apply(ospf): # 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'(\s+)?ip protocol ospf route-map [-a-zA-Z0-9.]+$', '', '(\s|!)') - frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', ospf['frr_zebra_config']) + frr_cfg.add_before(frr.default_add_before, ospf['frr_zebra_config']) frr_cfg.commit_configuration(zebra_daemon) # Generate empty helper string which can be ammended to FRR commands, it @@ -228,7 +228,7 @@ def apply(ospf): for interface in ospf[key]: frr_cfg.modify_section(f'^interface {interface}{vrf}$', '') - frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', ospf['frr_ospfd_config']) + frr_cfg.add_before(frr.default_add_before, ospf['frr_ospfd_config']) frr_cfg.commit_configuration(ospf_daemon) # Save configuration to /run/frr/config/frr.conf |