Merge pull request #5492 from c-po/dev

frr: T9344: remove dead code path when vyos-configd is not running

25 files changed, 1 insertions, 173 deletions

diff --git a/src/conf_mode/interfaces_bonding.py b/src/conf_mode/interfaces_bonding.py
index 0f5554145..d5139bcf9 100755
--- a/src/conf_mode/interfaces_bonding.py
+++ b/src/conf_mode/interfaces_bonding.py
@@ -32,15 +32,12 @@ from vyos.configverify import verify_mtu_ipv6
 from vyos.configverify import verify_vlan_config
 from vyos.configverify import verify_vrf
 from vyos.ethtool import Ethtool
-from vyos.frrender import FRRender
-from vyos.frrender import get_frrender_dict
 from vyos.ifconfig import BondIf
 from vyos.ifconfig.ethernet import EthernetIf
 from vyos.utils.assertion import assert_mac
 from vyos.utils.dict import dict_search
 from vyos.utils.dict import dict_to_paths_values
 from vyos.utils.network import interface_exists
-from vyos.utils.process import is_systemd_service_running
 from vyos.configdict import has_address_configured
 from vyos.configdict import has_vrf_configured
 from vyos.configdep import set_dependents
@@ -96,9 +93,6 @@ def get_config(config=None):
     tmp = is_node_changed(conf, base + [ifname, 'lacp-rate'])
     if tmp: bond.update({'shutdown_required' : {}})
 
-    tmp = is_node_changed(conf, base + [ifname, 'evpn'])
-    if tmp: bond.update({'frr_dict' : get_frrender_dict(conf)})
-
     # determine which members have been removed
     interfaces_removed = leaf_node_changed(conf, base + [ifname, 'member', 'interface'])
     # Reset config level to interfaces
@@ -290,14 +284,9 @@ def verify(bond):
     return None
 
 def generate(bond):
-    if 'frr_dict' in bond and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(bond['frr_dict'])
     return None
 
 def apply(bond):
-    if 'frr_dict' in bond and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
-
     b = BondIf(bond['ifname'])
     if 'deleted' in bond:
         b.remove()
diff --git a/src/conf_mode/interfaces_ethernet.py b/src/conf_mode/interfaces_ethernet.py
index 45bd47e86..17b342434 100755
--- a/src/conf_mode/interfaces_ethernet.py
+++ b/src/conf_mode/interfaces_ethernet.py
@@ -40,8 +40,6 @@ from vyos.configverify import verify_bond_bridge_member
 from vyos.configverify import verify_eapol
 from vyos.ethtool import Ethtool
 from vyos.netlink import coalesce
-from vyos.frrender import FRRender
-from vyos.frrender import get_frrender_dict
 from vyos.ifconfig import EthernetIf
 from vyos.ifconfig import BondIf
 from vyos.utils.dict import dict_search
@@ -177,9 +175,6 @@ def get_config(config=None):
     tmp = is_node_changed(conf, base + [ifname, 'duplex'])
     if tmp: ethernet.update({'speed_duplex_changed': {}})
 
-    tmp = is_node_changed(conf, base + [ifname, 'evpn'])
-    if tmp: ethernet.update({'frr_dict' : get_frrender_dict(conf)})
-
     # T9228: Some NIC drivers do not support changing all settings we offer on
     # the CLI. The warning telling the user about the missing driver support is
     # emitted while applying the configuration - which happens on every commit
@@ -469,13 +464,9 @@ def verify_ethernet(ethernet: dict, ethtool: Ethtool) -> None:
     return None
 
 def generate(ethernet):
-    if 'frr_dict' in ethernet and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(ethernet['frr_dict'])
     return None
 
 def apply(ethernet):
-    if 'frr_dict' in ethernet and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     ifname = ethernet['ifname']
     e = EthernetIf(ifname)
     if 'deleted' in ethernet:
