From 46b749388e0198f0cb3eb5eca1bd1d6e940b2702 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 9 Feb 2021 22:22:21 +0100
Subject: xml: op-mode: remove absolute path from vtysh

---
 op-mode-definitions/reset-ip-igmp.xml.in           |  2 +-
 op-mode-definitions/reset-ip-multicast.xml.in      |  2 +-
 op-mode-definitions/reset-mpls.xml.in              |  4 +-
 ...w-ip-access-paths-prefix-community-lists.xml.in | 28 +++----
 op-mode-definitions/show-ip-igmp.xml.in            | 10 +--
 op-mode-definitions/show-ip-multicast.xml.in       |  4 +-
 op-mode-definitions/show-ip-ospf.xml.in            | 96 +++++++++++-----------
 op-mode-definitions/show-ip-pim.xml.in             | 18 ++--
 op-mode-definitions/show-ip-rip.xml.in             |  4 +-
 op-mode-definitions/show-ip-route.xml.in           | 30 +++----
 op-mode-definitions/show-isis.xml.in               | 46 +++++------
 op-mode-definitions/show-mpls.xml.in               | 62 +++++++-------
 op-mode-definitions/show-protocols-bfd.xml.in      | 12 +--
 op-mode-definitions/show-route-map.xml.in          |  4 +-
 op-mode-definitions/show-rpki.xml.in               |  6 +-
 op-mode-definitions/show-system.xml.in             |  4 +-
 op-mode-definitions/show-table.xml.in              |  2 +-
 op-mode-definitions/show-version.xml.in            |  2 +-
 18 files changed, 168 insertions(+), 168 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/reset-ip-igmp.xml.in b/op-mode-definitions/reset-ip-igmp.xml.in
index 143553d33..e79c33da8 100644
--- a/op-mode-definitions/reset-ip-igmp.xml.in
+++ b/op-mode-definitions/reset-ip-igmp.xml.in
@@ -13,7 +13,7 @@
                 <properties>
                   <help>Reset IGMP interfaces</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "clear ip igmp interfaces"</command>
+                <command>vtysh -c "clear ip igmp interfaces"</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/reset-ip-multicast.xml.in b/op-mode-definitions/reset-ip-multicast.xml.in
index d610add16..6cca07850 100644
--- a/op-mode-definitions/reset-ip-multicast.xml.in
+++ b/op-mode-definitions/reset-ip-multicast.xml.in
@@ -13,7 +13,7 @@
                 <properties>
                   <help>Clear multicast routing table</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "clear ip mroute"</command>
+                <command>vtysh -c "clear ip mroute"</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/reset-mpls.xml.in b/op-mode-definitions/reset-mpls.xml.in
index 4e5d37d5b..829ed41ab 100644
--- a/op-mode-definitions/reset-mpls.xml.in
+++ b/op-mode-definitions/reset-mpls.xml.in
@@ -17,10 +17,10 @@
                   <help>Reset MPLS LDP neighbor/session</help>
                   <completionHelp>
                     <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-                    <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
+                    <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "clear mpls ldp neighbor $5"</command>
+                <command>vtysh -c "clear mpls ldp neighbor $5"</command>
               </tagNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in b/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in
index a5ec65c94..d7222516a 100644
--- a/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in
+++ b/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in
@@ -11,7 +11,7 @@
             <properties>
               <help>Show all IP access-lists</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip access-list"</command>
+            <command>vtysh -c "show ip access-list"</command>
           </leafNode>
           <tagNode name="access-list">
             <properties>
@@ -20,13 +20,13 @@
                 <path>policy access-list</path>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip access-list $4"</command>
+            <command>vtysh -c "show ip access-list $4"</command>
           </tagNode>
           <leafNode name="as-path-access-list">
             <properties>
               <help>Show all as-path-access-lists</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip as-path-access-list"</command>
+            <command>vtysh -c "show ip as-path-access-list"</command>
           </leafNode>
           <tagNode name="as-path-access-list">
             <properties>
@@ -35,13 +35,13 @@
                 <path>policy as-path-list</path>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip as-path-access-list $4"</command>
+            <command>vtysh -c "show ip as-path-access-list $4"</command>
           </tagNode>
           <leafNode name="community-list">
             <properties>
               <help>Show IP community-lists</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show bgp community-list"</command>
+            <command>vtysh -c "show bgp community-list"</command>
           </leafNode>
           <tagNode name="community-list">
             <properties>
@@ -50,13 +50,13 @@
                 <path>policy community-list</path>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show bgp community-list $4 detail"</command>
+            <command>vtysh -c "show bgp community-list $4 detail"</command>
           </tagNode>
           <leafNode name="extcommunity-list">
             <properties>
               <help>Show extended IP community-lists</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show bgp extcommunity-list"</command>
+            <command>vtysh -c "show bgp extcommunity-list"</command>
           </leafNode>
           <tagNode name="extcommunity-list">
             <properties>
@@ -65,19 +65,19 @@
                 <path>policy extcommunity-list</path>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show bgp extcommunity-list $4 detail"</command>
+            <command>vtysh -c "show bgp extcommunity-list $4 detail"</command>
           </tagNode>
           <leafNode name="forwarding">
             <properties>
               <help>Show IP forwarding status</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip forwarding"</command>
+            <command>vtysh -c "show ip forwarding"</command>
           </leafNode>
           <leafNode name="large-community-list">
             <properties>
               <help>Show IP large-community-lists</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show bgp large-community-list"</command>
+            <command>vtysh -c "show bgp large-community-list"</command>
           </leafNode>
           <tagNode name="large-community-list">
             <properties>
