frr: T6746: do not use FRRender apply() method when vyos-configd is running

1 files changed, 3 insertions, 2 deletions

diff --git a/src/conf_mode/system_ip.py b/src/conf_mode/system_ip.py
index 374e6e611..86843eb78 100755
--- a/src/conf_mode/system_ip.py
+++ b/src/conf_mode/system_ip.py
@@ -25,6 +25,7 @@ from vyos.configverify import verify_route_map
 from vyos.frrender import FRRender
 from vyos.utils.dict import dict_search
 from vyos.utils.process import is_systemd_service_active
+from vyos.utils.process import is_systemd_service_running
 from vyos.utils.system import sysctl_write
 from vyos import ConfigError
 from vyos import airbag
@@ -55,7 +56,7 @@ def verify(config_dict):
     return
 
 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
 
@@ -109,7 +110,7 @@ def apply(config_dict):
     # running when this script is called first. Skip this part and wait for initial
     # commit of the configuration to trigger this statement
     if is_systemd_service_active('frr.service'):
-        if config_dict and 'frrender_cls' not in config_dict:
+        if config_dict and not is_systemd_service_running('vyos-configd.service'):
             FRRender().apply()
 
     call_dependents()