summaryrefslogtreecommitdiff
path: root/src/conf_mode/protocols_isis.py
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-10-06 15:17:17 +0200
committerChristian Breunig <christian@breunig.cc>2024-12-16 22:21:36 +0100
commit81923562a8a164f7ff9761e976c20420a585907a (patch)
tree8fe525e8ab4bb0d07f9eb52b52816e50bcb956cf /src/conf_mode/protocols_isis.py
parent7538fd4c518271a517b6753dd664fd07cd86bddd (diff)
downloadvyos-1x-81923562a8a164f7ff9761e976c20420a585907a.tar.gz
vyos-1x-81923562a8a164f7ff9761e976c20420a585907a.zip
frr: T6747: make daemon definitions re-usable for both conf-mode and smoketests
Diffstat (limited to 'src/conf_mode/protocols_isis.py')
-rwxr-xr-xsrc/conf_mode/protocols_isis.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index ba2f3cf0d..9b70c7329 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -274,8 +274,6 @@ def generate(isis):
return None
def apply(isis):
- isis_daemon = 'isisd'
-
# Save original configuration prior to starting any commit actions
frr_cfg = frr.FRRConfig()
@@ -285,7 +283,7 @@ def apply(isis):
if 'vrf' in isis:
vrf = ' vrf ' + isis['vrf']
- frr_cfg.load_configuration(isis_daemon)
+ frr_cfg.load_configuration(frr.isis_daemon)
frr_cfg.modify_section(f'^router isis VyOS{vrf}', stop_pattern='^exit', remove_stop_mark=True)
for key in ['interface', 'interface_removed']:
@@ -297,7 +295,7 @@ def apply(isis):
if 'frr_isisd_config' in isis:
frr_cfg.add_before(frr.default_add_before, isis['frr_isisd_config'])
- frr_cfg.commit_configuration(isis_daemon)
+ frr_cfg.commit_configuration(frr.isis_daemon)
return None