@@ -86,13 +86,13 @@
                 <path>policy large-community-list</path>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show bgp large-community-list $4 detail"</command>
+            <command>vtysh -c "show bgp large-community-list $4 detail"</command>
           </tagNode>
           <leafNode name="prefix-list">
             <properties>
               <help>Show all IP prefix-lists</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip prefix-list"</command>
+            <command>vtysh -c "show ip prefix-list"</command>
           </leafNode>
           <tagNode name="prefix-list">
             <properties>
@@ -101,13 +101,13 @@
                 <path>policy prefix-list</path>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip prefix-list $4"</command>
+            <command>vtysh -c "show ip prefix-list $4"</command>
           </tagNode>
           <leafNode name="protocol">
             <properties>
               <help>Show IP route-maps per protocol</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip protocol"</command>
+            <command>vtysh -c "show ip protocol"</command>
           </leafNode>
          </children>
       </node>
diff --git a/op-mode-definitions/show-ip-igmp.xml.in b/op-mode-definitions/show-ip-igmp.xml.in
index b8f2f9107..855c5d508 100644
--- a/op-mode-definitions/show-ip-igmp.xml.in
+++ b/op-mode-definitions/show-ip-igmp.xml.in
@@ -13,31 +13,31 @@
                 <properties>
                   <help>IGMP groups information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip igmp groups"</command>
+                <command>vtysh -c "show ip igmp groups"</command>
               </leafNode>
               <leafNode name="interfaces">
                 <properties>
                   <help>IGMP interfaces information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip igmp interface"</command>
+                <command>vtysh -c "show ip igmp interface"</command>
               </leafNode>
               <leafNode name="join">
                 <properties>
                   <help>IGMP static join information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip igmp join"</command>
+                <command>vtysh -c "show ip igmp join"</command>
               </leafNode>
               <leafNode name="sources">
                 <properties>
                   <help>IGMP sources information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip igmp sources"</command>
+                <command>vtysh -c "show ip igmp sources"</command>
               </leafNode>
               <leafNode name="statistics">
                 <properties>
                   <help>IGMP statistics</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip igmp statistics"</command>
+                <command>vtysh -c "show ip igmp statistics"</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-ip-multicast.xml.in b/op-mode-definitions/show-ip-multicast.xml.in
index 5331d2e35..80d83b424 100644
--- a/op-mode-definitions/show-ip-multicast.xml.in
+++ b/op-mode-definitions/show-ip-multicast.xml.in
@@ -25,13 +25,13 @@
                 <properties>
                   <help>IP multicast information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip multicast"</command>
+                <command>vtysh -c "show ip multicast"</command>
               </leafNode>
               <leafNode name="route">
                 <properties>
                   <help>IP multicast routing table</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip mroute"</command>
+                <command>vtysh -c "show ip mroute"</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-ip-ospf.xml.in b/op-mode-definitions/show-ip-ospf.xml.in
index 50628d18e..fc298123b 100644
--- a/op-mode-definitions/show-ip-ospf.xml.in
+++ b/op-mode-definitions/show-ip-ospf.xml.in
@@ -11,25 +11,25 @@
             <properties>
               <help>Show IPv4 Open Shortest Path First (OSPF) routing information</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip ospf"</command>
+            <command>vtysh -c "show ip ospf"</command>
             <children>
               <leafNode name="border-routers">
                 <properties>
                   <help>Show IPv4 OSPF border-routers information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip ospf border-routers"</command>
+                <command>vtysh -c "show ip ospf border-routers"</command>
               </leafNode>
               <node name="database">
                 <properties>
                   <help>Show IPv4 OSPF database information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip ospf database"</command>
+                <command>vtysh -c "show ip ospf database"</command>
                 <children>
                   <node name="asbr-summary">
                     <properties>
                       <help>Show IPv4 OSPF ASBR summary database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database asbr-summary"</command>
+                    <command>vtysh -c "show ip ospf database asbr-summary"</command>
                     <children>
                       <tagNode name="adv-router">
                         <properties>
@@ -38,7 +38,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database asbr-summary adv-router $7"</command>
+                        <command>vtysh -c "show ip ospf database asbr-summary adv-router $7"</command>
                       </tagNode>
                       <node name="adv-router">
                         <properties>
@@ -54,7 +54,7 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database asbr-summary $6"</command>
+                    <command>vtysh -c "show ip ospf database asbr-summary $6"</command>
                     <children>
                       <node name="adv-router">
                         <properties>
@@ -68,7 +68,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database asbr-summary $6 adv-router $8"</command>
+                        <command>vtysh -c "show ip ospf database asbr-summary $6 adv-router $8"</command>
                       </tagNode>
                       <leafNode name="self-originate">
                         <properties>
@@ -82,7 +82,7 @@
                     <properties>
                       <help>Show IPv4 OSPF external database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database external"</command>
+                    <command>vtysh -c "show ip ospf database external"</command>
                     <children>
                       <tagNode name="adv-router">
                         <properties>
@@ -91,7 +91,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database external adv-router $7"</command>
+                        <command>vtysh -c "show ip ospf database external adv-router $7"</command>
                       </tagNode>
                       <node name="adv-router">
                         <properties>
@@ -107,7 +107,7 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database external $6"</command>
+                    <command>vtysh -c "show ip ospf database external $6"</command>
                     <children>
                       <node name="adv-router">
                         <properties>
@@ -121,7 +121,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database external $6 adv-router $8"</command>
+                        <command>vtysh -c "show ip ospf database external $6 adv-router $8"</command>
                       </tagNode>
                       <leafNode name="self-originate">
                         <properties>
