From 14b3d4c35d94c88355722efd119acb7b64f0d0dc Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 30 Jan 2021 12:25:35 +0000
Subject: bgp: T3037: remove invalid CLI nodes for ipv6 specific dynamic
 capability

---
 interface-definitions/include/bgp-capability-dynamic.xml.i       | 9 ---------
 interface-definitions/include/bgp-capability.xml.i               | 7 ++++++-
 .../include/bgp-neighbor-afi-ipv4-unicast.xml.i                  | 1 -
 .../include/bgp-neighbor-afi-ipv6-unicast.xml.i                  | 1 -
 4 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 interface-definitions/include/bgp-capability-dynamic.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/bgp-capability-dynamic.xml.i b/interface-definitions/include/bgp-capability-dynamic.xml.i
deleted file mode 100644
index 3cf300156..000000000
--- a/interface-definitions/include/bgp-capability-dynamic.xml.i
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- included start from bgp-capability-dynamic.xml.i -->
-<!-- Capability dynamic in the afi ipv6 does nothing T3037 -->
-<leafNode name="dynamic">
-  <properties>
-    <help>Advertise dynamic capability to this neighbor</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/include/bgp-capability.xml.i b/interface-definitions/include/bgp-capability.xml.i
index 5940e46e4..8de5bd8ab 100644
--- a/interface-definitions/include/bgp-capability.xml.i
+++ b/interface-definitions/include/bgp-capability.xml.i
@@ -4,7 +4,12 @@
     <help>Advertise capabilities to this peer-group</help>
   </properties>
   <children>
-    #include <include/bgp-capability-dynamic.xml.i>
+    <leafNode name="dynamic">
+      <properties>
+        <help>Advertise dynamic capability to this neighbor</help>
+        <valueless/>
+      </properties>
+    </leafNode>
     <leafNode name="extended-nexthop">
       <properties>
         <help>Advertise extended-nexthop capability to this neighbor</help>
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 03a859271..8f6cf06b1 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
@@ -10,7 +10,6 @@
       </properties>
       <children>
         #include <include/bgp-afi-capability-orf.xml.i>
-        #include <include/bgp-capability-dynamic.xml.i>
       </children>
     </node>
     #include <include/bgp-afi-peer-group.xml.i>
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 e9ba23408..aea10c20c 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
@@ -10,7 +10,6 @@
       </properties>
       <children>
         #include <include/bgp-afi-capability-orf.xml.i>
-        #include <include/bgp-capability-dynamic.xml.i>
       </children>
     </node>
     #include <include/bgp-afi-peer-group.xml.i>
-- 
cgit v1.2.3