summaryrefslogtreecommitdiff
path: root/src/conf_mode/protocols_segment-routing.py
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-12-12 21:25:42 +0100
committerChristian Breunig <christian@breunig.cc>2024-12-16 22:24:50 +0100
commit7d99257902c2d638dbf9a8a095660d6aa0d92e38 (patch)
treedef8b5ed6e15c64bcbe92062e60d0d751bc2bdd9 /src/conf_mode/protocols_segment-routing.py
parent176f974d1c50aae44ec985467aa37f01ca6e0169 (diff)
downloadvyos-1x-7d99257902c2d638dbf9a8a095660d6aa0d92e38.tar.gz
vyos-1x-7d99257902c2d638dbf9a8a095660d6aa0d92e38.zip
frr: T6746: do not use FRRender apply() method when vyos-configd is running
Diffstat (limited to 'src/conf_mode/protocols_segment-routing.py')
-rwxr-xr-xsrc/conf_mode/protocols_segment-routing.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conf_mode/protocols_segment-routing.py b/src/conf_mode/protocols_segment-routing.py
index cc42e5ac7..99cf87556 100755
--- a/src/conf_mode/protocols_segment-routing.py
+++ b/src/conf_mode/protocols_segment-routing.py
@@ -23,6 +23,7 @@ from vyos.configverify import has_frr_protocol_in_dict
from vyos.frrender import FRRender
from vyos.ifconfig import Section
from vyos.utils.dict import dict_search
+from vyos.utils.process import is_systemd_service_running
from vyos.utils.system import sysctl_write
from vyos import ConfigError
from vyos import airbag
@@ -54,7 +55,7 @@ def verify(config_dict):
return None
def generate(config_dict):
- if config_dict and 'frrender_cls' not in config_dict:
+ if config_dict and not is_systemd_service_running('vyos-configd.service'):
FRRender().generate(config_dict)
return None
@@ -88,7 +89,7 @@ def apply(config_dict):
else:
sysctl_write(f'net.ipv6.conf.{interface}.seg6_enabled', '0')
- if config_dict and 'frrender_cls' not in config_dict:
+ if config_dict and not is_systemd_service_running('vyos-configd.service'):
FRRender().apply()
return None