From fb2b3c48a47f2f6c28dbe7420eb1a1f691085db1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 20 Feb 2021 19:52:22 +0100
Subject: op-mode: bgp: T1513: no need for "sudo"

Commit 68f7d1474d ("op-mode: bgp: T1513: add "show bgp" tree containing l2vpn
evpn") added the required XML definitions and a bash helper script. The helper
always got invoked using "sudo" which is not necessary for vtysh.

Calling "sudo" only slows down the system when e.g. RADIUS backed accounts are
used.
---
 op-mode-definitions/show-bgp.xml.in | 56 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'op-mode-definitions/show-bgp.xml.in')

diff --git a/op-mode-definitions/show-bgp.xml.in b/op-mode-definitions/show-bgp.xml.in
index 506af68b3..cd0c5a9e5 100644
--- a/op-mode-definitions/show-bgp.xml.in
+++ b/op-mode-definitions/show-bgp.xml.in
@@ -6,7 +6,7 @@
         <properties>
           <help>BGP information</help>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
         <children>
           #include <include/bgp-afi-ipv4-ipv6-common.xml.i>
           <tagNode name="ipv4">
@@ -19,7 +19,7 @@
             <children>
               #include <include/bgp-prefix-bestpath-multipath.xml.i>
             </children>
-            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
           </tagNode>
           <node name="ipv4">
             <properties>
@@ -40,7 +40,7 @@
             <children>
               #include <include/bgp-prefix-bestpath-multipath.xml.i>
             </children>
-            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
           </tagNode>
           <node name="ipv6">
             <properties>
@@ -63,7 +63,7 @@
                     <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>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
               </tagNode>
               <node name="evpn">
                 <properties>
@@ -80,13 +80,13 @@
                         <properties>
                           <help>Display BGP Overlay Information for prefixes</help>
                         </properties>
-                        <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                       </leafNode>
                       <leafNode name="tags">
                         <properties>
                           <help>Display BGP tags for prefixes</help>
                         </properties>
-                        <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                       </leafNode>
                     </children>
                   </node>
@@ -94,7 +94,7 @@
                     <properties>
                       <help>Ethernet Segment</help>
                     </properties>
-                    <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                     <children>
                       #include <include/vtysh-generic-detail.xml.i>
                     </children>
@@ -103,14 +103,14 @@
                     <properties>
                       <help>Ethernet Segment per EVI</help>
                     </properties>
-                    <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                     <children>
                       #include <include/vtysh-generic-detail.xml.i>
                       <tagNode name="vni">
                         <properties>
                           <help>VxLAN Network Identifier</help>
                         </properties>
-                        <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                       </tagNode>
                     </children>
                   </node>
@@ -118,7 +118,7 @@
                     <properties>
                       <help>Show import route target</help>
                     </properties>
-                    <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                   </leafNode>
                   <tagNode name="neighbors">
                     <properties>
@@ -127,19 +127,19 @@
                         <script>vtysh -c 'show bgp summary' | awk '{print $1'} | grep -e '^[0-9a-f]'</script>
                       </completionHelp>
                     </properties>
-                    <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                    <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>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                       </leafNode>
                       <leafNode name="routes">
                         <properties>
                           <help>Show routes learned from BGP neighbor</help>
                         </properties>
-                        <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                       </leafNode>
                     </children>
                   </tagNode>
@@ -150,19 +150,19 @@
                         <list>ASN:NN IPADDRESS:NN</list>
                       </completionHelp>
                     </properties>
-                    <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                     <children>
                       <leafNode name="overlay">
                         <properties>
                           <help>Display BGP Overlay Information for prefixes</help>
                         </properties>
-                        <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                       </leafNode>
                       <leafNode name="tags">
                         <properties>
                           <help>Display BGP tags for prefixes</help>
                         </properties>
-                        <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                       </leafNode>
                     </children>
                   </tagNode>
@@ -170,7 +170,7 @@
                     <properties>
                       <help>EVPN route information</help>
                     </properties>
-                    <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                     <children>
                       #include <include/vtysh-generic-detail.xml.i>
                       <node name="type">
@@ -182,61 +182,61 @@
                             <properties>
                               <help>EAD (Type-1) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                           <leafNode name="2">
                             <properties>
                               <help>MAC-IP (Type-2) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                           <leafNode name="3">
                             <properties>
                               <help>Multicast (Type-3) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                           <leafNode name="4">
                             <properties>
                               <help>Ethernet Segment (Type-4) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                           <leafNode name="5">
                             <properties>
                               <help>Prefix (Type-5) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                           <leafNode name="ead">
                             <properties>
                               <help>EAD (Type-1) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                           <leafNode name="es">
                             <properties>
                               <help>Ethernet Segment (Type-4) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                           <leafNode name="macip">
                             <properties>
                               <help>MAC-IP (Type-2) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                           <leafNode name="multicast">
                             <properties>
                               <help>Multicast (Type-3) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                           <leafNode name="prefix">
                             <properties>
                               <help>Prefix (Type-5) route</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                           </leafNode>
                         </children>
                       </node>
@@ -247,7 +247,7 @@
                             <list>1-16777215 all</list>
                           </completionHelp>
                         </properties>
-                        <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                       </tagNode>
                     </children>
                   </node>
-- 
cgit v1.2.3