@@ -135,13 +135,13 @@
                     <properties>
                       <help>Show IPv4 OSPF max-age database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database max-age"</command>
+                    <command>vtysh -c "show ip ospf database max-age"</command>
                   </leafNode>
                   <node name="network">
                     <properties>
                       <help>Show IPv4 OSPF network database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database network"</command>
+                    <command>vtysh -c "show ip ospf database network"</command>
                     <children>
                       <tagNode name="adv-router">
                         <properties>
@@ -150,7 +150,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database network adv-router $7"</command>
+                        <command>vtysh -c "show ip ospf database network adv-router $7"</command>
                       </tagNode>
                       <node name="adv-router">
                         <properties>
@@ -166,7 +166,7 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database network $6"</command>
+                    <command>vtysh -c "show ip ospf database network $6"</command>
                     <children>
                       <node name="adv-router">
                         <properties>
@@ -180,7 +180,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database network $6 adv-router $8"</command>
+                        <command>vtysh -c "show ip ospf database network $6 adv-router $8"</command>
                       </tagNode>
                       <leafNode name="self-originate">
                         <properties>
@@ -194,7 +194,7 @@
                     <properties>
                       <help>Show IPv4 OSPF NSSA external database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database nssa-external"</command>
+                    <command>vtysh -c "show ip ospf database nssa-external"</command>
                     <children>
                       <tagNode name="adv-router">
                         <properties>
@@ -203,7 +203,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database nssa-external adv-router $7"</command>
+                        <command>vtysh -c "show ip ospf database nssa-external adv-router $7"</command>
                       </tagNode>
                       <node name="adv-router">
                         <properties>
@@ -219,7 +219,7 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database nssa-external $6"</command>
+                    <command>vtysh -c "show ip ospf database nssa-external $6"</command>
                     <children>
                       <node name="adv-router">
                         <properties>
@@ -233,7 +233,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database nssa-external $6 adv-router $8"</command>
+                        <command>vtysh -c "show ip ospf database nssa-external $6 adv-router $8"</command>
                       </tagNode>
                       <leafNode name="self-originate">
                         <properties>
@@ -247,7 +247,7 @@
                     <properties>
                       <help>Show IPv4 OSPF opaque-area database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database opaque-area"</command>
+                    <command>vtysh -c "show ip ospf database opaque-area"</command>
                     <children>
                       <tagNode name="adv-router">
                         <properties>
@@ -256,7 +256,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database opaque-area adv-router $7"</command>
+                        <command>vtysh -c "show ip ospf database opaque-area adv-router $7"</command>
                       </tagNode>
                       <node name="adv-router">
                         <properties>
@@ -272,7 +272,7 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database opaque-area $6"</command>
+                    <command>vtysh -c "show ip ospf database opaque-area $6"</command>
                     <children>
                       <node name="adv-router">
                         <properties>
@@ -286,7 +286,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database opaque-area $6 adv-router $8"</command>
+                        <command>vtysh -c "show ip ospf database opaque-area $6 adv-router $8"</command>
                       </tagNode>
                       <leafNode name="self-originate">
                         <properties>
@@ -300,7 +300,7 @@
                     <properties>
                       <help>Show IPv4 OSPF opaque-as database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database opaque-as"</command>
+                    <command>vtysh -c "show ip ospf database opaque-as"</command>
                     <children>
                       <tagNode name="adv-router">
                         <properties>
@@ -309,7 +309,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database opaque-as adv-router $7"</command>
+                        <command>vtysh -c "show ip ospf database opaque-as adv-router $7"</command>
                       </tagNode>
                       <node name="adv-router">
                         <properties>
@@ -325,7 +325,7 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database opaque-as $6"</command>
+                    <command>vtysh -c "show ip ospf database opaque-as $6"</command>
                     <children>
                       <node name="adv-router">
                         <properties>
@@ -339,7 +339,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database opaque-as $6 adv-router $8"</command>
+                        <command>vtysh -c "show ip ospf database opaque-as $6 adv-router $8"</command>
                       </tagNode>
                       <leafNode name="self-originate">
                         <properties>
@@ -353,7 +353,7 @@
                     <properties>
                       <help>Show IPv4 OSPF opaque-link database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database opaque-link"</command>
+                    <command>vtysh -c "show ip ospf database opaque-link"</command>
                     <children>
                       <tagNode name="adv-router">
                         <properties>
@@ -362,7 +362,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database opaque-link adv-router $7"</command>
+                        <command>vtysh -c "show ip ospf database opaque-link adv-router $7"</command>
                       </tagNode>
                       <node name="adv-router">
                         <properties>
@@ -378,7 +378,7 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database opaque-link $6"</command>
+                    <command>vtysh -c "show ip ospf database opaque-link $6"</command>
                     <children>
                       <node name="adv-router">
                         <properties>
@@ -392,7 +392,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database opaque-link $6 adv-router $8"</command>
+                        <command>vtysh -c "show ip ospf database opaque-link $6 adv-router $8"</command>
                       </tagNode>
                       <leafNode name="self-originate">
                         <properties>
@@ -406,7 +406,7 @@
                     <properties>
                       <help>Show IPv4 OSPF router database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database router"</command>
+                    <command>vtysh -c "show ip ospf database router"</command>
                     <children>
                       <tagNode name="adv-router">
                         <properties>
@@ -415,7 +415,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database router adv-router $7"</command>
+                        <command>vtysh -c "show ip ospf database router adv-router $7"</command>
                       </tagNode>
                       <node name="adv-router">
                         <properties>
