From 580baddebb933ef388c7adabf4f4971c03decf5f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 14 Feb 2021 17:25:06 +0100
Subject: bgp: T1513: add per VNI advertise-default-gw, advertise-svi-ip
 options

---
 .../include/bgp-afi-l2vpn-common.xml.i              | 14 ++++++++++++++
 interface-definitions/protocols-bgp.xml.in          | 21 ++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 interface-definitions/include/bgp-afi-l2vpn-common.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/bgp-afi-l2vpn-common.xml.i b/interface-definitions/include/bgp-afi-l2vpn-common.xml.i
new file mode 100644
index 000000000..11b1cf6bf
--- /dev/null
+++ b/interface-definitions/include/bgp-afi-l2vpn-common.xml.i
@@ -0,0 +1,14 @@
+<!-- included start from bgp-afi-l2vpn-common.xml.i -->
+<leafNode name="advertise-default-gw">
+  <properties>
+    <help>Advertise All default g/w mac-ip routes in EVPN</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="advertise-svi-ip">
+  <properties>
+    <help>Advertise svi mac-ip routes in EVPN</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index 01463ed57..4af53acdc 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -228,12 +228,7 @@
                       <valueless/>
                     </properties>
                   </leafNode>
-                  <leafNode name="advertise-default-gw">
-                    <properties>
-                      <help>Advertise All default g/w mac-ip routes in EVPN</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
+                  #include <include/bgp-afi-l2vpn-common.xml.i>
                   <leafNode name="advertise-pip">
                     <properties>
                       <help>EVPN system primary IP</help>
@@ -246,12 +241,6 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  <leafNode name="advertise-svi-ip">
-                    <properties>
-                      <help>Advertise svi mac-ip routes in EVPN</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
                   <leafNode name="rt-auto-derive">
                     <properties>
                       <help>Auto derivation of Route Target (RFC8365)</help>
@@ -332,7 +321,7 @@
                       </leafNode>
                     </children>
                   </node>
-                  <leafNode name="vni">
+                  <tagNode name="vni">
                     <properties>
                       <help>VXLAN Network Identifier</help>
                       <valueHelp>
@@ -342,9 +331,11 @@
                       <constraint>
                         <validator name="numeric" argument="--range 1-16777215"/>
                       </constraint>
-                      <multi/>
                     </properties>
-                  </leafNode>
+                    <children>
+                      #include <include/bgp-afi-l2vpn-common.xml.i>
+                    </children>
+                  </tagNode>
                 </children>
               </node>
             </children>
-- 
cgit v1.2.3