op-mode: T3178: add "show ipv6 access-list|ripng" commands

3 files changed, 65 insertions, 28 deletions

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.xml
index 72e441029..be84640eb 100644
--- a/op-mode-definitions/show-ipv6-bgp.xml
+++ b/op-mode-definitions/show-ipv6.xml
@@ -3,24 +3,62 @@
   <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>/usr/bin/vtysh -c "show bgp ipv6"</command>
+            <command>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>
+                <command>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>
+                <command>vtysh -c "show bgp ipv6 regexp $5"</command>
               </tagNode>
               <tagNode name="prefix-list">
                 <properties>
@@ -29,46 +67,46 @@
                     <path>policy prefix-list6</path>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 prefix-list $5"</command>
+                <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>/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>
+                    <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>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5"</command>
+                <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>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 advertised-routes"</command>
+                    <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>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 filtered-routes"</command>
+                    <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>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 dampened-routes"</command>
+                    <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>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 flap-statistics"</command>
+                    <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>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 prefix-counts"</command>
+                    <command>vtysh -c "show bgp ipv6 neighbor $5 prefix-counts"</command>
                   </leafNode>
                   <node name="received">
                     <properties>
@@ -79,7 +117,7 @@
                         <properties>
                           <help>Show prefixlist filter</help>
                         </properties>
-                        <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 received prefix-filter"</command>
+                        <command>vtysh -c "show bgp ipv6 neighbor $5 received prefix-filter"</command>
                       </leafNode>
                     </children>
                   </node>
@@ -87,13 +125,13 @@
                     <properties>
                       <help>Show received routes from BGP neighbor</help>
                     </properties>
-                    <command>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 received-routes"</command>
+                    <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>/usr/bin/vtysh -c "show bgp ipv6 neighbor $5 routes"</command>
+                    <command>vtysh -c "show bgp ipv6 neighbor $5 routes"</command>
                   </leafNode>
                 </children>
               </tagNode>
@@ -101,13 +139,13 @@
                 <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>
+                <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>/usr/bin/vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command>
+                    <command>vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command>
                   </node>
                 </children>
               </tagNode>
@@ -115,13 +153,13 @@
                 <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>
+                <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>/usr/bin/vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command>
+                    <command>vtysh -c "show bgp ipv6 large-community-list $5 exact-match"</command>
                   </node>
                 </children>
               </tagNode>
@@ -129,7 +167,7 @@
                 <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>
+                <command>vtysh -c "show bgp ipv6 filter-list $5"</command>
               </tagNode>
               <tagNode name="community">
                 <properties>
@@ -138,13 +176,13 @@
                     <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>
+                <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>/usr/bin/vtysh -c "show bgp ipv6 community $5 exact-match"</command>
+                    <command>vtysh -c "show bgp ipv6 community $5 exact-match"</command>
                   </node>
                 </children>
               </tagNode>
@@ -152,13 +190,13 @@
                 <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>
+                <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>/usr/bin/vtysh -c "show bgp ipv6 community-list $5 exact-match"</command>
+                    <command>vtysh -c "show bgp ipv6 community-list $5 exact-match"</command>
                   </node>
                 </children>
               </tagNode>
@@ -169,7 +207,7 @@
                     <path>policy route-map</path>
                   </completionHelp>
                 </properties>
-                <command>/usr/bin/vtysh -c "show bgp ipv6 route-map $5"</command>
+                <command>vtysh -c "show bgp ipv6 route-map $5"</command>
               </tagNode>
             </children>
           </node>
@@ -180,7 +218,7 @@
                 <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>
+            <command>vtysh -c "show bgp ipv6 $4"</command>
             <children>
               <node name="longer-prefixes">
                 <properties>
@@ -189,7 +227,7 @@
                     <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>
+                <command>vtysh -c "show bgp ipv6 $4 longer-prefixes"</command>
               </node>
             </children>
           </tagNode>