1 files changed, 40 insertions, 6 deletions
diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml
index 85f6047c1..d16e9e3b8 100644
--- a/op-mode-definitions/traceroute.xml
+++ b/op-mode-definitions/traceroute.xml
@@ -12,9 +12,8 @@
             <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
           </completionHelp>
         </properties>
-        <command>/usr/bin/traceroute $2</command>
+        <command>traceroute $2</command>
       </tagNode>
-
       <tagNode name="ipv4">
         <properties>
           <help>Track network path to &lt;hostname|IPv4 address&gt;</help>
@@ -22,9 +21,8 @@
             <list>&lt;hostname&gt; &lt;x.x.x.x&gt;</list>
           </completionHelp>
         </properties>
-        <command>/usr/bin/traceroute -4 $3</command>
+        <command>traceroute -4 $3</command>
       </tagNode>
-
       <tagNode name="ipv6">
         <properties>
           <help>Track network path to &lt;hostname|IPv6 address&gt;</help>
@@ -32,11 +30,47 @@
             <list>&lt;hostname&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
           </completionHelp>
         </properties>
-        <command>/usr/bin/traceroute -6 $3</command>
+        <command>traceroute -6 $3</command>
+      </tagNode>
+      <tagNode name="vrf">
+        <properties>
+          <help>Track network path to specified node via given VRF instance</help>
+          <completionHelp>
+            <path>vrf name</path>
+          </completionHelp>
+        </properties>
+        <children>
+          <tagNode name="">
+            <properties>
+              <help>Track network path to specified node</help>
+              <completionHelp>
+                <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
+              </completionHelp>
+            </properties>
+            <command>sudo ip vrf exec "$3" traceroute "$4"</command>
+          </tagNode>
+          <tagNode name="ipv4">
+            <properties>
+              <help>Track network path to &lt;hostname|IPv4 address&gt;</help>
+              <completionHelp>
+                <list>&lt;hostname&gt; &lt;x.x.x.x&gt;</list>
+              </completionHelp>
+            </properties>
+            <command>sudo ip vrf exec "$3" traceroute -4 "$5"</command>
+          </tagNode>
+          <tagNode name="ipv6">
+            <properties>
+              <help>Track network path to &lt;hostname|IPv6 address&gt;</help>
+              <completionHelp>
+                <list>&lt;hostname&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
+              </completionHelp>
+            </properties>
+            <command>sudo ip vrf exec "$3" traceroute -6 "$5"</command>
+          </tagNode>
+        </children>
       </tagNode>
     </children>
   </node>
-
   <node name="monitor">
     <children>
       <tagNode name="traceroute">