summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsever-sever <v.gletenko@vyos.io>2020-05-27 12:00:30 +0000
committersever-sever <v.gletenko@vyos.io>2020-05-27 12:00:30 +0000
commitfb23d70afd8386e9c986653436b0caa9d5b6deb0 (patch)
tree6d41ffb42aec033adedfe573e5f79cbf7efccd82
parentfbe88e561c69936d67f372d1fab9e55610567fcc (diff)
downloadvyos-1x-fb23d70afd8386e9c986653436b0caa9d5b6deb0.tar.gz
vyos-1x-fb23d70afd8386e9c986653436b0caa9d5b6deb0.zip
op-mode: T2512: Fix conflict templates ipv4-route and show-ip-route
-rw-r--r--op-mode-definitions/ipv4-route.xml38
-rw-r--r--op-mode-definitions/show-ip-route.xml30
2 files changed, 30 insertions, 38 deletions
diff --git a/op-mode-definitions/ipv4-route.xml b/op-mode-definitions/ipv4-route.xml
index d2846a6f2..1bda3ac11 100644
--- a/op-mode-definitions/ipv4-route.xml
+++ b/op-mode-definitions/ipv4-route.xml
@@ -16,44 +16,6 @@
</properties>
<command>netstat -gn4</command>
</leafNode>
-
- <node name="route">
- <properties>
- <help>Show IP routes</help>
- </properties>
- <children>
- <node name="cache">
- <properties>
- <help>Show kernel route cache</help>
- </properties>
- <command>ip -s route list cache</command>
- </node>
- <tagNode name="cache">
- <properties>
- <help>Show kernel route cache for a given route</help>
- <completionHelp>
- <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt;</list>
- </completionHelp>
- </properties>
- <command>ip -s route list cache $5</command>
- </tagNode>
- <node name="forward">
- <properties>
- <help>Show kernel route table</help>
- </properties>
- <command>ip route list</command>
- </node>
- <tagNode name="forward">
- <properties>
- <help>Show kernel route table for a given route</help>
- <completionHelp>
- <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt;</list>
- </completionHelp>
- </properties>
- <command>ip -s route list $5</command>
- </tagNode>
- </children>
- </node>
</children>
</node>
</children>
diff --git a/op-mode-definitions/show-ip-route.xml b/op-mode-definitions/show-ip-route.xml
index 2379b3aae..d12d132c0 100644
--- a/op-mode-definitions/show-ip-route.xml
+++ b/op-mode-definitions/show-ip-route.xml
@@ -19,12 +19,42 @@
</properties>
<command>/usr/bin/vtysh -c "show ip route bgp"</command>
</leafNode>
+ <node name="cache">
+ <properties>
+ <help>Show kernel route cache</help>
+ </properties>
+ <command>ip -s route list cache</command>
+ </node>
+ <tagNode name="cache">
+ <properties>
+ <help>Show kernel route cache for a given route</help>
+ <completionHelp>
+ <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>ip -s route list cache $5</command>
+ </tagNode>
<leafNode name="connected">
<properties>
<help>Show IP connected routes</help>
</properties>
<command>/usr/bin/vtysh -c "show ip route connected"</command>
</leafNode>
+ <node name="forward">
+ <properties>
+ <help>Show kernel route table</help>
+ </properties>
+ <command>ip route list</command>
+ </node>
+ <tagNode name="forward">
+ <properties>
+ <help>Show kernel route table for a given route</help>
+ <completionHelp>
+ <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>ip -s route list $5</command>
+ </tagNode>
<leafNode name="kernel">
<properties>
<help>Show IP kernel routes</help>