From 3fa1092930c3dcb1c3ddfe6c1061e30477f9b45d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 9 Apr 2021 19:59:33 +0200
Subject: op-mode: bgp: support VRF related "show bgp vrf" commands

cpo@PE1:~$ show bgp vrf all

Instance default:
No BGP prefixes displayed, 0 exist

Instance red:
BGP table version is 1, local router ID is 10.2.1.1, vrf id 11
Default local pref 100, local AS 100
Status codes:  s suppressed, d damped, h history, * valid, > best, = multipath,
               i internal, r RIB-failure, S Stale, R Removed
Nexthop codes: @NNN nexthop's vrf id, < announce-nh-self
Origin codes:  i - IGP, e - EGP, ? - incomplete

   Network          Next Hop            Metric LocPrf Weight Path
*> 10.2.1.0/24      0.0.0.0                  0         32768 ?

Displayed  1 routes and 1 total paths

Instance blue:
BGP table version is 1, local router ID is 10.1.1.1, vrf id 10
Default local pref 100, local AS 100
Status codes:  s suppressed, d damped, h history, * valid, > best, = multipath,
               i internal, r RIB-failure, S Stale, R Removed
Nexthop codes: @NNN nexthop's vrf id, < announce-nh-self
Origin codes:  i - IGP, e - EGP, ? - incomplete

   Network          Next Hop            Metric LocPrf Weight Path
*> 10.1.1.0/24      0.0.0.0                  0         32768 ?

Displayed  1 routes and 1 total paths
---
 .../include/bgp/show-bgp-common.xml.i              | 244 +++++++++++++++++++++
 op-mode-definitions/show-bgp.xml.in                | 242 +-------------------
 op-mode-definitions/show-ip-bgp.xml.in             |   9 +-
 3 files changed, 262 insertions(+), 233 deletions(-)
 create mode 100644 op-mode-definitions/include/bgp/show-bgp-common.xml.i

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/bgp/show-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
new file mode 100644
index 000000000..5751dccd3
--- /dev/null
+++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
@@ -0,0 +1,244 @@
+<!-- included start from bgp/show-bgp-common.xml.i -->
+#include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+<tagNode name="ipv4">
+  <properties>
+    <help>Network in the BGP routing table to display</help>
+    <completionHelp>
+      <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt; &lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
+    </completionHelp>
+  </properties>
+  <children>
+    #include <include/bgp/prefix-bestpath-multipath.xml.i>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="ipv4">
+  <properties>
+    <help>IPv4 Address Family</help>
+  </properties>
+  <children>
+    #include <include/bgp/afi-common.xml.i>
+    #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+  </children>
+</node>
+<tagNode name="ipv6">
+  <properties>
+    <help>Network in the BGP routing table to display</help>
+    <completionHelp>
+      <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt; &lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
+    </completionHelp>
+  </properties>
+  <children>
+    #include <include/bgp/prefix-bestpath-multipath.xml.i>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="ipv6">
+  <properties>
+    <help>IPv6 Address Family</help>
+  </properties>
+  <children>
+    #include <include/bgp/afi-common.xml.i>
+    #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+  </children>
+</node>
+<node name="l2vpn">
+  <properties>
+    <help>Layer 2 Virtual Private Network</help>
+  </properties>
+  <children>
+    <tagNode name="evpn">
+      <properties>
+        <help>Network in the BGP routing table to display</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt; &lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </tagNode>
+    <node name="evpn">
+      <properties>
+        <help>Ethernet Virtual Private Network</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        #include <include/bgp/afi-common.xml.i>
+        <node name="all">
+          <properties>
+            <help>Display information about all EVPN NLRIs</help>
+          </properties>
+          <children>
+            <leafNode name="overlay">
+              <properties>
+                <help>Display BGP Overlay Information for prefixes</help>
+              </properties>
+              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            </leafNode>
+            <leafNode name="tags">
+              <properties>
+                <help>Display BGP tags for prefixes</help>
+              </properties>
+              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            </leafNode>
+          </children>
+        </node>
+        <node name="es">
+          <properties>
+            <help>Ethernet Segment</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          <children>
+            #include <include/vtysh-generic-detail.xml.i>
+          </children>
+        </node>
+        <node name="es-evi">
+          <properties>
+            <help>Ethernet Segment per EVI</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          <children>
+            #include <include/vtysh-generic-detail.xml.i>
+            #include <include/vni-tagnode.xml.i>
+          </children>
+        </node>
+        <leafNode name="import-rt">
+          <properties>
+            <help>Show import route target</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+        <tagNode name="neighbors">
+          <properties>
+            <help>Show detailed BGP neighbor information</help>
+            <completionHelp>
+              <script>vtysh -c 'show bgp summary' | awk '{print $1'} | grep -e '^[0-9a-f]'</script>
+            </completionHelp>
+          </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>
+            <leafNode name="routes">
+              <properties>
+                <help>Show routes learned from BGP neighbor</help>
+              </properties>
+              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            </leafNode>
+          </children>
+        </tagNode>
+        <tagNode name="rd">
+          <properties>
+            <help>Show detailed BGP neighbor information</help>
+            <completionHelp>
+              <list>ASN:NN IPADDRESS:NN</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          <children>
+            <leafNode name="overlay">
+              <properties>
+                <help>Display BGP Overlay Information for prefixes</help>
+              </properties>
+              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            </leafNode>
+            <leafNode name="tags">
+              <properties>
+                <help>Display BGP tags for prefixes</help>
+              </properties>
+              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            </leafNode>
+          </children>
+        </tagNode>
+        <node name="route">
+          <properties>
+            <help>EVPN route information</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          <children>
+            #include <include/vtysh-generic-detail.xml.i>
+            <node name="type">
+              <properties>
+                <help>Specify Route type</help>
+              </properties>
+              <children>
+                <leafNode name="1">
+                  <properties>
+                    <help>EAD (Type-1) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+                <leafNode name="2">
+                  <properties>
+                    <help>MAC-IP (Type-2) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+                <leafNode name="3">
+                  <properties>
+                    <help>Multicast (Type-3) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+                <leafNode name="4">
+                  <properties>
+                    <help>Ethernet Segment (Type-4) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+                <leafNode name="5">
+                  <properties>
+                    <help>Prefix (Type-5) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+                <leafNode name="ead">
+                  <properties>
+                    <help>EAD (Type-1) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+                <leafNode name="es">
+                  <properties>
+                    <help>Ethernet Segment (Type-4) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+                <leafNode name="macip">
+                  <properties>
+                    <help>MAC-IP (Type-2) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+                <leafNode name="multicast">
+                  <properties>
+                    <help>Multicast (Type-3) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+                <leafNode name="prefix">
+                  <properties>
+                    <help>Prefix (Type-5) route</help>
+                  </properties>
+                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                </leafNode>
+              </children>
+            </node>
+            #include <include/vni-tagnode-all.xml.i>
+          </children>
+        </node>
+        #include <include/vni-tagnode.xml.i>
+        <leafNode name="vni">
+          <properties>
+            <help>VXLAN network identifier (VNI)</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/show-bgp.xml.in b/op-mode-definitions/show-bgp.xml.in
index 62abbe938..36e7062df 100644
--- a/op-mode-definitions/show-bgp.xml.in
+++ b/op-mode-definitions/show-bgp.xml.in
@@ -8,248 +8,26 @@
         </properties>
         <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
         <children>
