diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-01 20:55:57 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-05-01 19:28:25 +0000 |
| commit | 1fb8c0445f015bfe6750a005d241b1950a694f0f (patch) | |
| tree | 2ffed828da444075230b2fc1a580e82e893dc2b0 /src/conf_mode/vrf.py | |
| parent | c37bbccf18b82f47bb7211a445b054d3606da3cb (diff) | |
| download | vyos-1x-1fb8c0445f015bfe6750a005d241b1950a694f0f.tar.gz vyos-1x-1fb8c0445f015bfe6750a005d241b1950a694f0f.zip | |
vrf: T6189: render FRR L3VNI configuration when creating VRF instance
When adding and removing VRF instances on the fly it was noticed that the vni
statement under the VRF instance in FRR vanishes. This was caused by a race
condition which was previously designed to fix another bug.
The wierd design of a Python helper below the VRF tree to only generate the
VNI configuration nodes is now gone and all is rendered in the proper place.
(cherry picked from commit e7bb65894f86372dc0f6e8fd39b1628e0a224c68)
Diffstat (limited to 'src/conf_mode/vrf.py')
| -rwxr-xr-x | src/conf_mode/vrf.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py index 587309005..8d8c234c0 100755 --- a/src/conf_mode/vrf.py +++ b/src/conf_mode/vrf.py @@ -130,11 +130,6 @@ def get_config(config=None): tmp = {'policy' : {'route-map' : conf.get_config_dict(['policy', 'route-map'], get_first_key=True)}} - # L3VNI setup is done via vrf_vni.py as it must be de-configured (on node - # deletetion prior to the BGP process. Tell the Jinja2 template no VNI - # setup is needed - vrf.update({'no_vni' : ''}) - # Merge policy dict into "regular" config dict vrf = dict_merge(tmp, vrf) return vrf |