diff --git a/src/conf_mode/policy.py b/src/conf_mode/policy.py
index e92c273f7..9f10178af 100755
--- a/src/conf_mode/policy.py
+++ b/src/conf_mode/policy.py
@@ -19,11 +19,9 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.frrender import FRRender
 from vyos.frrender import frr_protocols
 from vyos.frrender import get_frrender_dict
 from vyos.utils.dict import dict_search
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos.base import Warning
 from vyos import airbag
@@ -299,13 +297,9 @@ def verify(config_dict):
 
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_babel.py b/src/conf_mode/protocols_babel.py
index a683031bd..5dd18f242 100755
--- a/src/conf_mode/protocols_babel.py
+++ b/src/conf_mode/protocols_babel.py
@@ -20,10 +20,8 @@ from vyos.config import Config
 from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_access_list
 from vyos.configverify import verify_prefix_list
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.utils.dict import dict_search
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -90,13 +88,9 @@ def verify(config_dict):
 
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py
index 953611f24..4d2f17a00 100755
--- a/src/conf_mode/protocols_bfd.py
+++ b/src/conf_mode/protocols_bfd.py
@@ -17,11 +17,9 @@
 from vyos.config import Config
 from vyos.configverify import verify_vrf
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.template import is_ipv6
 from vyos.utils.network import is_ipv6_link_local
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -78,12 +76,9 @@ def verify(config_dict):
     return None
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
+    return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index bde6fcdd0..03d424aa2 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -23,13 +23,11 @@ from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_prefix_list
 from vyos.configverify import verify_route_map
 from vyos.configverify import verify_vrf
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.template import is_ip
 from vyos.utils.dict import dict_search
 from vyos.utils.network import get_interface_vrf
 from vyos.utils.network import is_addr_assigned
-from vyos.utils.process import is_systemd_service_running
 from vyos.utils.process import process_named_running
 from vyos import ConfigError
 from vyos import airbag
@@ -673,13 +671,9 @@ def verify(config_dict):
     return None
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_eigrp.py b/src/conf_mode/protocols_eigrp.py
index 92e34237c..828e786bd 100755
--- a/src/conf_mode/protocols_eigrp.py
+++ b/src/conf_mode/protocols_eigrp.py
@@ -21,8 +21,6 @@ from vyos.config import Config
 from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_vrf
 from vyos.utils.dict import dict_search
-from vyos.utils.process import is_systemd_service_running
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos import ConfigError
 from vyos import airbag
@@ -56,13 +54,9 @@ def verify(config_dict):
         verify_vrf({'vrf': vrf})
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 67c13418d..2769ab6d7 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -21,12 +21,10 @@ from vyos.config import Config
 from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_common_route_maps
 from vyos.configverify import verify_interface_exists
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.ifconfig import Interface
 from vyos.utils.dict import dict_search
 from vyos.utils.network import get_interface_config
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -271,13 +269,9 @@ def verify(config_dict):
     return None
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_mpls.py b/src/conf_mode/protocols_mpls.py
index 841e5406f..9aa484423 100755
--- a/src/conf_mode/protocols_mpls.py
+++ b/src/conf_mode/protocols_mpls.py
@@ -21,11 +21,9 @@ from sys import exit
 from glob import glob
 from vyos.config import Config
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.utils.dict import dict_search
 from vyos.utils.file import read_file
-from vyos.utils.process import is_systemd_service_running
 from vyos.utils.system import sysctl_write
 from vyos.configverify import verify_interface_exists
 from vyos import ConfigError
@@ -68,14 +66,9 @@ def verify(config_dict):
     return None
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
-
     if not has_frr_protocol_in_dict(config_dict, 'mpls'):
         return None
 
diff --git a/src/conf_mode/protocols_nhrp.py b/src/conf_mode/protocols_nhrp.py
index 3901b20ba..1e9220fce 100755
--- a/src/conf_mode/protocols_nhrp.py
+++ b/src/conf_mode/protocols_nhrp.py
@@ -25,9 +25,7 @@ from vyos.utils.process import run
 from vyos.utils.dict import dict_search
 from vyos import ConfigError
 from vyos import airbag
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
-from vyos.utils.process import is_systemd_service_running
 
 airbag.enable()
 
