From f1b577eb4c41cd0b7617e6f5e5048b0744b2b134 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 6 Nov 2023 20:57:53 +0100
Subject: op-mode: bgp: T5698: fix "rd" route-distinguisher help string

(cherry picked from commit 43288b57d8dc79a12a9bedd6386d81c85bd00149)
---
 op-mode-definitions/include/bgp/show-bgp-common.xml.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(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
index de794a879..6b1e0a262 100644
--- a/op-mode-definitions/include/bgp/show-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
@@ -138,9 +138,9 @@
         </tagNode>
         <tagNode name="rd">
           <properties>
-            <help>Show detailed BGP neighbor information</help>
+            <help>Display information for a route distinguisher</help>
             <completionHelp>
-              <list>ASN:NN IPADDRESS:NN</list>
+              <list>ASN:NN IPADDRESS:NN all</list>
             </completionHelp>
           </properties>
           <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-- 
cgit v1.2.3


From 2fc97aea3814265c4b7653dee945eacb1ee8cf49 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 6 Nov 2023 20:59:10 +0100
Subject: op-mode: bgp: T5698: add "es-vrf" and "next-hops" CLI commands

show bgp l2vpn evpn es-vrf
show bgp l2vpn evpn next-hops

(cherry picked from commit f4b1df3c84072624060e13a6099d2032e0a4ee47)
---
 op-mode-definitions/include/bgp/show-bgp-common.xml.i | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(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
index 6b1e0a262..d888bc3b0 100644
--- a/op-mode-definitions/include/bgp/show-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
@@ -107,6 +107,12 @@
             #include <include/vni-tagnode.xml.i>
           </children>
         </node>
+        <leafNode name="es-vrf">
+          <properties>
+            <help>Ethernet Segment per VRF</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
         <leafNode name="import-rt">
           <properties>
             <help>Show import route target</help>
@@ -136,6 +142,12 @@
             </leafNode>
           </children>
         </tagNode>
+        <leafNode name="next-hops">
+          <properties>
+            <help>EVPN Nexthops</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
         <tagNode name="rd">
           <properties>
             <help>Display information for a route distinguisher</help>
-- 
cgit v1.2.3