summaryrefslogtreecommitdiff
path: root/src/conf_mode/protocols_segment-routing.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_segment-routing.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_segment-routing.py')
-rwxr-xr-xsrc/conf_mode/protocols_segment-routing.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/conf_mode/protocols_segment-routing.py b/src/conf_mode/protocols_segment-routing.py
index b36c2ca11..67f8005ef 100755
--- a/src/conf_mode/protocols_segment-routing.py
+++ b/src/conf_mode/protocols_segment-routing.py
@@ -70,8 +70,6 @@ def generate(sr):
return None
def apply(sr):
- zebra_daemon = 'zebra'
-
if 'interface_removed' in sr:
for interface in sr['interface_removed']:
# Disable processing of IPv6-SR packets
@@ -97,11 +95,11 @@ def apply(sr):
# Save original configuration prior to starting any commit actions
frr_cfg = frr.FRRConfig()
- frr_cfg.load_configuration(zebra_daemon)
+ frr_cfg.load_configuration(frr.zebra_daemon)
frr_cfg.modify_section(r'^segment-routing')
if 'new_frr_config' in sr:
frr_cfg.add_before(frr.default_add_before, sr['new_frr_config'])
- frr_cfg.commit_configuration(zebra_daemon)
+ frr_cfg.commit_configuration(frr.zebra_daemon)
return None