From d7df1aea35dedb6fd4542064dbb1219ec6efbdd6 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 1 Jun 2025 13:26:37 +0200
Subject: op-mode: T7509: add "detail" and "wide" modifier for
 advertised-routes

show ip bgp neighbors <ip> advertised-routes [detail [wide]|wide]

show bgp neighbors <ip> advertised-routes [detail [wide]|wide]
show bgp ipv4 neighbors <ip> advertised-routes [detail [wide]|wide]
show bgp ipv6 neighbors <ip> advertised-routes [detail [wide]|wide]

show bgp vrf <name> neighbors <ip> advertised-routes [detail [wide]|wide]
show bgp vrf <name> ipv4 neighbors <ip> advertised-routes [detail [wide]|wide]
show bgp vrf <name> ipv6 neighbors <ip> advertised-routes [detail [wide]|wide]
---
 op-mode-definitions/include/bgp/advertised-routes.xml.i     | 12 ++++++++++++
 op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i  |  7 +------
 op-mode-definitions/include/bgp/show-bgp-common.xml.i       |  7 +------
 op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i    |  7 +------
 op-mode-definitions/include/vtysh-generic-detail-wide.xml.i | 11 +++++++++++
 5 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 op-mode-definitions/include/bgp/advertised-routes.xml.i
 create mode 100644 op-mode-definitions/include/vtysh-generic-detail-wide.xml.i

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/bgp/advertised-routes.xml.i b/op-mode-definitions/include/bgp/advertised-routes.xml.i
new file mode 100644
index 000000000..cc3f1f9b5
--- /dev/null
+++ b/op-mode-definitions/include/bgp/advertised-routes.xml.i
@@ -0,0 +1,12 @@
+<!-- included start from bgp/advertised-routes.xml.i -->
+<node name="advertised-routes">
+  <properties>
+    <help>Show routes advertised to a BGP neighbor</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    #include <include/vtysh-generic-detail-wide.xml.i>
+    #include <include/vtysh-generic-wide.xml.i>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
index 820d507fd..a6faa4949 100644
--- a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
@@ -158,12 +158,7 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
   <children>
-    <leafNode name="advertised-routes">
-      <properties>
-        <help>Show routes advertised to a BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/bgp/advertised-routes.xml.i>
     <leafNode name="dampened-routes">
       <properties>
         <help>Show dampened routes received from BGP neighbor</help>
diff --git a/op-mode-definitions/include/bgp/show-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
index d888bc3b0..8d2c3d1b9 100644
--- a/op-mode-definitions/include/bgp/show-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
@@ -128,12 +128,7 @@
           </properties>
           <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
           <children>
-            <leafNode name="advertised-routes">
-              <properties>
-                <help>Show routes advertised to a BGP neighbor</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
+            #include <include/bgp/advertised-routes.xml.i>
             <leafNode name="routes">
               <properties>
                 <help>Show routes learned from BGP neighbor</help>
diff --git a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
index db9021f3e..49e035b5f 100644
--- a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
@@ -81,12 +81,7 @@
           </properties>
           <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
           <children>
-            <leafNode name="advertised-routes">
-              <properties>
-                <help>Show routes advertised to a BGP neighbor</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
+            #include <include/bgp/advertised-routes.xml.i>
             <leafNode name="prefix-counts">
               <properties>
                 <help>Show detailed prefix count information</help>
diff --git a/op-mode-definitions/include/vtysh-generic-detail-wide.xml.i b/op-mode-definitions/include/vtysh-generic-detail-wide.xml.i
new file mode 100644
index 000000000..98ce09948
--- /dev/null
+++ b/op-mode-definitions/include/vtysh-generic-detail-wide.xml.i
@@ -0,0 +1,11 @@
+<!-- included start from vtysh-generic-detail-wide.xml.i -->
+<node name="detail">
+  <properties>
+    <help>Detailed information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    #include <include/vtysh-generic-wide.xml.i>
+  </children>
+</node>
+<!-- included end -->
-- 
cgit v1.2.3


From e5183e60552773ba5b7dd4abc73b9d5967a08b18 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 1 Jun 2025 13:36:57 +0200
Subject: op-mode: T7509: add "detail" and "wide" modifier for received-routes

show ip bgp neighbors <ip> received-routes [detail [wide]|wide]

