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/include/bgp-afi-common.xml.i   | 10 ++--
 .../include/bgp-afi-ipv4-ipv6-common.xml.i         | 68 +++++++++++-----------
 .../include/bgp-prefix-bestpath-multipath.xml.i    |  6 +-
 .../include/vtysh-generic-detail.xml.i             |  2 +-
 4 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'op-mode-definitions/include')

diff --git a/op-mode-definitions/include/bgp-afi-common.xml.i b/op-mode-definitions/include/bgp-afi-common.xml.i
index b496e910a..06cfc42a5 100644
--- a/op-mode-definitions/include/bgp-afi-common.xml.i
+++ b/op-mode-definitions/include/bgp-afi-common.xml.i
@@ -11,10 +11,10 @@
       <properties>
         <help>Exact match of the communities</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
   </children>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
 <tagNode name="large-community">
   <properties>
@@ -23,18 +23,18 @@
       <list>AA:BB:CC</list>
     </completionHelp>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
 <leafNode name="statistics">
   <properties>
     <help>RIB advertisement statistics</help>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </leafNode>
 <leafNode name="summary">
   <properties>
     <help>Summary of BGP neighbor status</help>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </leafNode>
 <!-- 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 6de666603..dc0926375 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
@@ -8,94 +8,94 @@
       <properties>
         <help>Should accept local VPN route if exported and imported into different VRF (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="accept-own-nexthop">
       <properties>
         <help>Should accept VPN route with local nexthop (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="blackhole">
       <properties>
         <help>Inform EBGP peers to blackhole traffic to prefix (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="exact-match">
       <properties>
         <help>Exact match of the communities</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="graceful-shutdown">
       <properties>
         <help>Graceful shutdown (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="llgr-stale">
       <properties>
         <help>Staled Long-lived Graceful Restart VPN route (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="local-AS">
       <properties>
         <help>Do not send outside local AS (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="no-advertise">
       <properties>
         <help>Do not advertise to any peer (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="no-export">
       <properties>
         <help>Do not export to next AS (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="no-llgr">
       <properties>
         <help>Removed because Long-lived Graceful Restart was not enabled for VPN route (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="no-peer">
       <properties>
         <help>Do not export to any peer (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="route-filter-translated-v4">
       <properties>
         <help>RT translated VPNv4 route filtering (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="route-filter-translated-v6">
       <properties>
         <help>RT translated VPNv6 route filtering (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="route-filter-v4">
       <properties>
         <help>RT VPNv4 route filtering (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="route-filter-v6">
       <properties>
         <help>RT VPNv6 route filtering (well-known community)</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
   </children>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
 <tagNode name="community-list">
   <properties>
@@ -109,10 +109,10 @@
       <properties>
         <help>Show BGP routes exactly matching specified community list</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
   </children>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
 <node name="dampening">
   <properties>
@@ -123,19 +123,19 @@
       <properties>
         <help>Display paths suppressed due to dampening</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="flap-statistics">
       <properties>
         <help>Display flap statistics of routes</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <leafNode name="parameters">
       <properties>
         <help>Display detail of configured dampening parameters</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
   </children>
 </node>
@@ -151,13 +151,13 @@
   <properties>
     <help>Show BGP routes matching the specified large-communities</help>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
 <leafNode name="neighbors">
   <properties>
     <help>Detailed information on TCP and BGP neighbor connections</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>
@@ -166,31 +166,31 @@
       <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="dampened-routes">
       <properties>
         <help>Show dampened routes received 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>
     <leafNode name="flap-statistics">
       <properties>
         <help>Show flap statistics of the 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>
     <leafNode name="prefix-counts">
       <properties>
         <help>Show detailed prefix count information for BGP neighbor</help>
       </properties>
-      <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
     <node name="received">
       <properties>
@@ -201,7 +201,7 @@
           <properties>
             <help>Show prefixlist filter</help>
           </properties>
-          <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
         </leafNode>
       </children>
     </node>
@@ -209,13 +209,13 @@
       <properties>
         <help>Show received routes 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>
     <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>
@@ -223,13 +223,13 @@
   <properties>
     <help>Display routes conforming to the prefix-list</help>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
 <tagNode name="regexp">
   <properties>
     <help>Display routes matching the AS path regular expression</help>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
 <tagNode name="route-map">
   <properties>
@@ -238,6 +238,6 @@
       <path>policy route-map</path>
     </completionHelp>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
 <!-- included end -->
diff --git a/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i b/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i
index 3bea5cf13..224fa6b45 100644
--- a/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i
+++ b/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i
@@ -3,18 +3,18 @@
   <properties>
     <help>Display only the bestpath</help>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </leafNode>
 <leafNode name="multipath">
   <properties>
     <help>Display only multipaths</help>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </leafNode>
 <leafNode name="longer-prefixes">
   <properties>
     <help>Display route and more specific routes</help>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </leafNode>
 <!-- included end -->
diff --git a/op-mode-definitions/include/vtysh-generic-detail.xml.i b/op-mode-definitions/include/vtysh-generic-detail.xml.i
index 9e1f90649..5a3097a77 100644
--- a/op-mode-definitions/include/vtysh-generic-detail.xml.i
+++ b/op-mode-definitions/include/vtysh-generic-detail.xml.i
@@ -3,6 +3,6 @@
   <properties>
     <help>Detailed information</help>
   </properties>
-  <command>sudo ${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </leafNode>
 <!-- included end -->
-- 
cgit v1.2.3