From dd291b2312f0fca49ae8ad6876e280bc46f45d2e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 15 Feb 2021 17:23:33 +0100
Subject: bgp: T3311: remove remote-as from address-family

When moving from Quagga to FRR the BGP address-family was extended by an
invalid peer-group statement. FRR always moved a configured peer-group
from the AFI level down to the neighbor level.

With the migration to FRR reload we must take care about this by ourselves.
---
 interface-definitions/include/bgp-afi-peer-group.xml.i            | 7 -------
 interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i | 1 -
 interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i | 1 -
 interface-definitions/include/bgp-shutdown.xml.i                  | 2 +-
 4 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 interface-definitions/include/bgp-afi-peer-group.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/bgp-afi-peer-group.xml.i b/interface-definitions/include/bgp-afi-peer-group.xml.i
deleted file mode 100644
index c98a91030..000000000
--- a/interface-definitions/include/bgp-afi-peer-group.xml.i
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- included start from bgp-afi-peer-group.xml.i -->
-<leafNode name="peer-group">
-  <properties>
-    <help>Peer group used for this neighbor</help>
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
index 8f6cf06b1..ece277fbf 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
@@ -12,7 +12,6 @@
         #include <include/bgp-afi-capability-orf.xml.i>
       </children>
     </node>
-    #include <include/bgp-afi-peer-group.xml.i>
     #include <include/bgp-afi-ipv4-prefix-list.xml.i>
     #include <include/bgp-afi-common.xml.i>
   </children>
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
index aea10c20c..e43c34113 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
@@ -12,7 +12,6 @@
         #include <include/bgp-afi-capability-orf.xml.i>
       </children>
     </node>
-    #include <include/bgp-afi-peer-group.xml.i>
     #include <include/bgp-afi-ipv6-nexthop-local.xml.i>
     #include <include/bgp-afi-ipv6-prefix-list.xml.i>
     #include <include/bgp-afi-common.xml.i>
diff --git a/interface-definitions/include/bgp-shutdown.xml.i b/interface-definitions/include/bgp-shutdown.xml.i
index 330120bba..fefbfcebb 100644
--- a/interface-definitions/include/bgp-shutdown.xml.i
+++ b/interface-definitions/include/bgp-shutdown.xml.i
@@ -1,7 +1,7 @@
 <!-- included start from bgp-shutdown.xml.i -->
 <leafNode name="shutdown">
   <properties>
-    <help>Administratively shut down peer-group</help>
+    <help>Administratively shut down this neighbor</help>
     <valueless/>
   </properties>
 </leafNode>
-- 
cgit v1.2.3