diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-04-08 22:15:41 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-04-13 09:01:31 +0200 |
| commit | f9aa4c6312a773c216e65400db7e66849d5a02c7 (patch) | |
| tree | 4acad07c25a5b05c6d8a6fe33f4cb07dc26c103a /src/conf_mode/protocols_ospfv3.py | |
| parent | 3f4de1390d6459cdd17dd1b6f22b1a3aec002671 (diff) | |
| download | vyos-1x-f9aa4c6312a773c216e65400db7e66849d5a02c7.tar.gz vyos-1x-f9aa4c6312a773c216e65400db7e66849d5a02c7.zip | |
T5150: do not apply zebra route-map from routing-daemon config level
Diffstat (limited to 'src/conf_mode/protocols_ospfv3.py')
| -rwxr-xr-x | src/conf_mode/protocols_ospfv3.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py index 1e2c02d03..ee1fdd399 100755 --- a/src/conf_mode/protocols_ospfv3.py +++ b/src/conf_mode/protocols_ospfv3.py @@ -146,25 +146,15 @@ def generate(ospfv3): if not ospfv3 or 'deleted' in ospfv3: return None - ospfv3['protocol'] = 'ospf6' # required for frr/vrf.route-map.v6.frr.j2 - ospfv3['frr_zebra_config'] = render_to_string('frr/vrf.route-map.v6.frr.j2', ospfv3) ospfv3['new_frr_config'] = render_to_string('frr/ospf6d.frr.j2', ospfv3) return None def apply(ospfv3): ospf6_daemon = 'ospf6d' - zebra_daemon = 'zebra' # Save original configuration prior to starting any commit actions frr_cfg = frr.FRRConfig() - # The route-map used for the FIB (zebra) is part of the zebra daemon - frr_cfg.load_configuration(zebra_daemon) - frr_cfg.modify_section('(\s+)?ipv6 protocol ospf6 route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)') - if 'frr_zebra_config' in ospfv3: - frr_cfg.add_before(frr.default_add_before, ospfv3['frr_zebra_config']) - frr_cfg.commit_configuration(zebra_daemon) - # Generate empty helper string which can be ammended to FRR commands, it # will be either empty (default VRF) or contain the "vrf <name" statement vrf = '' |