show bgp neighbors <ip> received-routes [detail [wide]|wide]
show bgp ipv4 neighbors <ip> received-routes [detail [wide]|wide]
show bgp ipv6 neighbors <ip> received-routes [detail [wide]|wide]

show bgp vrf <name> neighbors <ip> received-routes [detail [wide]|wide]
show bgp vrf <name> ipv4 neighbors <ip> received-routes [detail [wide]|wide]
show bgp vrf <name> ipv6 neighbors <ip> received-routes [detail [wide]|wide]
---
 op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i |  7 +------
 op-mode-definitions/include/bgp/received-routes.xml.i      | 12 ++++++++++++
 op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i   |  7 +------
 3 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 op-mode-definitions/include/bgp/received-routes.xml.i

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
index a6faa4949..9a743f828 100644
--- a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
@@ -196,12 +196,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
-    <leafNode name="received-routes">
-      <properties>
-        <help>Show received routes from BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/bgp/received-routes.xml.i>
     <leafNode name="routes">
       <properties>
         <help>Show routes learned from BGP neighbor</help>
diff --git a/op-mode-definitions/include/bgp/received-routes.xml.i b/op-mode-definitions/include/bgp/received-routes.xml.i
new file mode 100644
index 000000000..55bed7c77
--- /dev/null
+++ b/op-mode-definitions/include/bgp/received-routes.xml.i
@@ -0,0 +1,12 @@
+<!-- included start from bgp/received-routes.xml.i -->
+<node name="received-routes">
+  <properties>
+    <help>Show received routes from a BGP neighbor</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    #include <include/vtysh-generic-detail-wide.xml.i>
+    #include <include/vtysh-generic-wide.xml.i>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
index 49e035b5f..559b20755 100644
--- a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
@@ -94,12 +94,7 @@
               </properties>
               <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
             </leafNode>
-            <leafNode name="received-routes">
-              <properties>
-                <help>Show the received routes from neighbor</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
+            #include <include/bgp/received-routes.xml.i>
             <leafNode name="routes">
               <properties>
                 <help>Show routes learned from neighbor</help>
-- 
cgit v1.2.3


From 79b3f33d34edb418378eae01813e5263b268eaa1 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 2 Jun 2025 15:38:23 +0200
Subject: op-mode: T7509: refactor "show bgp" XML definitions to re-usable code
 blocks

---
 .../include/bgp/afi-ipv4-ipv6-common.xml.i         | 49 +++-------------------
 .../include/bgp/dampened-routes.xml.i              |  8 ++++
 .../include/bgp/filtered-routes.xml.i              |  8 ++++
 .../include/bgp/flap-statistics.xml.i              |  8 ++++
 .../include/bgp/prefix-counts.xml.i                |  8 ++++
 op-mode-definitions/include/bgp/received.xml.i     | 16 +++++++
 op-mode-definitions/include/bgp/routes.xml.i       |  8 ++++
 .../include/bgp/show-bgp-common.xml.i              |  7 +---
 .../include/bgp/show-ip-bgp-common.xml.i           | 24 +++--------
 9 files changed, 69 insertions(+), 67 deletions(-)
 create mode 100644 op-mode-definitions/include/bgp/dampened-routes.xml.i
 create mode 100644 op-mode-definitions/include/bgp/filtered-routes.xml.i
 create mode 100644 op-mode-definitions/include/bgp/flap-statistics.xml.i
 create mode 100644 op-mode-definitions/include/bgp/prefix-counts.xml.i
 create mode 100644 op-mode-definitions/include/bgp/received.xml.i
 create mode 100644 op-mode-definitions/include/bgp/routes.xml.i

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
index 9a743f828..d5fb7f5ee 100644
--- a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
@@ -159,50 +159,13 @@
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
   <children>
     #include <include/bgp/advertised-routes.xml.i>
-    <leafNode name="dampened-routes">
-      <properties>
-        <help>Show dampened routes received from BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="flap-statistics">
-      <properties>
-        <help>Show flap statistics of the routes learned from BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="prefix-counts">
-      <properties>
-        <help>Show detailed prefix count information for BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <node name="received">
-      <properties>
-        <help>Show information received from BGP neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="prefix-filter">
-          <properties>
-            <help>Show prefixlist filter</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="filtered-routes">
-      <properties>
-        <help>Show filtered routes from BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/bgp/dampened-routes.xml.i>
+    #include <include/bgp/filtered-routes.xml.i>
+    #include <include/bgp/flap-statistics.xml.i>
+    #include <include/bgp/prefix-counts.xml.i>
+    #include <include/bgp/received.xml.i>
     #include <include/bgp/received-routes.xml.i>
