Revert "bgpd: Put back original behavior for some show bgp commands"

This reverts commit 713de0685fc0ef882c97a6cb4bd149620f4dbdf4.

During Discussions with Lou, it was decided that his code
changes would handle this part, and my code changes would
fix up vtysh and bgp to be in sync again.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 641f4f9092fa318af823b5d7882f40f3e48b9aa8..147b12eb0d3632ccb9aa2713254450ed97f4434f 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -10272,7 +10272,7 @@ DEFUN (show_ip_bgp_summary,
        "JavaScript Object Notation\n")
 {
   u_char uj = use_json(argc, argv);
-  return bgp_show_summary_vty (vty, NULL, AFI_IP, SAFI_UNICAST, uj);
+  return bgp_show_summary_vty (vty, NULL, AFI_IP, SAFI_MAX, uj);
 }
 
 DEFUN (show_ip_bgp_instance_summary,
@@ -10368,7 +10368,7 @@ DEFUN (show_bgp_summary,
        "Summary of BGP neighbor status\n"
        "JavaScript Object Notation\n")
 {
-  return bgp_show_summary_vty (vty, NULL, AFI_MAX, SAFI_UNICAST, use_json(argc, argv));
+  return bgp_show_summary_vty (vty, NULL, AFI_MAX, SAFI_MAX, use_json(argc, argv));
 }
 
 DEFUN (show_bgp_instance_summary,
@@ -10380,7 +10380,7 @@ DEFUN (show_bgp_instance_summary,
        "Summary of BGP neighbor status\n"
        "JavaScript Object Notation\n")
 {
-  return bgp_show_summary_vty (vty, argv[1], AFI_MAX, SAFI_UNICAST, use_json(argc, argv));
+  return bgp_show_summary_vty (vty, argv[1], AFI_MAX, SAFI_MAX, use_json(argc, argv));
 }
 
 DEFUN (show_bgp_instance_all_summary,
@@ -10406,7 +10406,7 @@ DEFUN (show_bgp_ipv6_summary,
        "Address family\n"
        "Summary of BGP neighbor status\n")
 {
-  return bgp_show_summary_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, use_json(argc, argv));
+  return bgp_show_summary_vty (vty, NULL, AFI_IP6, SAFI_MAX, use_json(argc, argv));
 }
 
 DEFUN (show_bgp_instance_ipv6__summary,
@@ -10463,7 +10463,7 @@ DEFUN (show_ipv6_bgp_summary,
        "JavaScript Object Notation\n")
 {
   u_char uj = use_json(argc, argv);
-  return bgp_show_summary_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, uj);
+  return bgp_show_summary_vty (vty, NULL, AFI_IP6, SAFI_MAX, uj);
 }
 
 /* old command */