From ee41ead1a8946a7b1c6b4fe6a7d65112493f626e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 2 Jan 2021 18:15:23 +0000
Subject: op-mode: T3178: add "show ipv6 access-list|ripng" commands

---
 Makefile                              |   1 -
 op-mode-definitions/clear-ipv6.xml    |   2 +-
 op-mode-definitions/show-ipv6-bgp.xml | 200 ----------------------------
 op-mode-definitions/show-ipv6.xml     | 238 ++++++++++++++++++++++++++++++++++
 4 files changed, 239 insertions(+), 202 deletions(-)
 delete mode 100644 op-mode-definitions/show-ipv6-bgp.xml
 create mode 100644 op-mode-definitions/show-ipv6.xml

diff --git a/Makefile b/Makefile
index 4574e2ea3..3d6a9eb40 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,6 @@ op_mode_definitions:
 	rm -f $(OP_TMPL_DIR)/set/node.def
 	rm -f $(OP_TMPL_DIR)/show/node.def
 	rm -f $(OP_TMPL_DIR)/show/interfaces/node.def
-	rm -f $(OP_TMPL_DIR)/show/ipv6/node.def
 	rm -f $(OP_TMPL_DIR)/show/ipv6/route/node.def
 	rm -f $(OP_TMPL_DIR)/monitor/node.def
 	rm -f $(OP_TMPL_DIR)/generate/node.def
diff --git a/op-mode-definitions/clear-ipv6.xml b/op-mode-definitions/clear-ipv6.xml
index f26ab4046..c062102fc 100644
--- a/op-mode-definitions/clear-ipv6.xml
+++ b/op-mode-definitions/clear-ipv6.xml
@@ -17,7 +17,7 @@
             <properties>
               <help>Clear prefix-list statistics or status for specified word</help>
               <completionHelp>
-                <list>&lt;WORD&gt;</list>
+                <list>WORD</list>
               </completionHelp>
             </properties>
             <command>vtysh -c "$*"</command>
