From a9a020bac532c6432fafb8101a74bd58c08a8720 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 21 Mar 2021 18:09:15 +0000
Subject: isis: T3417: ad per vrf op-mode commands

---
 op-mode-definitions/include/isis-common.xml.i | 179 ++++++++++++++++++++++++++
 op-mode-definitions/show-isis.xml.in          | 178 +------------------------
 2 files changed, 186 insertions(+), 171 deletions(-)
 create mode 100644 op-mode-definitions/include/isis-common.xml.i

diff --git a/op-mode-definitions/include/isis-common.xml.i b/op-mode-definitions/include/isis-common.xml.i
new file mode 100644
index 000000000..b1ee3e241
--- /dev/null
+++ b/op-mode-definitions/include/isis-common.xml.i
@@ -0,0 +1,179 @@
+<!-- included start from isis-common.xml.i -->
+<node name="database">
+  <properties>
+    <help>Show IS-IS link state database</help>
+  </properties>
+  <children>
+    <leafNode name="detail">
+      <properties>
+        <help>Show detailed information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<tagNode name="database">
+  <properties>
+    <help>Show IS-IS link state database PDU</help>
+    <completionHelp>
+      <list>lsp-id detail</list>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<leafNode name="hostname">
+  <properties>
+    <help>Show IS-IS dynamic hostname mapping</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<node name="interface">
+  <properties>
+    <help>Show IS-IS interfaces</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+  </properties>
+  <children>
+    <leafNode name="detail">
+      <properties>
+        <help>Show detailed information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<tagNode name="interface">
+  <properties>
+    <help>Show specific IS-IS interface</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="mpls-te">
+  <properties>
+    <help>Show IS-IS MPLS traffic engineering information</help>
+  </properties>
+  <children>
+    <leafNode name="router">
+      <properties>
+        <help>Show router information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="interface">
+      <properties>
+        <help>Show interface information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <tagNode name="interface">
+      <properties>
+        <help>Show specific IS-IS interface</help>
+        <completionHelp>
+          <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </tagNode>
+  </children>
+</node>
+<node name="neighbor">
+  <properties>
+    <help>Show IS-IS neighbor adjacencies</help>
+  </properties>
+  <children>
+    <leafNode name="detail">
+      <properties>
+        <help>Show detailed information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+  <command>vtysh -c "show isis neighbor"</command>
+</node>
+<tagNode name="neighbor">
+  <properties>
+    <help>Show specific IS-IS neighbor adjacency </help>
+    <completionHelp>
+      <list>system-id</list>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="route">
+  <properties>
+    <help>Show IS-IS routing table</help>
+  </properties>
+  <children>
+    <leafNode name="level-1">
+      <properties>
+        <help>Show level-1 routes</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="level-2">
+      <properties>
+        <help>Show level-2 routes</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+  <command>vtysh -c "show isis route"</command>
+</node>
+<node name="segment-routing">
+  <properties>
+    <help>Show IS-IS Segment-Routing (SPRING) information</help>
+  </properties>
+  <children>
+    <leafNode name="node">
+      <properties>
+        <help>Show node information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="prefix-sids">
+      <properties>
+        <help>Show prefix segment IDs</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="spf-delay-ietf">
+  <properties>
+    <help>Show IS-IS SPF delay parameters</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<leafNode name="summary">
+  <properties>
+    <help>Show IS-IS information summary</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<node name="topology">
+  <properties>
+    <help>Show IS-IS paths to Intermediate Systems</help>
+  </properties>
+  <children>
+    <leafNode name="level-1">
+      <properties>
+        <help>Show level-1 routes</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="level-2">
+      <properties>
+        <help>Show level-2 routes</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/show-isis.xml.in b/op-mode-definitions/show-isis.xml.in
index 890d511e2..202e3214b 100644
--- a/op-mode-definitions/show-isis.xml.in
+++ b/op-mode-definitions/show-isis.xml.in
@@ -4,186 +4,22 @@
     <children>
       <node name="isis">
         <properties>
-          <help>IS-IS routing protocol</help>
+          <help>Show IS-IS routing protocol</help>
         </properties>
         <children>
-          <node name="database">
+          #include <include/isis-common.xml.i>
+          <tagNode name="vrf">
             <properties>
-              <help>Show IS-IS link state database</help>
-            </properties>
-            <children>
-              <leafNode name="detail">
-                <properties>
-                  <help>Show detailed information</help>
-                </properties>
-                <command>vtysh -c "show isis database detail"</command>
-              </leafNode>
-            </children>
-            <command>vtysh -c "show isis database"</command>
-          </node>
-          <tagNode name="database">
-            <properties>
-              <help>Show IS-IS link state database PDU</help>
-              <completionHelp>
-                <list>lsp-id detail</list>
-              </completionHelp>
-            </properties>
-            <command>vtysh -c "show isis database $4"</command>
-          </tagNode>
-          <leafNode name="hostname">
-            <properties>
-              <help>Show IS-IS dynamic hostname mapping</help>
-            </properties>
-            <command>vtysh -c "show isis hostname"</command>
-          </leafNode>
-          <node name="interface">
-            <properties>
-              <help>Show IS-IS interfaces</help>
+              <help>Show IS-IS routing protocol for given VRF</help>
               <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py</script>