-          #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
-          <tagNode name="ipv4">
+          #include <include/bgp/show-bgp-common.xml.i>
+          <leafNode name="vrf">
             <properties>
-              <help>Network in the BGP routing table to display</help>
-              <completionHelp>
-                <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt; &lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
-              </completionHelp>
+              <help>Show BGP VRF information</help>
             </properties>
-            <children>
-              #include <include/bgp/prefix-bestpath-multipath.xml.i>
-            </children>
             <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-          </tagNode>
-          <node name="ipv4">
+          </leafNode>
+          <tagNode name="vrf">
             <properties>
-              <help>IPv4 Address Family</help>
-            </properties>
-            <children>
-              #include <include/bgp/afi-common.xml.i>
-              #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
-            </children>
-          </node>
-          <tagNode name="ipv6">
-            <properties>
-              <help>Network in the BGP routing table to display</help>
+              <help>Show BGP VRF related information</help>
               <completionHelp>
-                <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt; &lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
+                <path>vrf name</path>
+                <list>all</list>
               </completionHelp>
             </properties>
-            <children>
-              #include <include/bgp/prefix-bestpath-multipath.xml.i>
-            </children>
             <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-          </tagNode>
-          <node name="ipv6">
-            <properties>
-              <help>IPv6 Address Family</help>
-            </properties>
             <children>
-              #include <include/bgp/afi-common.xml.i>
-              #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+              #include <include/bgp/show-bgp-common.xml.i>
             </children>