@@ -104,8 +102,6 @@ def generate(config_dict):
         return None
     render(nhrp_nftables_conf, 'frr/nhrpd_nftables.conf.j2', config_dict['nhrp'])
 
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 
@@ -115,8 +111,6 @@ def apply(config_dict):
     if nft_rc != 0:
         raise ConfigError('Failed to apply NHRP tunnel firewall rules')
 
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 
diff --git a/src/conf_mode/protocols_openfabric.py b/src/conf_mode/protocols_openfabric.py
index f490d28bf..827286cb1 100644
--- a/src/conf_mode/protocols_openfabric.py
+++ b/src/conf_mode/protocols_openfabric.py
@@ -20,8 +20,6 @@ from vyos.base import Warning
 from vyos.config import Config
 from vyos.configverify import verify_interface_exists
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.utils.process import is_systemd_service_running
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos import ConfigError
 from vyos import airbag
@@ -90,13 +88,9 @@ def verify(config_dict):
     return None
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py
index 33eb4a762..47e1596a6 100755
--- a/src/conf_mode/protocols_ospf.py
+++ b/src/conf_mode/protocols_ospf.py
@@ -24,11 +24,9 @@ from vyos.configverify import verify_route_map
 from vyos.configverify import verify_interface_exists
 from vyos.configverify import verify_access_list
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.utils.dict import dict_search
 from vyos.utils.network import get_interface_config
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -198,13 +196,9 @@ def verify(config_dict):
     return None
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py
index 04d4671f8..df459766d 100755
--- a/src/conf_mode/protocols_ospfv3.py
+++ b/src/conf_mode/protocols_ospfv3.py
@@ -22,12 +22,10 @@ from vyos.configverify import verify_common_route_maps
 from vyos.configverify import verify_route_map
 from vyos.configverify import verify_interface_exists
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.ifconfig import Interface
 from vyos.utils.dict import dict_search
 from vyos.utils.network import get_interface_config
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -89,13 +87,9 @@ def verify(config_dict):
     return None
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py
index bb55aada0..0e8d2b476 100755
--- a/src/conf_mode/protocols_pim.py
+++ b/src/conf_mode/protocols_pim.py
@@ -24,10 +24,8 @@ from sys import exit
 from vyos.config import Config
 from vyos.configverify import verify_interface_exists
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.frrender import pim_daemon
-from vyos.utils.process import is_systemd_service_running
 from vyos.utils.process import process_named_running
 from vyos.utils.process import call
 from vyos import ConfigError
@@ -87,8 +85,6 @@ def verify(config_dict):
                 unique.append(gr_addr)
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
@@ -104,8 +100,6 @@ def apply(config_dict):
     if not pim_pid:
         call('/usr/lib/frr/pimd -d -F traditional --daemon -A 127.0.0.1')
 
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_pim6.py b/src/conf_mode/protocols_pim6.py
index f7803246a..b32290b9f 100755
--- a/src/conf_mode/protocols_pim6.py
+++ b/src/conf_mode/protocols_pim6.py
@@ -21,8 +21,6 @@ from sys import exit
 from vyos.config import Config
 from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_interface_exists
-from vyos.utils.process import is_systemd_service_running
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos import ConfigError
 from vyos import airbag
