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_static.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/protocols_static.py')
| -rwxr-xr-x | src/conf_mode/protocols_static.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py index 1e498b256..69500377c 100755 --- a/src/conf_mode/protocols_static.py +++ b/src/conf_mode/protocols_static.py @@ -28,7 +28,6 @@ from vyos.template import render from vyos import ConfigError from vyos import airbag airbag.enable() -frrender = FRRender() vrf = None if len(argv) > 1: @@ -92,11 +91,14 @@ def generate(config_dict): # Put routing table names in /etc/iproute2/rt_tables render(config_file, 'iproute2/static.conf.j2', static) - frrender.generate(config_dict) + + if 'frrender_cls' not in config_dict: + FRRender().generate(config_dict) return None def apply(static): - frrender.apply() + if 'frrender_cls' not in config_dict: + FRRender().apply() return None if __name__ == '__main__': |