From 1fb8c0445f015bfe6750a005d241b1950a694f0f Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Wed, 1 May 2024 20:55:57 +0200
Subject: 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)
---
 interface-definitions/vrf.xml.in | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 94ed96e4b..a20be995a 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -120,20 +120,7 @@
               <constraintErrorMessage>VRF routing table must be in range from 100 to 65535</constraintErrorMessage>
             </properties>
           </leafNode>
-          <leafNode name="vni" owner="${vyos_conf_scripts_dir}/vrf_vni.py $VAR(../@)">
-            <properties>
-              <help>Virtual Network Identifier</help>
-              <!-- must be after BGP to keep correct order when removing L3VNIs in FRR -->
-              <priority>822</priority>
-              <valueHelp>
-                <format>u32:0-16777214</format>
-                <description>VXLAN virtual network identifier</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 0-16777214"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/vni.xml.i>
         </children>
       </tagNode>
     </children>
-- 
cgit v1.2.3