From d6f330894a681be9100dea638221ecad72452e2c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 1 May 2020 10:04:07 +0200
Subject: op-mode: traceroute: T2129: migrate to top level tagNode

---
 op-mode-definitions/traceroute.xml | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

(limited to 'op-mode-definitions/traceroute.xml')

diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml
index d623fe103..43fba3cdd 100644
--- a/op-mode-definitions/traceroute.xml
+++ b/op-mode-definitions/traceroute.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
-  <node name="traceroute">
+  <tagNode name="traceroute">
     <properties>
       <help>Track network path to 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>/usr/bin/traceroute $2</command>
+  </tagNode>
+  <node name="traceroute">
     <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>/usr/bin/traceroute $2</command>
-      </tagNode>
       <tagNode name="ipv4">
         <properties>
-          <help>Track network path to &lt;hostname|IPv4 address&gt;</help>
+          <help>Explicitly use IPv4 when tracing the path</help>
           <completionHelp>
             <list>&lt;hostname&gt; &lt;x.x.x.x&gt;</list>
           </completionHelp>
@@ -25,7 +22,7 @@
       </tagNode>
       <tagNode name="ipv6">
         <properties>
-          <help>Track network path to &lt;hostname|IPv6 address&gt;</help>
+          <help>Explicitly use IPv6 when tracing the path</help>
           <completionHelp>
             <list>&lt;hostname&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
           </completionHelp>
@@ -40,32 +37,34 @@
           </completionHelp>
         </properties>
         <children>
+          <!-- we need an empty tag node to pass in a plain fqdn/ip address and
+               let traceroute decide how to handle this parameter -->
           <tagNode name="">
             <properties>
-              <help>Track network path to specified node</help>
+              <help>Track network path to specified node via given VRF instance</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>
+            <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/traceroute "$4"</command>
           </tagNode>
           <tagNode name="ipv4">
             <properties>
-              <help>Track network path to &lt;hostname|IPv4 address&gt;</help>
+              <help>Explicitly use IPv4 when tracing the path via given VRF</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>
+            <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/traceroute -4 "$5"</command>
           </tagNode>
           <tagNode name="ipv6">
             <properties>
-              <help>Track network path to &lt;hostname|IPv6 address&gt;</help>
+              <help>Explicitly use IPv6 when tracing the path via given VRF</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>
+            <command>sudo /usr/sbin/ip vrf exec "$3" /usr/bin/traceroute -6 "$5"</command>
           </tagNode>
         </children>
       </tagNode>
-- 
cgit v1.2.3