@@ -76,13 +74,9 @@ def verify(config_dict):
                 unique.append(gr_addr)
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_rip.py b/src/conf_mode/protocols_rip.py
index 315b02d59..f7592637d 100755
--- a/src/conf_mode/protocols_rip.py
+++ b/src/conf_mode/protocols_rip.py
@@ -21,10 +21,8 @@ from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_common_route_maps
 from vyos.configverify import verify_access_list
 from vyos.configverify import verify_prefix_list
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.utils.dict import dict_search
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -69,13 +67,9 @@ def verify(config_dict):
                                       f'with "split-horizon disable" for "{interface}"!')
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_ripng.py b/src/conf_mode/protocols_ripng.py
index 5e7aba6b6..e766cfde6 100755
--- a/src/conf_mode/protocols_ripng.py
+++ b/src/conf_mode/protocols_ripng.py
@@ -21,10 +21,8 @@ from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_common_route_maps
 from vyos.configverify import verify_access_list
 from vyos.configverify import verify_prefix_list
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.utils.dict import dict_search
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -69,13 +67,9 @@ def verify(config_dict):
                                       f'with "split-horizon disable" for "{interface}"!')
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_rpki.py b/src/conf_mode/protocols_rpki.py
index 81039d3da..8118a3d71 100755
--- a/src/conf_mode/protocols_rpki.py
+++ b/src/conf_mode/protocols_rpki.py
@@ -22,14 +22,12 @@ from sys import argv
 
 from vyos.config import Config
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.pki import wrap_openssh_public_key
 from vyos.pki import wrap_openssh_private_key
 from vyos.utils.dict import dict_search
 from vyos.utils.dict import dict_search_args
 from vyos.utils.file import write_file
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -109,13 +107,9 @@ def generate(config_dict):
                 write_file(cache_config['ssh']['public_key_file'], wrap_openssh_public_key(public_key_data, public_key_type))
                 write_file(cache_config['ssh']['private_key_file'], wrap_openssh_private_key(private_key_data))
 
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_segment-routing.py b/src/conf_mode/protocols_segment-routing.py
index b9689557e..d25d5945b 100755
--- a/src/conf_mode/protocols_segment-routing.py
+++ b/src/conf_mode/protocols_segment-routing.py
@@ -20,11 +20,9 @@ from sys import argv
 from vyos.config import Config
 from vyos.configdict import list_diff
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 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
@@ -111,8 +109,6 @@ def verify(config_dict):
     return None
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
@@ -145,8 +141,6 @@ def apply(config_dict):
         else:
             sysctl_write(['net', 'ipv6', 'conf', interface, 'seg6_enabled'], '0')
 
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py
index 7d2b4949e..b0e5f1151 100755
--- a/src/conf_mode/protocols_static.py
+++ b/src/conf_mode/protocols_static.py
@@ -23,12 +23,10 @@ from vyos.config import Config
 from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_common_route_maps
 from vyos.configverify import verify_vrf
-from vyos.frrender import FRRender
 from vyos.frrender import get_dhcp_route_interfaces
 from vyos.frrender import get_frrender_dict
 from vyos.utils.dict import dict_search
 from vyos.utils.file import write_file
-from vyos.utils.process import is_systemd_service_running
 from vyos.template import render
 from vyos import ConfigError
 from vyos import airbag
@@ -115,13 +113,9 @@ def generate(config_dict):
     # Put routing table names in /etc/iproute2/rt_tables
     render(config_file, 'iproute2/static.conf.j2', static)
 
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_traffic_engineering.py b/src/conf_mode/protocols_traffic_engineering.py
index 925585158..69dbba82f 100755
--- a/src/conf_mode/protocols_traffic_engineering.py
+++ b/src/conf_mode/protocols_traffic_engineering.py
@@ -18,9 +18,7 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.configverify import has_frr_protocol_in_dict
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
-from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 
@@ -72,8 +70,6 @@ def verify(config_dict):
 
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 
@@ -81,8 +77,6 @@ def apply(config_dict):
     if not has_frr_protocol_in_dict(config_dict, 'traffic_engineering'):
         return None
 
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
     return None
 
 
diff --git a/src/conf_mode/system_frr.py b/src/conf_mode/system_frr.py
index 5365ac294..864f3b29f 100755
--- a/src/conf_mode/system_frr.py
+++ b/src/conf_mode/system_frr.py
@@ -19,7 +19,6 @@ from sys import exit
 from vyos import ConfigError
 from vyos.base import Warning
 from vyos.config import Config
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.logger import syslog
 from vyos.template import render_to_string
@@ -27,7 +26,6 @@ from vyos.utils.boot import boot_configuration_complete
 from vyos.utils.file import read_file
 from vyos.utils.file import write_file
 from vyos.utils.process import call
