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

This reverts commit 713de0685f.

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>
This commit is contained in:
Donald Sharp 2017-02-03 10:33:14 -05:00
parent fd420a3275
commit 848ac646bd

View File

@ -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 */