From a732ceb20b65f1b1c5251b2e45394815b707b6fa Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 6 May 2021 20:47:13 +0200 Subject: vrf: T3523: fix regex when removing dynamic routing protocols with a kernel route-map --- src/conf_mode/protocols_bgp.py | 2 +- src/conf_mode/protocols_isis.py | 2 +- 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 -- cgit v1.2.3