@@ -431,7 +431,7 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database router $6"</command>
+                    <command>vtysh -c "show ip ospf database router $6"</command>
                     <children>
                       <node name="adv-router">
                         <properties>
@@ -445,7 +445,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database router $6 adv-router $8"</command>
+                        <command>vtysh -c "show ip ospf database router $6 adv-router $8"</command>
                       </tagNode>
                       <leafNode name="self-originate">
                         <properties>
@@ -459,13 +459,13 @@
                     <properties>
                       <help>Show IPv4 OSPF self-originate database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database self-originate"</command>
+                    <command>vtysh -c "show ip ospf database self-originate"</command>
                   </leafNode>
                   <node name="summary">
                     <properties>
                       <help>Show summary of IPv4 OSPF database</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database summary"</command>
+                    <command>vtysh -c "show ip ospf database summary"</command>
                     <children>
                       <tagNode name="adv-router">
                         <properties>
@@ -474,7 +474,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database summary adv-router $7"</command>
+                        <command>vtysh -c "show ip ospf database summary adv-router $7"</command>
                       </tagNode>
                       <node name="adv-router">
                         <properties>
@@ -490,7 +490,7 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf database summary $6"</command>
+                    <command>vtysh -c "show ip ospf database summary $6"</command>
                     <children>
                       <node name="adv-router">
                         <properties>
@@ -504,7 +504,7 @@
                             <list>&lt;x.x.x.x&gt;</list>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show ip ospf database summary $6 adv-router $8"</command>
+                        <command>vtysh -c "show ip ospf database summary $6 adv-router $8"</command>
                       </tagNode>
                       <leafNode name="self-originate">
                         <properties>
@@ -520,7 +520,7 @@
                 <properties>
                   <help>Show IPv4 OSPF interface information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip ospf interface"</command>
+                <command>vtysh -c "show ip ospf interface"</command>
               </node>
               <tagNode name="interface">
                 <properties>
@@ -529,13 +529,13 @@
                     <script>${vyos_completion_dir}/list_interfaces.py</script>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip ospf interface $5"</command>
+                <command>vtysh -c "show ip ospf interface $5"</command>
               </tagNode>
               <node name="neighbor">
                 <properties>
                   <help>Show IPv4 OSPF neighbor information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip ospf neighbor"</command>
+                <command>vtysh -c "show ip ospf neighbor"</command>
                 <children>
                   <tagNode name="address">
                     <properties>
@@ -544,13 +544,13 @@
                         <list>&lt;x.x.x.x&gt;</list>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf neighbor $6"</command>
+                    <command>vtysh -c "show ip ospf neighbor $6"</command>
                   </tagNode>
                   <node name="detail">
                     <properties>
                       <help>Show detailed IPv4 OSPF neighbor information</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show ip ospf neighbor detail"</command>
+                    <command>vtysh -c "show ip ospf neighbor detail"</command>
                   </node>
                 </children>
               </node>
@@ -562,13 +562,13 @@
                     <script>${vyos_completion_dir}/list_interfaces.py</script>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip ospf neighbor $5"</command>
+                <command>vtysh -c "show ip ospf neighbor $5"</command>
               </tagNode>
               <leafNode name="route">
                 <properties>
                   <help>Show IPv4 OSPF route information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip ospf route"</command>
+                <command>vtysh -c "show ip ospf route"</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-ip-pim.xml.in b/op-mode-definitions/show-ip-pim.xml.in
index 3f4edc779..fa317a944 100644
--- a/op-mode-definitions/show-ip-pim.xml.in
+++ b/op-mode-definitions/show-ip-pim.xml.in
@@ -13,55 +13,55 @@
                 <properties>
                   <help>PIM interfaces information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip pim interface"</command>
+                <command>vtysh -c "show ip pim interface"</command>
               </leafNode>
               <leafNode name="join">
                 <properties>
                   <help>PIM join information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip pim join"</command>
+                <command>vtysh -c "show ip pim join"</command>
               </leafNode>
               <leafNode name="neighbor">
                 <properties>
                   <help>PIM neighbor information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip pim neighbor"</command>
+                <command>vtysh -c "show ip pim neighbor"</command>
               </leafNode>
               <leafNode name="nexthop">
                 <properties>
                   <help>PIM cached nexthop rpf information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip pim nexthop"</command>
+                <command>vtysh -c "show ip pim nexthop"</command>
               </leafNode>
               <leafNode name="state">
                 <properties>
                   <help>PIM state information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip pim state"</command>
+                <command>vtysh -c "show ip pim state"</command>
               </leafNode>
               <leafNode name="statistics">
                 <properties>
                   <help>PIM statistics</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip pim statistics"</command>
+                <command>vtysh -c "show ip pim statistics"</command>
               </leafNode>
               <leafNode name="rp">
                 <properties>
                   <help>PIM RP (Rendevous Point) information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip pim rp-info"</command>
+                <command>vtysh -c "show ip pim rp-info"</command>
               </leafNode>
               <leafNode name="rpf">
                 <properties>
                   <help>PIM cached source rpf information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip pim rpf"</command>
+                <command>vtysh -c "show ip pim rpf"</command>
               </leafNode>
               <leafNode name="upstream">
                 <properties>
                   <help>PIM upstream information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip pim upstream"</command>
