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/protocols_pim.py | |
| parent | 1666e3d99b8de700c880f09ce6ad5ea8bc7f4568 (diff) | |
| download | vyos-1x-779f311e7fe81e3c85de28f13e4e12e33b255483.tar.gz vyos-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/protocols_pim.py')
| -rwxr-xr-x | src/conf_mode/protocols_pim.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py index 1ff7203b2..df0e82d69 100755 --- a/src/conf_mode/protocols_pim.py +++ b/src/conf_mode/protocols_pim.py @@ -32,7 +32,6 @@ from vyos.utils.process import call from vyos import ConfigError from vyos import airbag airbag.enable() -frrender = FRRender() def get_config(config=None): if config: @@ -87,7 +86,9 @@ def verify(config_dict): unique.append(gr_addr) def generate(config_dict): - frrender.generate(config_dict) + if 'frrender_cls' not in config_dict: + FRRender().generate(config_dict) + return None def apply(config_dict): if not has_frr_protocol_in_dict(config_dict, 'pim'): @@ -102,7 +103,8 @@ def apply(config_dict): if not pim_pid: call('/usr/lib/frr/pimd -d -F traditional --daemon -A 127.0.0.1') - frrender.apply() + if 'frrender_cls' not in config_dict: + FRRender().apply() return None if __name__ == '__main__': |