op-mode: bgp: T1513: extend "show bgp" command tree

Add the following new commands:
* show bgp mac hash
* show bgp martian next-hop
* show bgp memory
* show bgp next-hop
* show bgp next-hop detail
* show bgp next-hop ip
* show bgp next-hop ip detail
* show bgp statistics
* show bgp statistics-all
* show bgp wide
* show bgp cidr-only
* show bgp cidr-only wide
* show bgp ipv4 wide
* show bgp ipv6 wide

3 files changed, 100 insertions, 2 deletions

diff --git a/op-mode-definitions/include/bgp/afi-common.xml.i b/op-mode-definitions/include/bgp/afi-common.xml.i
index e48482282..7fc59f3b0 100644
--- a/op-mode-definitions/include/bgp/afi-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-common.xml.i
@@ -31,10 +31,25 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </leafNode>
-<leafNode name="summary">
+<node name="summary">
   <properties>
     <help>Summary of BGP neighbor status</help>
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
+  <children>
+    <leafNode name="established">
+      <properties>
+        <help>Show only sessions in Established state</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="failed">
+      <properties>
+        <help>Show only sessions not in Established state</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+</node>
+#include <include/vtysh-generic-wide.xml.i>
 <!-- included end -->
diff --git a/op-mode-definitions/include/vtysh-generic-wide.xml.i b/op-mode-definitions/include/vtysh-generic-wide.xml.i
new file mode 100644
index 000000000..acc68b4c0
--- /dev/null
+++ b/op-mode-definitions/include/vtysh-generic-wide.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from vtysh-generic-wide.xml.i -->
+<leafNode name="wide">
+  <properties>
+    <help>Increase table width for longer prefixes</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/show-bgp.xml.in b/op-mode-definitions/show-bgp.xml.in
index 36e7062df..c33a9dacf 100644
--- a/op-mode-definitions/show-bgp.xml.in
+++ b/op-mode-definitions/show-bgp.xml.in
@@ -8,7 +8,81 @@
         </properties>
         <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
         <children>
+          <node name="cidr-only">
+            <properties>
+              <help>Display only routes with non-natural netmasks</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            <children>
+              #include <include/vtysh-generic-wide.xml.i>
+            </children>
+          </node>
           #include <include/bgp/show-bgp-common.xml.i>
+          <node name="mac">
+            <properties>
+              <help>MAC address</help>
+            </properties>
+            <children>
+              <leafNode name="hash">
+                <properties>
+                  <help>MAC address database</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+              </leafNode>
+            </children>
+          </node>
+          <node name="martian">
+            <properties>
+              <help>martian next-hops</help>
+            </properties>
+            <children>
+              <leafNode name="next-hop">
+                <properties>
+                  <help>martian next-hop database</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="memory">
+            <properties>
+              <help>Global BGP memory statistics</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          </leafNode>
+          <node name="nexthop">
+            <properties>
+              <help>Show BGP nexthop table</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            <children>
+              #include <include/vtysh-generic-detail.xml.i>
+            </children>
+          </node>
+          <tagNode name="nexthop">
+            <properties>
+              <help>IPv4/IPv6 nexthop address</help>
+              <completionHelp>
+                <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
+              </completionHelp>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            <children>
+              #include <include/vtysh-generic-detail.xml.i>
+            </children>
+          </tagNode>
+          <leafNode name="statistics">
+            <properties>
+              <help>BGP RIB advertisement statistics</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          </leafNode>
+          <leafNode name="statistics-all">
+            <properties>
+              <help>Display number of prefixes for all afi/safi</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          </leafNode>
           <leafNode name="vrf">
             <properties>
               <help>Show BGP VRF information</help>
@@ -28,6 +102,7 @@
               #include <include/bgp/show-bgp-common.xml.i>
             </children>
           </tagNode>
+          #include <include/vtysh-generic-wide.xml.i>
         </children>
       </node>
     </children>