summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-21 18:18:52 +0100
committerChristian Poessinger <christian@poessinger.com>2021-03-21 19:09:58 +0100
commitd89455ee7f5dc21d00bbeddd57eaee2e32f45f99 (patch)
tree5cd57db0a826e427863ac135c78ab794ab71e064 /src/conf_mode
parent018eda75b6202dc2006b62ad0132298087d696bc (diff)
downloadvyos-1x-d89455ee7f5dc21d00bbeddd57eaee2e32f45f99.tar.gz
vyos-1x-d89455ee7f5dc21d00bbeddd57eaee2e32f45f99.zip
isis: T3417: add workaround for FRR issue
We need to adjust the regex pattern for the default VRF as a trailing whitespace is required due to an FRR issue: https://github.com/FRRouting/frr/issues/8300
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/protocols_isis.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 68934b565..530f55ce4 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -189,9 +189,9 @@ def apply(isis):
# it will be either empty (default VRF) or contain the "vrf <name" statement
vrf = ''
if 'vrf' in isis:
- vrf = ' vrf ' + isis['vrf']
+ vrf = 'vrf ' + isis['vrf']
- frr_cfg.modify_section(f'^router isis \S+{vrf}$', '')
+ frr_cfg.modify_section(f'^router isis \S+ {vrf}', '')
for key in ['interface', 'interface_removed']:
if key not in isis:
continue