From ed73f993107d9855f31236267b2b88b680ec8971 Mon Sep 17 00:00:00 2001
From: sever-sever <v.gletenko@vyos.io>
Date: Tue, 18 Aug 2020 09:33:40 +0000
Subject: op-mode: T2791: Add monitor traceroute explicit for ipv4-ipv6 and vrf

---
 op-mode-definitions/traceroute.xml | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml
index 6a44fc25b..1b619ed43 100644
--- a/op-mode-definitions/traceroute.xml
+++ b/op-mode-definitions/traceroute.xml
@@ -165,6 +165,24 @@
       </tagNode>
       <node name="traceroute">
         <children>
+          <tagNode name="ipv4">
+            <properties>
+              <help>IPv4 fully qualified domain name (FQDN)</help>
+              <completionHelp>
+                <list>&lt;fqdn&gt;</list>
+              </completionHelp>
+            </properties>
+            <command>/usr/bin/mtr -4 "$4"</command>
+          </tagNode>
+          <tagNode name="ipv6">
+            <properties>
+              <help>IPv6 fully qualified domain name (FQDN)</help>
+              <completionHelp>
+                <list>&lt;fqdn&gt;</list>
+              </completionHelp>
+            </properties>
+            <command>/usr/bin/mtr -6 "$4"</command>
+          </tagNode>
           <tagNode name="vrf">
             <properties>
               <help>Monitor path to destination in realtime via given VRF</help>
@@ -173,8 +191,24 @@
               </completionHelp>
             </properties>
             <children>
-              <!-- we need an empty tagNode to pass in a plain fqdn/ip address and
-                   let traceroute decide how to handle this parameter -->
+              <tagNode name="ipv4">
+                <properties>
+                  <help>IPv4 fully qualified domain name (FQDN)</help>
+                  <completionHelp>
+                    <list>&lt;fqdn&gt;</list>
+                  </completionHelp>
+                </properties>
+                <command>sudo /usr/sbin/ip vrf exec "$4" /usr/bin/mtr -4 "$6"</command>
+              </tagNode>
+              <tagNode name="ipv6">
+                <properties>
+                  <help>IPv6 fully qualified domain name (FQDN)</help>
+                  <completionHelp>
+                    <list>&lt;fqdn&gt;</list>
+                  </completionHelp>
+                </properties>
+                <command>sudo /usr/sbin/ip vrf exec "$4" /usr/bin/mtr -6 "$6"</command>
+              </tagNode>
               <tagNode name="">
                 <properties>
                   <help>Track network path to specified node via given VRF</help>
-- 
cgit v1.2.3