+                <command>vtysh -c "show ip pim upstream"</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-ip-rip.xml.in b/op-mode-definitions/show-ip-rip.xml.in
index b61ab10a7..768a86ca1 100644
--- a/op-mode-definitions/show-ip-rip.xml.in
+++ b/op-mode-definitions/show-ip-rip.xml.in
@@ -11,13 +11,13 @@
             <properties>
               <help>Show Routing Information Protocol (RIP) information</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip rip"</command>
+            <command>vtysh -c "show ip rip"</command>
             <children>
               <leafNode name="status">
                 <properties>
                   <help>Show RIP protocol status</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip rip status"</command>
+                <command>vtysh -c "show ip rip status"</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-ip-route.xml.in b/op-mode-definitions/show-ip-route.xml.in
index a98048785..729572b4a 100644
--- a/op-mode-definitions/show-ip-route.xml.in
+++ b/op-mode-definitions/show-ip-route.xml.in
@@ -11,13 +11,13 @@
             <properties>
               <help>Show IP routes</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip route"</command>
+            <command>vtysh -c "show ip route"</command>
             <children>
               <leafNode name="bgp">
                 <properties>
                   <help>Show IP BGP routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route bgp"</command>
+                <command>vtysh -c "show ip route bgp"</command>
               </leafNode>
               <node name="cache">
                 <properties>
@@ -38,7 +38,7 @@
                 <properties>
                   <help>Show IP connected routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route connected"</command>
+                <command>vtysh -c "show ip route connected"</command>
               </leafNode>
               <node name="forward">
                 <properties>
@@ -59,43 +59,43 @@
                 <properties>
                   <help>Show IP IS-IS routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route isis"</command>
+                <command>vtysh -c "show ip route isis"</command>
               </leafNode>
               <leafNode name="kernel">
                 <properties>
                   <help>Show IP kernel routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route kernel"</command>
+                <command>vtysh -c "show ip route kernel"</command>
               </leafNode>
               <leafNode name="ospf">
                 <properties>
                   <help>Show IP OSPF routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route ospf"</command>
+                <command>vtysh -c "show ip route ospf"</command>
               </leafNode>
               <leafNode name="rip">
                 <properties>
                   <help>Show IP RIP routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route rip"</command>
+                <command>vtysh -c "show ip route rip"</command>
               </leafNode>
               <leafNode name="static">
                 <properties>
                   <help>Show IP static routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route static"</command>
+                <command>vtysh -c "show ip route static"</command>
               </leafNode>
               <leafNode name="summary">
                 <properties>
                   <help>Show IP routes summary</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route summary"</command>
+                <command>vtysh -c "show ip route summary"</command>
               </leafNode>
               <leafNode name="supernets-only">
                 <properties>
                   <help>Show IP supernet routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route supernets-only"</command>
+                <command>vtysh -c "show ip route supernets-only"</command>
               </leafNode>
               <node name="table">
                 <properties>
@@ -109,7 +109,7 @@
                     <list>&lt;1-200&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route table $5"</command>
+                <command>vtysh -c "show ip route table $5"</command>
               </tagNode>
               <node name="tag">
                 <properties>
@@ -123,7 +123,7 @@
                     <list>&lt;1-4294967295&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route tag $5"</command>
+                <command>vtysh -c "show ip route tag $5"</command>
               </tagNode>
               <node name="vrf">
                 <properties>
@@ -138,7 +138,7 @@
                     <path>vrf name</path>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route vrf $5"</command>
+                <command>vtysh -c "show ip route vrf $5"</command>
               </tagNode>
             </children>
           </node>
@@ -149,13 +149,13 @@
                 <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt;</list>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show ip route $4"</command>
+            <command>vtysh -c "show ip route $4"</command>
             <children>
               <leafNode name="longer-prefixes">
                 <properties>
                   <help>Show longer prefixes of routes for specified IP address or prefix</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show ip route $4 longer-prefixes"</command>
+                <command>vtysh -c "show ip route $4 longer-prefixes"</command>
               </leafNode>
             </children>
           </tagNode>
diff --git a/op-mode-definitions/show-isis.xml.in b/op-mode-definitions/show-isis.xml.in
index 4e308730f..890d511e2 100644
--- a/op-mode-definitions/show-isis.xml.in
+++ b/op-mode-definitions/show-isis.xml.in
@@ -16,10 +16,10 @@
                 <properties>
                   <help>Show detailed information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis database detail"</command>
+                <command>vtysh -c "show isis database detail"</command>
               </leafNode>
             </children>
-            <command>/usr/bin/vtysh -c "show isis database"</command>
+            <command>vtysh -c "show isis database"</command>
           </node>
           <tagNode name="database">
             <properties>
@@ -28,13 +28,13 @@
                 <list>lsp-id detail</list>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show isis database $4"</command>
+            <command>vtysh -c "show isis database $4"</command>
           </tagNode>
           <leafNode name="hostname">
             <properties>
               <help>Show IS-IS dynamic hostname mapping</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show isis hostname"</command>
+            <command>vtysh -c "show isis hostname"</command>
           </leafNode>
           <node name="interface">
             <properties>
@@ -48,10 +48,10 @@
                 <properties>
                   <help>Show detailed information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis interface detail"</command>
+                <command>vtysh -c "show isis interface detail"</command>
               </leafNode>
             </children>
-            <command>/usr/bin/vtysh -c "show isis interface"</command>
+            <command>vtysh -c "show isis interface"</command>
           </node>
           <tagNode name="interface">
             <properties>
@@ -60,7 +60,7 @@
                 <script>${vyos_completion_dir}/list_interfaces.py</script>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show isis interface $4"</command>
+            <command>vtysh -c "show isis interface $4"</command>
           </tagNode>
           <node name="traffic-engineering">
             <properties>
