From 20eee1c4e17b9c5f20d51bd6eaad2615b729923f Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 27 Apr 2023 22:01:34 +0200
Subject: Revert "bgp: T3734: only support "l2vpn-evpn advertise-all-vni" in
 default VRF"

This reverts commit bfe57cf80f4c71236f0885408d704a69575f0b30.
---
 .../include/bgp/protocol-common-config.xml.i               |  6 ++++++
 interface-definitions/protocols-bgp.xml.in                 | 14 --------------
 2 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index bcc131f83..527eaf991 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -810,6 +810,12 @@
             </node>
           </children>
         </node>
+        <leafNode name="advertise-all-vni">
+          <properties>
+            <help>Advertise All local VNIs</help>
+            <valueless/>
+          </properties>
+        </leafNode>
         #include <include/bgp/afi-l2vpn-common.xml.i>
         <leafNode name="advertise-pip">
           <properties>
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index 78b461f9d..e1a822999 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -9,20 +9,6 @@
         </properties>
         <children>
           #include <include/bgp/protocol-common-config.xml.i>
-          <node name="address-family">
-            <children>
-              <node name="l2vpn-evpn">
-                <children>
-                  <leafNode name="advertise-all-vni">
-                    <properties>
-                      <help>Advertise all local VNIs</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-            </children>
-          </node>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3