From ce361fe12c430c792361479e5b5b3228141fd36f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 7 Apr 2021 14:53:49 +0200
Subject: vrf: T3344: re-add virtual network identifier

Commit 548d9057e3e (vrf: T3344: move dynamic routing protocols under "vrf name
<name> protocols") temporary removed the possibility to specify the VNI for a
given VRF to to changing of the CLI configuration nodes.

As VNI is set inside zebra, we can re-use the now widely deployed frr python
library to configure and change the configuration without any interference to
other FRR daemons.
---
 interface-definitions/include/vni.xml.i | 26 ++++++++++++++------------
 interface-definitions/vrf.xml.in        |  1 +
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/vni.xml.i b/interface-definitions/include/vni.xml.i
index faff4c3c3..be45c0c97 100644
--- a/interface-definitions/include/vni.xml.i
+++ b/interface-definitions/include/vni.xml.i
@@ -1,12 +1,14 @@
-          <leafNode name="vni">
-            <properties>
-              <help>Virtual Network Identifier</help>
-              <valueHelp>
-                <format>0-16777214</format>
-                <description>VXLAN virtual network identifier</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 0-16777214"/>
-              </constraint>
-            </properties>
-          </leafNode>
+<!-- include start from vni.xml.i -->
+<leafNode name="vni">
+  <properties>
+    <help>Virtual Network Identifier</help>
+    <valueHelp>
+      <format>0-16777214</format>
+      <description>VXLAN virtual network identifier</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-16777214"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 8a56b1bc0..a1ef45868 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -85,6 +85,7 @@
               <constraintErrorMessage>VRF routing table must be in range from 100 to 2147483647</constraintErrorMessage>
             </properties>
           </leafNode>
+          #include <include/vni.xml.i>
         </children>
       </tagNode>
     </children>
-- 
cgit v1.2.3