@@ -71,13 +71,13 @@
                 <properties>
                   <help>Show router information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis mpls-te router"</command>
+                <command>vtysh -c "show isis mpls-te router"</command>
               </leafNode>
               <leafNode name="interface">
                 <properties>
                   <help>Show interface information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis mpls-te interface"</command>
+                <command>vtysh -c "show isis mpls-te interface"</command>
               </leafNode>
               <tagNode name="interface">
                 <properties>
@@ -86,7 +86,7 @@
                     <script>${vyos_completion_dir}/list_interfaces.py</script>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis mpls-te interface $5"</command>
+                <command>vtysh -c "show isis mpls-te interface $5"</command>
               </tagNode>
             </children>
           </node>
@@ -99,10 +99,10 @@
                 <properties>
                   <help>Show detailed information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis neighbor detail"</command>
+                <command>vtysh -c "show isis neighbor detail"</command>
               </leafNode>
             </children>
-            <command>/usr/bin/vtysh -c "show isis neighbor"</command>
+            <command>vtysh -c "show isis neighbor"</command>
           </node>
           <tagNode name="neighbor">
             <properties>
@@ -111,7 +111,7 @@
                 <list>system-id</list>
               </completionHelp>
             </properties>
-            <command>/usr/bin/vtysh -c "show isis neighbor $4"</command>
+            <command>vtysh -c "show isis neighbor $4"</command>
           </tagNode>
           <node name="route">
             <properties>
@@ -122,16 +122,16 @@
                 <properties>
                   <help>Show level-1 routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis route level-1"</command>
+                <command>vtysh -c "show isis route level-1"</command>
               </leafNode>
               <leafNode name="level-2">
                 <properties>
                   <help>Show level-2 routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis route level-2"</command>
+                <command>vtysh -c "show isis route level-2"</command>
               </leafNode>
             </children>
-            <command>/usr/bin/vtysh -c "show isis route"</command>
+            <command>vtysh -c "show isis route"</command>
           </node>
           <node name="segment-routing">
             <properties>
@@ -142,13 +142,13 @@
                 <properties>
                   <help>Show node information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis segment-routing node"</command>
+                <command>vtysh -c "show isis segment-routing node"</command>
               </leafNode>
               <leafNode name="prefix-sids">
                 <properties>
                   <help>Show prefix segment IDs</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis segment-routing prefix-sids"</command>
+                <command>vtysh -c "show isis segment-routing prefix-sids"</command>
               </leafNode>
             </children>
           </node>
@@ -156,13 +156,13 @@
             <properties>
               <help>Show IS-IS SPF delay parameters</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show isis spf-delay-ietf"</command>
+            <command>vtysh -c "show isis spf-delay-ietf"</command>
           </leafNode>
           <leafNode name="summary">
             <properties>
               <help>Show IS-IS information summary</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show isis summary"</command>
+            <command>vtysh -c "show isis summary"</command>
           </leafNode>
           <node name="topology">
             <properties>
@@ -173,16 +173,16 @@
                 <properties>
                   <help>Show level-1 routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis topology level-1"</command>
+                <command>vtysh -c "show isis topology level-1"</command>
               </leafNode>
               <leafNode name="level-2">
                 <properties>
                   <help>Show level-2 routes</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show isis topology level-2"</command>
+                <command>vtysh -c "show isis topology level-2"</command>
               </leafNode>
             </children>
-            <command>/usr/bin/vtysh -c "show isis topology"</command>
+            <command>vtysh -c "show isis topology"</command>
           </node>
         </children>
       </node>
diff --git a/op-mode-definitions/show-mpls.xml.in b/op-mode-definitions/show-mpls.xml.in
index 833ac98eb..86f6f1bcc 100644
--- a/op-mode-definitions/show-mpls.xml.in
+++ b/op-mode-definitions/show-mpls.xml.in
@@ -16,41 +16,41 @@
                 <properties>
                   <help>Label Information Base</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show mpls ldp binding"</command>
+                <command>vtysh -c "show mpls ldp binding"</command>
                 <children>
                   <node name="detail">
                     <properties>
                       <help>Show detailed information</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp binding detail"</command>
+                    <command>vtysh -c "show mpls ldp binding detail"</command>
                   </node>
                   <tagNode name="neighbor">
                     <properties>
                       <help>Display labels from LDP neighbor</help>
                       <completionHelp>
                         <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-                        <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
+                        <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
                       </completionHelp>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp binding neighbor $6"</command>
+                    <command>vtysh -c "show mpls ldp binding neighbor $6"</command>
                     <children>
                       <leafNode name="detail">
                         <properties>
                           <help>Show detailed information</help>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show mpls ldp binding neighbor $6 detail"</command>
+                        <command>vtysh -c "show mpls ldp binding neighbor $6 detail"</command>
                       </leafNode>
                       <tagNode name="local-label">
                         <properties>
                           <help>Match locally assigned label value</help>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show mpls ldp binding neighbor $6 local-label $8"</command>
+                        <command>vtysh -c "show mpls ldp binding neighbor $6 local-label $8"</command>
                       </tagNode>
                       <tagNode name="remote-label">
                         <properties>
                           <help>Match remotely assigned label value</help>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show mpls ldp binding neighbor $6 remote-label $8"</command>
+                        <command>vtysh -c "show mpls ldp binding neighbor $6 remote-label $8"</command>
                       </tagNode>
                     </children>
                   </tagNode>
@@ -58,29 +58,29 @@
                     <properties>
                       <help>Match locally assigned label value</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp binding local-label $6"</command>
