From fb23d70afd8386e9c986653436b0caa9d5b6deb0 Mon Sep 17 00:00:00 2001
From: sever-sever <v.gletenko@vyos.io>
Date: Wed, 27 May 2020 12:00:30 +0000
Subject: op-mode: T2512: Fix conflict templates ipv4-route and show-ip-route

---
 op-mode-definitions/ipv4-route.xml    | 38 -----------------------------------
 op-mode-definitions/show-ip-route.xml | 30 +++++++++++++++++++++++++++
 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>
-- 
cgit v1.2.3