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/interfaces_bonding.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/interfaces_bonding.py')
| -rwxr-xr-x | src/conf_mode/interfaces_bonding.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/conf_mode/interfaces_bonding.py b/src/conf_mode/interfaces_bonding.py index 5f839b33c..0844d2913 100755 --- a/src/conf_mode/interfaces_bonding.py +++ b/src/conf_mode/interfaces_bonding.py @@ -39,9 +39,11 @@ 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, call_dependents +from vyos.configdep import set_dependents +from vyos.configdep import call_dependents from vyos import ConfigError from vyos import airbag airbag.enable() @@ -263,12 +265,12 @@ def verify(bond): return None def generate(bond): - if 'frr_dict' in bond and 'frrender_cls' not in bond['frr_dict']: + 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 'frrender_cls' not in bond['frr_dict']: + if 'frr_dict' in bond and not is_systemd_service_running('vyos-configd.service'): FRRender().apply() b = BondIf(bond['ifname']) |
