diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-12-08 16:33:45 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-12-16 22:24:50 +0100 |
| commit | 779f311e7fe81e3c85de28f13e4e12e33b255483 (patch) | |
| tree | a7edc34394439a03b019be94cadd1837bcb7f7e0 /src/conf_mode/interfaces_bonding.py | |
| parent | 1666e3d99b8de700c880f09ce6ad5ea8bc7f4568 (diff) | |
| download | veeos-1x-779f311e7fe81e3c85de28f13e4e12e33b255483.tar.gz veeos-1x-779f311e7fe81e3c85de28f13e4e12e33b255483.zip | |
frr: T6746: integrate FRRender class into vyos-configd
When running under vyos-configd only a single apply() is done as last step in
the commit algorithm. FRRender class address is provided via an attribute from
vyos-configd process.
Diffstat (limited to 'src/conf_mode/interfaces_bonding.py')
| -rwxr-xr-x | src/conf_mode/interfaces_bonding.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/conf_mode/interfaces_bonding.py b/src/conf_mode/interfaces_bonding.py index adea8fc63..5f839b33c 100755 --- a/src/conf_mode/interfaces_bonding.py +++ b/src/conf_mode/interfaces_bonding.py @@ -45,7 +45,6 @@ from vyos.configdep import set_dependents, call_dependents from vyos import ConfigError from vyos import airbag airbag.enable() -frrender = FRRender() def get_bond_mode(mode): if mode == 'round-robin': @@ -94,7 +93,7 @@ def get_config(config=None): if tmp: bond.update({'shutdown_required' : {}}) tmp = is_node_changed(conf, base + [ifname, 'evpn']) - if tmp: bond.update({'frrender' : get_frrender_dict(conf)}) + 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']) @@ -264,13 +263,13 @@ def verify(bond): return None def generate(bond): - if 'frrender' in bond: - frrender.generate(bond['frrender']) + if 'frr_dict' in bond and 'frrender_cls' not in bond['frr_dict']: + FRRender().generate(bond['frr_dict']) return None def apply(bond): - if 'frrender' in bond: - frrender.apply() + if 'frr_dict' in bond and 'frrender_cls' not in bond['frr_dict']: + FRRender().apply() b = BondIf(bond['ifname']) if 'deleted' in bond: |