+                <path>vrf name</path>
+                <list>all</list>
               </completionHelp>
             </properties>
             <children>
-              <leafNode name="detail">
-                <properties>
-                  <help>Show detailed information</help>
-                </properties>
-                <command>vtysh -c "show isis interface detail"</command>
-              </leafNode>
-            </children>
-            <command>vtysh -c "show isis interface"</command>
-          </node>
-          <tagNode name="interface">
-            <properties>
-              <help>Show specific IS-IS interface</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py</script>
-              </completionHelp>
-            </properties>
-            <command>vtysh -c "show isis interface $4"</command>
-          </tagNode>
-          <node name="traffic-engineering">
-            <properties>
-              <help>Show IS-IS MPLS traffic engineering information</help>
-            </properties>
-            <children>
-              <leafNode name="router">
-                <properties>
-                  <help>Show router information</help>
-                </properties>
-                <command>vtysh -c "show isis mpls-te router"</command>
-              </leafNode>
-              <leafNode name="interface">
-                <properties>
-                  <help>Show interface information</help>
-                </properties>
-                <command>vtysh -c "show isis mpls-te interface"</command>
-              </leafNode>
-              <tagNode name="interface">
-                <properties>
-                  <help>Show specific IS-IS interface</help>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py</script>
-                  </completionHelp>
-                </properties>
-                <command>vtysh -c "show isis mpls-te interface $5"</command>
-              </tagNode>
-            </children>
-          </node>
-          <node name="neighbor">
-            <properties>
-              <help>Show IS-IS neighbor adjacencies</help>
-            </properties>
-            <children>
-              <leafNode name="detail">
-                <properties>
-                  <help>Show detailed information</help>
-                </properties>
-                <command>vtysh -c "show isis neighbor detail"</command>
-              </leafNode>
+              #include <include/isis-common.xml.i>
             </children>
-            <command>vtysh -c "show isis neighbor"</command>
-          </node>
-          <tagNode name="neighbor">
-            <properties>
-              <help>Show specific IS-IS neighbor adjacency </help>
-              <completionHelp>
-                <list>system-id</list>
-              </completionHelp>
-            </properties>
-            <command>vtysh -c "show isis neighbor $4"</command>
           </tagNode>
-          <node name="route">
-            <properties>
-              <help>Show IS-IS routing table</help>
-            </properties>
-            <children>
-              <leafNode name="level-1">
-                <properties>
-                  <help>Show level-1 routes</help>
-                </properties>
-                <command>vtysh -c "show isis route level-1"</command>
-              </leafNode>
-              <leafNode name="level-2">
-                <properties>
-                  <help>Show level-2 routes</help>
-                </properties>
-                <command>vtysh -c "show isis route level-2"</command>
-              </leafNode>
-            </children>
-            <command>vtysh -c "show isis route"</command>
-          </node>
-          <node name="segment-routing">
-            <properties>
-              <help>Show IS-IS Segment-Routing (SPRING) information</help>
-            </properties>
-            <children>
-              <leafNode name="node">
-                <properties>
-                  <help>Show node information</help>
-                </properties>
-                <command>vtysh -c "show isis segment-routing node"</command>
-              </leafNode>
-              <leafNode name="prefix-sids">
-                <properties>
-                  <help>Show prefix segment IDs</help>
-                </properties>
-                <command>vtysh -c "show isis segment-routing prefix-sids"</command>
-              </leafNode>
-            </children>
-          </node>
-          <leafNode name="spf-delay">
-            <properties>
-              <help>Show IS-IS SPF delay parameters</help>
-            </properties>
-            <command>vtysh -c "show isis spf-delay-ietf"</command>
-          </leafNode>
-          <leafNode name="summary">
-            <properties>
-              <help>Show IS-IS information summary</help>
-            </properties>
-            <command>vtysh -c "show isis summary"</command>
-          </leafNode>
-          <node name="topology">
-            <properties>
-              <help>Show IS-IS paths to Intermediate Systems</help>
-            </properties>
-            <children>
-              <leafNode name="level-1">
-                <properties>
-                  <help>Show level-1 routes</help>
-                </properties>
-                <command>vtysh -c "show isis topology level-1"</command>
-              </leafNode>
-              <leafNode name="level-2">
-                <properties>
-                  <help>Show level-2 routes</help>
-                </properties>
-                <command>vtysh -c "show isis topology level-2"</command>
-              </leafNode>
-            </children>
-            <command>vtysh -c "show isis topology"</command>
-          </node>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3