+                    <command>vtysh -c "show mpls ldp binding local-label $6"</command>
                     <children>
                       <leafNode name="detail">
                         <properties>
                           <help>Show detailed information</help>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show mpls ldp binding local-label $6 detail"</command>
+                        <command>vtysh -c "show mpls ldp binding local-label $6 detail"</command>
                       </leafNode>
                       <tagNode name="neighbor">
                         <properties>
                           <help>Match LDP neighbor</help>
                           <completionHelp>
                             <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-                            <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
+                            <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show mpls ldp binding local-label $6 neighbor $8"</command>
+                        <command>vtysh -c "show mpls ldp binding local-label $6 neighbor $8"</command>
                       </tagNode>
                       <tagNode name="remote-label">
                         <properties>
                           <help>Match remotely assigned label value</help>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show mpls ldp binding local-label $6 remote-label $8"</command>
+                        <command>vtysh -c "show mpls ldp binding local-label $6 remote-label $8"</command>
                       </tagNode>
                     </children>
                   </tagNode>
@@ -88,29 +88,29 @@
                     <properties>
                       <help>Match remotely assigned label value</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp binding remote-label $6"</command>
+                    <command>vtysh -c "show mpls ldp binding remote-label $6"</command>
                     <children>
                       <leafNode name="detail">
                         <properties>
                           <help>Show detailed information</help>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show mpls ldp binding remote-label $6 detail"</command>
+                        <command>vtysh -c "show mpls ldp binding remote-label $6 detail"</command>
                       </leafNode>
                       <tagNode name="neighbor">
                         <properties>
                           <help>Match LDP neighbor</help>
                           <completionHelp>
                             <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-                            <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
+                            <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
                           </completionHelp>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show mpls ldp binding remote-label $6 neighbor $8"</command>
+                        <command>vtysh -c "show mpls ldp binding remote-label $6 neighbor $8"</command>
                       </tagNode>
                       <tagNode name="local-label">
                         <properties>
                           <help>Match locally assigned label value</help>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show mpls ldp binding remote-label $6 local-label $8"</command>
+                        <command>vtysh -c "show mpls ldp binding remote-label $6 local-label $8"</command>
                       </tagNode>
                     </children>
                   </tagNode>
@@ -123,13 +123,13 @@
                     <list>&lt;x.x.x.x/x&gt; &lt;h:h:h:h:h:h:h:h/h&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show mpls ldp binding $5"</command>
+                <command>vtysh -c "show mpls ldp binding $5"</command>
                 <children>
                   <leafNode name="detail">
                     <properties>
                       <help>Show detailed information</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp binding $5 detail"</command>
+                    <command>vtysh -c "show mpls ldp binding $5 detail"</command>
                   </leafNode>
                 </children>
               </tagNode>
@@ -137,13 +137,13 @@
                 <properties>
                   <help>Discovery hello information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show mpls ldp discovery"</command>
+                <command>vtysh -c "show mpls ldp discovery"</command>
                 <children>
                   <leafNode name="detail">
                     <properties>
                       <help>Show detailed information</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp discovery detail"</command>
+                    <command>vtysh -c "show mpls ldp discovery detail"</command>
                   </leafNode>
                 </children>
               </node>
@@ -151,25 +151,25 @@
                 <properties>
                   <help>LDP interface information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show mpls ldp interface"</command>
+                <command>vtysh -c "show mpls ldp interface"</command>
               </node>
               <node name="neighbor">
                 <properties>
                   <help>LDP neighbor information</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show mpls ldp neighbor"</command>
+                <command>vtysh -c "show mpls ldp neighbor"</command>
                 <children>
                   <leafNode name="detail">
                     <properties>
                       <help>Show detailed information</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp neighbor detail"</command>
+                    <command>vtysh -c "show mpls ldp neighbor detail"</command>
                   </leafNode>
                   <leafNode name="capabilities">
                     <properties>
                       <help>Show neighbor capability information</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp neighbor capabilities"</command>
+                    <command>vtysh -c "show mpls ldp neighbor capabilities"</command>
                   </leafNode>
                 </children>
               </node>
@@ -178,22 +178,22 @@
                   <help>LDP neighbor</help>
                   <completionHelp>
                     <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-                    <script>/usr/bin/vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
+                    <script>vtysh -c "show mpls ldp neighbor" | awk '{print $2}' | egrep -v "ID"</script>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show mpls ldp neighbor $5"</command>
+                <command>vtysh -c "show mpls ldp neighbor $5"</command>
                 <children>
                   <leafNode name="detail">
                     <properties>
                       <help>Show detailed information</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp neighbor $5 detail"</command>
+                    <command>vtysh -c "show mpls ldp neighbor $5 detail"</command>
                   </leafNode>
                   <leafNode name="capabilities">
                     <properties>
                       <help>Show neighbor capability information</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show mpls ldp neighbor $5 capabilities"</command>
+                    <command>vtysh -c "show mpls ldp neighbor $5 capabilities"</command>
                   </leafNode>
                 </children>
               </tagNode>
@@ -203,13 +203,13 @@
             <properties>
               <help>Show MPLS pseudowire interfaces</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show mpls pseudowires"</command>
+            <command>vtysh -c "show mpls pseudowires"</command>
           </node>
           <node name="table">
             <properties>
               <help>Show MPLS table</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show mpls table"</command>
+            <command>vtysh -c "show mpls table"</command>
           </node>
         </children>
       </node>
