diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-12-12 21:25:42 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-12-16 22:24:50 +0100 |
| commit | 7d99257902c2d638dbf9a8a095660d6aa0d92e38 (patch) | |
| tree | def8b5ed6e15c64bcbe92062e60d0d751bc2bdd9 /src/conf_mode/protocols_pim.py | |
| parent | 176f974d1c50aae44ec985467aa37f01ca6e0169 (diff) | |
| download | vyos-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_pim.py')
| -rwxr-xr-x | src/conf_mode/protocols_pim.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py index c40b9d86a..477895b0b 100755 --- a/src/conf_mode/protocols_pim.py +++ b/src/conf_mode/protocols_pim.py @@ -27,6 +27,7 @@ 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 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 @@ -86,7 +87,7 @@ def verify(config_dict): unique.append(gr_addr) 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 @@ -103,7 +104,7 @@ 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 'frrender_cls' not in config_dict: + if config_dict and not is_systemd_service_running('vyos-configd.service'): FRRender().apply() return None |