summaryrefslogtreecommitdiff
path: root/op-mode-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-05-01 10:34:19 +0200
committerChristian Poessinger <christian@poessinger.com>2020-05-01 10:34:19 +0200
commit096c77340b2a6a72edbed660fe4fb000aca9275f (patch)
treeb4df33f829056932eff9d4c15661d34ee87acfb3 /op-mode-definitions
parentd6f330894a681be9100dea638221ecad72452e2c (diff)
downloadvyos-1x-096c77340b2a6a72edbed660fe4fb000aca9275f.tar.gz
vyos-1x-096c77340b2a6a72edbed660fe4fb000aca9275f.zip
op-mode: monitor: traceroute: T2411: add VRF awareness
Diffstat (limited to 'op-mode-definitions')
-rw-r--r--op-mode-definitions/traceroute.xml41
1 files changed, 33 insertions, 8 deletions
diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml
index 43fba3cdd..1aea8eef6 100644
--- a/op-mode-definitions/traceroute.xml
+++ b/op-mode-definitions/traceroute.xml
@@ -7,7 +7,7 @@
<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>/usr/bin/traceroute "$2"</command>
</tagNode>
<node name="traceroute">
<children>
@@ -18,7 +18,7 @@
<list>&lt;hostname&gt; &lt;x.x.x.x&gt;</list>
</completionHelp>
</properties>
- <command>/usr/bin/traceroute -4 $3</command>
+ <command>/usr/bin/traceroute -4 "$3"</command>
</tagNode>
<tagNode name="ipv6">
<properties>
@@ -27,21 +27,21 @@
<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>/usr/bin/traceroute -6 "$3"</command>
</tagNode>
<tagNode name="vrf">
<properties>
- <help>Track network path to specified node via given VRF instance</help>
+ <help>Track network path to specified node via given VRF</help>
<completionHelp>
<path>vrf name</path>
</completionHelp>
</properties>
<children>
- <!-- we need an empty tag node to pass in a plain fqdn/ip address and
+ <!-- we need an empty tagNode 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 via given VRF instance</help>
+ <help>Track network path to specified node via given VRF</help>
<completionHelp>
<list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
</completionHelp>
@@ -74,13 +74,38 @@
<children>
<tagNode name="traceroute">
<properties>
- <help>Monitor the path to a destination in realtime</help>
+ <help>Monitor path to destination in realtime</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/mtr $3</command>
+ <command>/usr/bin/mtr "$3"</command>
</tagNode>
+ <node name="traceroute">
+ <children>
+ <tagNode name="vrf">
+ <properties>
+ <help>Monitor path to destination in realtime via given VRF</help>
+ <completionHelp>
+ <path>vrf name</path>
+ </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="">
+ <properties>
+ <help>Track network path to specified node via given VRF</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 /usr/sbin/ip vrf exec "$4" /usr/bin/mtr "$5"</command>
+ </tagNode>
+ </children>
+ </tagNode>
+ </children>
+ </node>
</children>
</node>
</interfaceDefinition>