-from vyos.utils.process import is_systemd_service_running
 
 from vyos import airbag
 airbag.enable()
@@ -66,15 +64,9 @@ def generate(frr_config):
 
     # profile could be automatically generated by frr in frr.conf
     # and needs to be updated as it is taking precedence
-    if 'frr_dict' in frr_config and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(frr_config['frr_dict'])
     return None
 
 def apply(frr_config):
-    # applying the profile configuration if necessary
-    if 'frr_dict' in frr_config and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
-
     # display warning to user
     if boot_configuration_complete() and frr_config.get('config_file_changed'):
         # Since FRR restart is not safe thing, better to give
diff --git a/src/conf_mode/system_ip.py b/src/conf_mode/system_ip.py
index 6aff982d7..a32cddf64 100755
--- a/src/conf_mode/system_ip.py
+++ b/src/conf_mode/system_ip.py
@@ -21,11 +21,8 @@ from vyos.configdep import set_dependents
 from vyos.configdep import call_dependents
 from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_route_map
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 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
@@ -61,8 +58,6 @@ def verify(config_dict):
     return
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
@@ -111,13 +106,6 @@ def apply(config_dict):
     value = '48' if (tmp is None) else tmp
     sysctl_write(['net', 'ipv4', 'tcp_mtu_probe_floor'], value)
 
-    # During startup of vyos-router that brings up FRR, the service is not yet
-    # 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 not is_systemd_service_running('vyos-configd.service'):
-            FRRender().apply()
-
     call_dependents()
     return None
 
diff --git a/src/conf_mode/system_ipv6.py b/src/conf_mode/system_ipv6.py
index 4e597b732..6f145ede6 100755
--- a/src/conf_mode/system_ipv6.py
+++ b/src/conf_mode/system_ipv6.py
@@ -22,12 +22,9 @@ from vyos.configdep import set_dependents
 from vyos.configdep import call_dependents
 from vyos.configverify import has_frr_protocol_in_dict
 from vyos.configverify import verify_route_map
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.utils.dict import dict_search
 from vyos.utils.file import write_file
-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
@@ -58,8 +55,6 @@ def verify(config_dict):
     return
 
 def generate(config_dict):
-    if config_dict and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(config_dict)
     return None
 
 def apply(config_dict):
@@ -96,13 +91,6 @@ def apply(config_dict):
             if name == 'accept_dad':
                 write_file(os.path.join(root, name), value)
 
-    # During startup of vyos-router that brings up FRR, the service is not yet
-    # 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 not is_systemd_service_running('vyos-configd.service'):
-            FRRender().apply()
-
     call_dependents()
     return None
 
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index 2e34e0be8..9acad8907 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -25,7 +25,6 @@ from vyos.configdict import node_changed
 from vyos.configverify import verify_route_map
 from vyos.defaults import wireguard_fwmark_pref
 from vyos.firewall import conntrack_required
-from vyos.frrender import FRRender
 from vyos.frrender import get_frrender_dict
 from vyos.ifconfig import Interface
 from vyos.template import render
@@ -37,7 +36,6 @@ from vyos.utils.network import get_vrf_members
 from vyos.utils.network import interface_exists
 from vyos.utils.process import call
 from vyos.utils.process import cmdl
-from vyos.utils.process import is_systemd_service_running
 from vyos.utils.process import popen
 from vyos.utils.system import sysctl_write
 from vyos import ConfigError
@@ -276,8 +274,6 @@ def generate(vrf):
     # Render iproute2 VR helper names
     render(config_file, 'iproute2/vrf.conf.j2', vrf)
 
-    if 'frr_dict' in vrf and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().generate(vrf['frr_dict'])
 
     return None
 
@@ -434,8 +430,6 @@ def apply(vrf):
             if has_rule(afi, 2000, 'l3mdev'):
                 call(f'ip {afi} rule del pref 2000 l3mdev unreachable')
 
-    if 'frr_dict' in vrf and not is_systemd_service_running('vyos-configd.service'):
-        FRRender().apply()
 
     return None