diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-05-06 20:47:13 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-05-06 20:47:13 +0200 |
| commit | a732ceb20b65f1b1c5251b2e45394815b707b6fa (patch) | |
| tree | fae6298f904b3131ec252acef10cd4d11fd33036 /src/conf_mode | |
| parent | 137c57eb6b26e772304e5f01595d87205037e247 (diff) | |
| download | vyos-1x-a732ceb20b65f1b1c5251b2e45394815b707b6fa.tar.gz vyos-1x-a732ceb20b65f1b1c5251b2e45394815b707b6fa.zip | |
vrf: T3523: fix regex when removing dynamic routing protocols with a kernel route-map
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/protocols_bgp.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_isis.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_ospf.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py index aca1dbe46..2b0cb1fe2 100755 --- a/src/conf_mode/protocols_bgp.py +++ b/src/conf_mode/protocols_bgp.py @@ -248,7 +248,7 @@ def apply(bgp): # 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.modify_section(r'\s+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 diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py index d1e71c378..e3f57c6ba 100755 --- a/src/conf_mode/protocols_isis.py +++ b/src/conf_mode/protocols_isis.py @@ -205,7 +205,7 @@ def apply(isis): # 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 isis route-map [-a-zA-Z0-9.]+$', '') + frr_cfg.modify_section(r'\s+ip protocol isis route-map [-a-zA-Z0-9.]+$', '', ' ') frr_cfg.commit_configuration(zebra_daemon) # Generate empty helper string which can be ammended to FRR commands, it diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py index a6cd5c9db..b5fef0c64 100755 --- a/src/conf_mode/protocols_ospf.py +++ b/src/conf_mode/protocols_ospf.py @@ -186,7 +186,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'^ip protocol ospf route-map [-a-zA-Z0-9.]+$', '') + frr_cfg.modify_section(r'\s+ip protocol ospf route-map [-a-zA-Z0-9.]+$', '', ' ') frr_cfg.commit_configuration(zebra_daemon) # Generate empty helper string which can be ammended to FRR commands, it |