diff --git a/op-mode-definitions/show-protocols-bfd.xml.in b/op-mode-definitions/show-protocols-bfd.xml.in
index 3d9b67c67..886b01e51 100644
--- a/op-mode-definitions/show-protocols-bfd.xml.in
+++ b/op-mode-definitions/show-protocols-bfd.xml.in
@@ -13,13 +13,13 @@
                 <properties>
                   <help>Show all Bidirectional Forwarding Detection (BFD) peer status</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show bfd peers"</command>
+                <command>vtysh -c "show bfd peers"</command>
                 <children>
                   <leafNode name="counters">
                     <properties>
                       <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show bfd peers counters"</command>
+                    <command>vtysh -c "show bfd peers counters"</command>
                   </leafNode>
                 </children>
               </node>
@@ -27,16 +27,16 @@
                 <properties>
                   <help>Show Bidirectional Forwarding Detection (BFD) peer status</help>
                   <completionHelp>
-                    <script>/usr/bin/vtysh -c "show bfd peers" | awk '/[:blank:]*peer/ { printf "%s\n", $2 }'</script>
+                    <script>vtysh -c "show bfd peers" | awk '/[:blank:]*peer/ { printf "%s\n", $2 }'</script>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("/usr/bin/vtysh -c \"show bfd " peer "\"") }'</command>
+                <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer "\"") }'</command>
                 <children>
                   <leafNode name="counters">
                     <properties>
                       <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("/usr/bin/vtysh -c \"show bfd " peer " counters\"") }'</command>
+                    <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer " counters\"") }'</command>
                   </leafNode>
                 </children>
               </tagNode>
@@ -44,7 +44,7 @@
                 <properties>
                   <help>Show Bidirectional Forwarding Detection (BFD) peers brief</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show bfd peers brief"</command>
+                <command>vtysh -c "show bfd peers brief"</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-route-map.xml.in b/op-mode-definitions/show-route-map.xml.in
index 0e376757b..633b2a4cb 100644
--- a/op-mode-definitions/show-route-map.xml.in
+++ b/op-mode-definitions/show-route-map.xml.in
@@ -6,7 +6,7 @@
         <properties>
           <help>Show route-map information</help>
         </properties>
-        <command>/usr/bin/vtysh -c "show route-map"</command>
+        <command>vtysh -c "show route-map"</command>
       </node>
       <tagNode name="route-map">
         <properties>
@@ -15,7 +15,7 @@
             <path>policy route-map</path>
           </completionHelp>
         </properties>
-        <command>/usr/bin/vtysh -c "show route-map $3"</command>
+        <command>vtysh -c "show route-map $3"</command>
       </tagNode>
     </children>
   </node>
diff --git a/op-mode-definitions/show-rpki.xml.in b/op-mode-definitions/show-rpki.xml.in
index d68c3b862..f593e4803 100644
--- a/op-mode-definitions/show-rpki.xml.in
+++ b/op-mode-definitions/show-rpki.xml.in
@@ -11,19 +11,19 @@
             <properties>
               <help>Show RPKI cache connections</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show rpki cache-connection"</command>
+            <command>vtysh -c "show rpki cache-connection"</command>
           </leafNode>
           <leafNode name="cache-server">
              <properties>
                <help>Show RPKI cache servers information</help>
              </properties>
-             <command>/usr/bin/vtysh -c "show rpki cache-server"</command>
+             <command>vtysh -c "show rpki cache-server"</command>
           </leafNode>
           <leafNode name="prefix-table">
              <properties>
                <help>Show RPKI-validated prefixes</help>
              </properties>
-             <command>/usr/bin/vtysh -c "show rpki prefix-table"</command>
+             <command>vtysh -c "show rpki prefix-table"</command>
           </leafNode>
         </children>
       </node>
diff --git a/op-mode-definitions/show-system.xml.in b/op-mode-definitions/show-system.xml.in
index 0623e3b62..5e9bf719e 100644
--- a/op-mode-definitions/show-system.xml.in
+++ b/op-mode-definitions/show-system.xml.in
@@ -128,7 +128,7 @@
                 <properties>
                   <help>Show memory usage of all routing protocols</help>
                 </properties>
-                <command>/usr/bin/vtysh -c "show memory"</command>
+                <command>vtysh -c "show memory"</command>
               </leafNode>
             </children>
           </node>
@@ -162,7 +162,7 @@
             <properties>
               <help>Show Quagga routing daemons</help>
             </properties>
-            <command>/usr/bin/vtysh -c "show daemons"</command>
+            <command>vtysh -c "show daemons"</command>
           </leafNode>
           <leafNode name="storage">
             <properties>
diff --git a/op-mode-definitions/show-table.xml.in b/op-mode-definitions/show-table.xml.in
index b093a5de7..c7998e35d 100644
--- a/op-mode-definitions/show-table.xml.in
+++ b/op-mode-definitions/show-table.xml.in
@@ -6,7 +6,7 @@
         <properties>
           <help>Show routing tables</help>
         </properties>
-        <command>/usr/bin/vtysh -c "show zebra router table summary"</command>
+        <command>vtysh -c "show zebra router table summary"</command>
       </leafNode>
     </children>
   </node>
diff --git a/op-mode-definitions/show-version.xml.in b/op-mode-definitions/show-version.xml.in
index 2202d27b3..f1e2e2666 100644
--- a/op-mode-definitions/show-version.xml.in
+++ b/op-mode-definitions/show-version.xml.in
@@ -24,7 +24,7 @@
              <properties>
                <help>Show Quagga version information</help>
              </properties>
-             <command>/usr/bin/vtysh -c "show version"</command>
+             <command>vtysh -c "show version"</command>
           </leafNode>
         </children>
       </node>
-- 
cgit v1.2.3