-          </node>
-          <node name="l2vpn">
-            <properties>
-              <help>Layer 2 Virtual Private Network</help>
-            </properties>
-            <children>
-              <tagNode name="evpn">
-                <properties>
-                  <help>Network in the BGP routing table to display</help>
-                  <completionHelp>
-                    <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt; &lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
-                  </completionHelp>
-                </properties>
-                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-              </tagNode>
-              <node name="evpn">
-                <properties>
-                  <help>Ethernet Virtual Private Network</help>
-                </properties>
-                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                <children>
-                  #include <include/bgp/afi-common.xml.i>
-                  <node name="all">
-                    <properties>
-                      <help>Display information about all EVPN NLRIs</help>
-                    </properties>
-                    <children>
-                      <leafNode name="overlay">
-                        <properties>
-                          <help>Display BGP Overlay Information for prefixes</help>
-                        </properties>
-                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                      </leafNode>
-                      <leafNode name="tags">
-                        <properties>
-                          <help>Display BGP tags for prefixes</help>
-                        </properties>
-                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                      </leafNode>
-                    </children>
-                  </node>
-                  <node name="es">
-                    <properties>
-                      <help>Ethernet Segment</help>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                    <children>
-                      #include <include/vtysh-generic-detail.xml.i>
-                    </children>
-                  </node>
-                  <node name="es-evi">
-                    <properties>
-                      <help>Ethernet Segment per EVI</help>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                    <children>
-                      #include <include/vtysh-generic-detail.xml.i>
-                      #include <include/vni-tagnode.xml.i>
-                    </children>
-                  </node>
-                  <leafNode name="import-rt">
-                    <properties>
-                      <help>Show import route target</help>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                  </leafNode>
-                  <tagNode name="neighbors">
-                    <properties>
-                      <help>Show detailed BGP neighbor information</help>
-                      <completionHelp>
-                        <script>vtysh -c 'show bgp summary' | awk '{print $1'} | grep -e '^[0-9a-f]'</script>
-                      </completionHelp>
-                    </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>
-                      <leafNode name="routes">
-                        <properties>
-                          <help>Show routes learned from BGP neighbor</help>
-                        </properties>
-                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <tagNode name="rd">
-                    <properties>
-                      <help>Show detailed BGP neighbor information</help>
-                      <completionHelp>
-                        <list>ASN:NN IPADDRESS:NN</list>
-                      </completionHelp>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                    <children>
-                      <leafNode name="overlay">
-                        <properties>
-                          <help>Display BGP Overlay Information for prefixes</help>
-                        </properties>
-                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                      </leafNode>
-                      <leafNode name="tags">
-                        <properties>
-                          <help>Display BGP tags for prefixes</help>
-                        </properties>
-                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <node name="route">
-                    <properties>
-                      <help>EVPN route information</help>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                    <children>
-                      #include <include/vtysh-generic-detail.xml.i>
-                      <node name="type">
-                        <properties>
-                          <help>Specify Route type</help>
-                        </properties>
-                        <children>
-                          <leafNode name="1">
-                            <properties>
-                              <help>EAD (Type-1) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                          <leafNode name="2">
-                            <properties>
-                              <help>MAC-IP (Type-2) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                          <leafNode name="3">
-                            <properties>
-                              <help>Multicast (Type-3) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                          <leafNode name="4">
-                            <properties>
-                              <help>Ethernet Segment (Type-4) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                          <leafNode name="5">
-                            <properties>
-                              <help>Prefix (Type-5) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                          <leafNode name="ead">
-                            <properties>
-                              <help>EAD (Type-1) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                          <leafNode name="es">
-                            <properties>
-                              <help>Ethernet Segment (Type-4) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                          <leafNode name="macip">
-                            <properties>
-                              <help>MAC-IP (Type-2) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                          <leafNode name="multicast">
-                            <properties>
-                              <help>Multicast (Type-3) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                          <leafNode name="prefix">
-                            <properties>
-                              <help>Prefix (Type-5) route</help>
-                            </properties>
-                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                          </leafNode>
-                        </children>
-                      </node>
-                      #include <include/vni-tagnode-all.xml.i>
-                    </children>
-                  </node>
-                  #include <include/vni-tagnode.xml.i>
-                  <leafNode name="vni">
-                    <properties>
-                      <help>VXLAN network identifier (VNI)</help>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                  </leafNode>
-                </children>
-              </node>
-            </children>
-          </node>
+          </tagNode>
         </children>
       </node>
     </children>
diff --git a/op-mode-definitions/show-ip-bgp.xml.in b/op-mode-definitions/show-ip-bgp.xml.in
index 4097bcf2d..ecef320bf 100644
--- a/op-mode-definitions/show-ip-bgp.xml.in
+++ b/op-mode-definitions/show-ip-bgp.xml.in
@@ -11,14 +11,21 @@
             <command>vtysh -c "show ip bgp"</command>
             <children>
               #include <include/bgp/show-ip-bgp-common.xml.i>
+              <leafNode name="vrf">
+                <properties>
+                  <help>Show BGP VRF information</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+              </leafNode>
               <tagNode name="vrf">
                 <properties>
-                  <help>Show bgp routing protocol for given VRF</help>
+                  <help>Show BGP VRF related information</help>
                   <completionHelp>
                     <path>vrf name</path>
                     <list>all</list>
                   </completionHelp>
                 </properties>
+                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                 <children>
                   #include <include/bgp/show-ip-bgp-common.xml.i>
                 </children>
-- 
cgit v1.2.3