summaryrefslogtreecommitdiff
path: root/src/conf_mode/protocols_static.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_static.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_static.py')
-rwxr-xr-xsrc/conf_mode/protocols_static.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py
index 430cc69d4..c5dc77fd2 100755
--- a/src/conf_mode/protocols_static.py
+++ b/src/conf_mode/protocols_static.py
@@ -102,11 +102,9 @@ def generate(static):
return None
def apply(static):
- static_daemon = 'staticd'
-
# Save original configuration prior to starting any commit actions
frr_cfg = frr.FRRConfig()
- frr_cfg.load_configuration(static_daemon)
+ frr_cfg.load_configuration(frr.mgmt_daemon)
if 'vrf' in static:
vrf = static['vrf']
@@ -117,7 +115,7 @@ def apply(static):
if 'new_frr_config' in static:
frr_cfg.add_before(frr.default_add_before, static['new_frr_config'])
- frr_cfg.commit_configuration(static_daemon)
+ frr_cfg.commit_configuration()
return None