-    <leafNode name="routes">
-      <properties>
-        <help>Show routes learned from BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/bgp/routes.xml.i>
   </children>
 </tagNode>
 <tagNode name="prefix-list">
diff --git a/op-mode-definitions/include/bgp/dampened-routes.xml.i b/op-mode-definitions/include/bgp/dampened-routes.xml.i
new file mode 100644
index 000000000..073ca3325
--- /dev/null
+++ b/op-mode-definitions/include/bgp/dampened-routes.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/dampened-routes.xml.i -->
+<leafNode name="dampened-routes">
+  <properties>
+    <help>Show dampened routes received from BGP neighbor</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/filtered-routes.xml.i b/op-mode-definitions/include/bgp/filtered-routes.xml.i
new file mode 100644
index 000000000..a33e8f28f
--- /dev/null
+++ b/op-mode-definitions/include/bgp/filtered-routes.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/filtered-routes.xml.i -->
+<leafNode name="filtered-routes">
+  <properties>
+    <help>Show filtered routes from BGP neighbor</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/flap-statistics.xml.i b/op-mode-definitions/include/bgp/flap-statistics.xml.i
new file mode 100644
index 000000000..93ac110e0
--- /dev/null
+++ b/op-mode-definitions/include/bgp/flap-statistics.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/flap-statistics.xml.i -->
+<leafNode name="flap-statistics">
+  <properties>
+    <help>Show flap statistics of the routes learned from BGP neighbor</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/prefix-counts.xml.i b/op-mode-definitions/include/bgp/prefix-counts.xml.i
new file mode 100644
index 000000000..a7131ebeb
--- /dev/null
+++ b/op-mode-definitions/include/bgp/prefix-counts.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/prefix-counts.xml.i -->
+<leafNode name="prefix-counts">
+  <properties>
+    <help>Show detailed prefix count information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/received.xml.i b/op-mode-definitions/include/bgp/received.xml.i
new file mode 100644
index 000000000..bb8dc6981
--- /dev/null
+++ b/op-mode-definitions/include/bgp/received.xml.i
@@ -0,0 +1,16 @@
+<!-- included start from bgp/received.xml.i -->
+<node name="received">
+  <properties>
+    <help>Show information received from BGP neighbor</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    <leafNode name="prefix-filter">
+      <properties>
+        <help>Show prefixlist filter</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/routes.xml.i b/op-mode-definitions/include/bgp/routes.xml.i
new file mode 100644
index 000000000..248e8fc5c
--- /dev/null
+++ b/op-mode-definitions/include/bgp/routes.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/routes.xml.i -->
+<leafNode name="routes">
+  <properties>
+    <help>Show routes learned from BGP neighbor</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/show-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
index 8d2c3d1b9..003451a33 100644
--- a/op-mode-definitions/include/bgp/show-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
@@ -129,12 +129,7 @@
           <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
           <children>
             #include <include/bgp/advertised-routes.xml.i>
-            <leafNode name="routes">
-              <properties>
-                <help>Show routes learned from BGP neighbor</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
+            #include <include/bgp/routes.xml.i>
           </children>
         </tagNode>
         <leafNode name="next-hops">
diff --git a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
index 559b20755..48475e04e 100644
--- a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
@@ -82,25 +82,13 @@
           <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
           <children>
             #include <include/bgp/advertised-routes.xml.i>
-            <leafNode name="prefix-counts">
-              <properties>
-                <help>Show detailed prefix count information</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
-            <leafNode name="filtered-routes">
-              <properties>
-                <help>Show the filtered routes from neighbor</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
+            #include <include/bgp/dampened-routes.xml.i>
+            #include <include/bgp/filtered-routes.xml.i>
+            #include <include/bgp/flap-statistics.xml.i>
+            #include <include/bgp/prefix-counts.xml.i>
+            #include <include/bgp/received.xml.i>
             #include <include/bgp/received-routes.xml.i>
-            <leafNode name="routes">
-              <properties>
-                <help>Show routes learned from neighbor</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
+            #include <include/bgp/routes.xml.i>
           </children>
         </tagNode>
         <leafNode name="paths">
-- 
cgit v1.2.3