diff --git a/op-mode-definitions/show-ipv6-bgp.xml b/op-mode-definitions/show-ipv6-bgp.xml
deleted file mode 100644
index 72e441029..000000000
--- a/op-mode-definitions/show-ipv6-bgp.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="show">
-    <children>
-      <node name="ipv6">
-        <children>
-          <node name="bgp">
-            <properties>
-              <help>Show Border Gateway Protocol (BGP) information</help>
-            </properties>
-            <command>/usr/bin/vtysh -c "show bgp ipv6"</command>
-            <children>
-              <leafNode name="summary">
-                <properties>
-                  <help>Show summary of BGP neighbor status</help>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 summary"</command>
-              </leafNode>
-              <tagNode name="regexp">
-                <properties>
-                  <help>Show routes matching AS path regular expression</help>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 regexp $5"</command>
-              </tagNode>
-              <tagNode name="prefix-list">
-                <properties>
-                  <help>Show routes matching the IPv6 prefix-list name</help>
-                  <completionHelp>
-                    <path>policy prefix-list6</path>
-                  </completionHelp>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 prefix-list $5"</command>
-              </tagNode>
-              <tagNode name="neighbors">
-                <properties>
-                  <help>Show detailed information on TCP and BGP neighbor connections for given address</help>
-                  <completionHelp>
-                    <script>/usr/bin/vtysh -c "show bgp ipv6 summary" | awk '{print $1}' | grep -oE "\b([0-9a-f]{1,4}\:{0,2}){0,20}\b"</script>
-                  </completionHelp>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5"</command>
-                <children>
-                  <leafNode name="advertised-routes">
-                    <properties>
-                      <help>Show routes advertised to a BGP neighbor</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 advertised-routes"</command>
-                  </leafNode>
-                  <leafNode name="filtered-routes">
-                    <properties>
-                      <help>Show routes filtered from a BGP neighbor</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 filtered-routes"</command>
-                  </leafNode>
-                  <leafNode name="dampened-routes">
-                    <properties>
-                      <help>Show dampened routes received from BGP neighbor</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 dampened-routes"</command>
-                  </leafNode>
-                  <leafNode name="flap-statistics">
-                    <properties>
-                      <help>Show flap statistics of the routes learned from BGP neighbor</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 flap-statistics"</command>
-                  </leafNode>
-                  <leafNode name="prefix-counts">
-                    <properties>
-                      <help>Show detailed prefix count information for BGP neighbor</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 prefix-counts"</command>
-                  </leafNode>
-                  <node name="received">
-                    <properties>
-                      <help>Show information received from BGP neighbor</help>
-                    </properties>
-                    <children>
-                      <leafNode name="prefix-filter">
-                        <properties>
-                          <help>Show prefixlist filter</help>
-                        </properties>
-                        <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 received prefix-filter"</command>
-                      </leafNode>
-                    </children>
-                  </node>
-                  <leafNode name="received-routes">
-                    <properties>
-                      <help>Show received routes from BGP neighbor</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 received-routes"</command>
-                  </leafNode>
-                  <leafNode name="routes">
-                    <properties>
-                      <help>Show routes learned from BGP neighbor</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 routes"</command>
-                  </leafNode>
-                </children>
-              </tagNode>
-              <tagNode name="large-community">
-                <properties>
-                  <help>Show routes matching the large-community-list number or name</help>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 large-community-list $5"</command>
-                <children>
-                  <node name="exact-match">
-                    <properties>
-                      <help>Show routes matching the large-community-list number or name</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command>
-                  </node>
-                </children>
-              </tagNode>
-              <tagNode name="large-community-list">
-                <properties>
-                  <help>Show routes matching the large-community-list number or name</help>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 large-community-list $5"</command>
-                <children>
-                  <node name="exact-match">
-                    <properties>
-                      <help>Show routes matching the large-community-list number or name</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command>
-                  </node>
-                </children>
-              </tagNode>
-              <tagNode name="filter-list">
-                <properties>
-                  <help>Show routes conforming to regular expression access list name</help>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 filter-list $5"</command>
-              </tagNode>
-              <tagNode name="community">
-                <properties>
-                  <help>Show BGP information for specified community number</help>
-                  <completionHelp>
-                    <list>&lt;AA:NN&gt; local-AS no-advertise no-export</list>
-                  </completionHelp>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 community $5"</command>
-                <children>
-                  <node name="exact-match">
-                    <properties>
-                      <help>Show routes from community that exactly matches the community number</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 community $5 exact-match"</command>
-                  </node>
-                </children>
-              </tagNode>
-              <tagNode name="community-list">
-                <properties>
-                  <help>Show routes matching the community-list number or name</help>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 community-list $5"</command>
-                <children>
-                  <node name="exact-match">
-                    <properties>
-                      <help>Show routes exactly matching the community-list name or number</help>
-                    </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 community-list $5 exact-match"</command>
-                  </node>
-                </children>
-              </tagNode>
-              <tagNode name="route-map">
-                <properties>
-                  <help>Show BGP routes matching the specified route map</help>
-                  <completionHelp>
-                    <path>policy route-map</path>
-                  </completionHelp>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 route-map $5"</command>
-              </tagNode>
-            </children>
-          </node>
-          <tagNode name="bgp">
-            <properties>
-              <help>Show BGP information for specified IP address or prefix</help>
-              <completionHelp>
-                <list>&lt;X:X::X:X&gt; &lt;X:X::X:X/x&gt;</list>
-              </completionHelp>
-            </properties>
-            <command>/usr/bin/vtysh -c "show bgp ipv6 $4"</command>
-            <children>
-              <node name="longer-prefixes">
-                <properties>
-                  <help>Show route and more specific routes</help>
-                  <completionHelp>
-                    <list>&lt;X:X::X:X&gt; &lt;X:X::X:X/x&gt;</list>
-                  </completionHelp>
-                </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 $4 longer-prefixes"</command>
-              </node>
-            </children>
-          </tagNode>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/show-ipv6.xml b/op-mode-definitions/show-ipv6.xml
new file mode 100644
index 000000000..be84640eb
--- /dev/null
+++ b/op-mode-definitions/show-ipv6.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="ipv6">
+        <properties>
+          <help>Show IPv6 routing information</help>
+        </properties>
+        <children>
+          <node name="access-list">
+            <properties>
+              <help>Show all IPv6 access-lists</help>
+            </properties>
+            <command>vtysh -c "show ipv6 access-list"</command>
+          </node>
+          <tagNode name="access-list">
+            <properties>
+              <help>Show specified IPv6 access-list</help>
+              <completionHelp>
+                <list>WORD</list>
+              </completionHelp>
+            </properties>
+            <command>vtysh -c "show ipv6 access-list $4"</command>
+          </tagNode>
+          <node name="forwarding">
+            <properties>
+              <help>Show IPv6 forwarding status</help>
+            </properties>
+            <command>vtysh -c "show ipv6 forwarding"</command>
+          </node>
+          <node name="ripng">
+            <properties>
+              <help>Show RIPNG protocol information</help>
+            </properties>
+            <command>vtysh -c "show ipv6 ripng"</command>
+            <children>
+              <node name="status">
+                <properties>
+                  <help>Show RIPNG protocol status</help>
+                </properties>
+                <command>vtysh -c "show ipv6 ripng status"</command>
+              </node>
+            </children>
+          </node>
+          <node name="bgp">
+            <properties>
+              <help>Show Border Gateway Protocol (BGP) information</help>
+            </properties>
+            <command>vtysh -c "show bgp ipv6"</command>
+            <children>
+              <leafNode name="summary">
+                <properties>
+                  <help>Show summary of BGP neighbor status</help>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 summary"</command>
+              </leafNode>
+              <tagNode name="regexp">
+                <properties>
+                  <help>Show routes matching AS path regular expression</help>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 regexp $5"</command>
+              </tagNode>
+              <tagNode name="prefix-list">
+                <properties>
+                  <help>Show routes matching the IPv6 prefix-list name</help>
+                  <completionHelp>
+                    <path>policy prefix-list6</path>
+                  </completionHelp>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 prefix-list $5"</command>
+              </tagNode>
+              <tagNode name="neighbors">
+                <properties>
+                  <help>Show detailed information on TCP and BGP neighbor connections for given address</help>
+                  <completionHelp>
+                    <script>vtysh -c "show bgp ipv6 summary" | awk '{print $1}' | grep -oE "\b([0-9a-f]{1,4}\:{0,2}){0,20}\b"</script>
+                  </completionHelp>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 neighbor $5"</command>
+                <children>
+                  <leafNode name="advertised-routes">
+                    <properties>
+                      <help>Show routes advertised to a BGP neighbor</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 neighbor $5 advertised-routes"</command>
+                  </leafNode>
+                  <leafNode name="filtered-routes">
+                    <properties>
+                      <help>Show routes filtered from a BGP neighbor</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 neighbor $5 filtered-routes"</command>
+                  </leafNode>
+                  <leafNode name="dampened-routes">
+                    <properties>
+                      <help>Show dampened routes received from BGP neighbor</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 neighbor $5 dampened-routes"</command>
+                  </leafNode>
+                  <leafNode name="flap-statistics">
+                    <properties>
+                      <help>Show flap statistics of the routes learned from BGP neighbor</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 neighbor $5 flap-statistics"</command>
+                  </leafNode>
+                  <leafNode name="prefix-counts">
+                    <properties>
+                      <help>Show detailed prefix count information for BGP neighbor</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 neighbor $5 prefix-counts"</command>
+                  </leafNode>
+                  <node name="received">
+                    <properties>
+                      <help>Show information received from BGP neighbor</help>
+                    </properties>
+                    <children>
+                      <leafNode name="prefix-filter">
+                        <properties>
+                          <help>Show prefixlist filter</help>
+                        </properties>
+                        <command>vtysh -c "show bgp ipv6 neighbor $5 received prefix-filter"</command>
+                      </leafNode>
+                    </children>
+                  </node>
+                  <leafNode name="received-routes">
+                    <properties>
+                      <help>Show received routes from BGP neighbor</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 neighbor $5 received-routes"</command>
+                  </leafNode>
+                  <leafNode name="routes">
+                    <properties>
+                      <help>Show routes learned from BGP neighbor</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 neighbor $5 routes"</command>
+                  </leafNode>
+                </children>
+              </tagNode>
+              <tagNode name="large-community">
+                <properties>
+                  <help>Show routes matching the large-community-list number or name</help>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 large-community-list $5"</command>
+                <children>
+                  <node name="exact-match">
+                    <properties>
+                      <help>Show routes matching the large-community-list number or name</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command>
+                  </node>
+                </children>
+              </tagNode>
+              <tagNode name="large-community-list">
+                <properties>
+                  <help>Show routes matching the large-community-list number or name</help>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 large-community-list $5"</command>
+                <children>
+                  <node name="exact-match">
+                    <properties>
+                      <help>Show routes matching the large-community-list number or name</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command>
+                  </node>
+                </children>
+              </tagNode>
+              <tagNode name="filter-list">
+                <properties>
+                  <help>Show routes conforming to regular expression access list name</help>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 filter-list $5"</command>
+              </tagNode>
+              <tagNode name="community">
+                <properties>
+                  <help>Show BGP information for specified community number</help>
+                  <completionHelp>
+                    <list>&lt;AA:NN&gt; local-AS no-advertise no-export</list>
+                  </completionHelp>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 community $5"</command>
+                <children>
+                  <node name="exact-match">
+                    <properties>
+                      <help>Show routes from community that exactly matches the community number</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 community $5 exact-match"</command>
+                  </node>
+                </children>
+              </tagNode>
+              <tagNode name="community-list">
+                <properties>
+                  <help>Show routes matching the community-list number or name</help>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 community-list $5"</command>
+                <children>
+                  <node name="exact-match">
+                    <properties>
+                      <help>Show routes exactly matching the community-list name or number</help>
+                    </properties>
+                    <command>vtysh -c "show bgp ipv6 community-list $5 exact-match"</command>
+                  </node>
+                </children>
+              </tagNode>
+              <tagNode name="route-map">
+                <properties>
+                  <help>Show BGP routes matching the specified route map</help>
+                  <completionHelp>
+                    <path>policy route-map</path>
+                  </completionHelp>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 route-map $5"</command>
+              </tagNode>
+            </children>
+          </node>
+          <tagNode name="bgp">
+            <properties>
+              <help>Show BGP information for specified IP address or prefix</help>
+              <completionHelp>
+                <list>&lt;X:X::X:X&gt; &lt;X:X::X:X/x&gt;</list>
+              </completionHelp>
+            </properties>
+            <command>vtysh -c "show bgp ipv6 $4"</command>
+            <children>
+              <node name="longer-prefixes">
+                <properties>
+                  <help>Show route and more specific routes</help>
+                  <completionHelp>
+                    <list>&lt;X:X::X:X&gt; &lt;X:X::X:X/x&gt;</list>
+                  </completionHelp>
+                </properties>
+                <command>vtysh -c "show bgp ipv6 $4 longer-prefixes"</command>
+              </node>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
-- 
cgit v1.2.3