bgpd: fix 'show bgp ipvX vpn rd' command

Signed-off-by: Lou Berger <lberger@labn.net>

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index d390998b128b408eebd1655310eca837823eb0ab..472b9d200a4bca98930065baefb5910d4a111b24 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -374,10 +374,10 @@ DEFUN (show_bgp_ip_vpn_all_rd,
        show_bgp_ip_vpn_all_rd_cmd,
        "show bgp "BGP_AFI_CMD_STR" vpn all [rd ASN:NN_OR_IP-ADDRESS:NN] [json]",
        SHOW_STR
-       IP_STR
        BGP_STR
        BGP_VPNVX_HELP_STR
        "Display VPN NLRI specific information\n"
+       "Display VPN NLRI specific information\n"
        "Display information for a route distinguisher\n"
        "VPN Route Distinguisher\n"
        JSON_STR)
@@ -407,9 +407,21 @@ DEFUN (show_bgp_ip_vpn_all_rd,
        return CMD_SUCCESS;
 }
 
+ALIAS(show_bgp_ip_vpn_all_rd,
+      show_bgp_ip_vpn_rd_cmd,
+       "show bgp "BGP_AFI_CMD_STR" vpn rd ASN:NN_OR_IP-ADDRESS:NN [json]",
+       SHOW_STR
+       BGP_STR
+       BGP_VPNVX_HELP_STR
+       "Display VPN NLRI specific information\n"
+       "Display information for a route distinguisher\n"
+       "VPN Route Distinguisher\n"
+       JSON_STR)
+
+#ifdef KEEP_OLD_VPN_COMMANDS
 DEFUN (show_ip_bgp_vpn_rd,
        show_ip_bgp_vpn_rd_cmd,
-       "show [ip] bgp "BGP_AFI_CMD_STR" vpn rd ASN:NN_OR_IP-ADDRESS:NN",
+       "show ip bgp "BGP_AFI_CMD_STR" vpn rd ASN:NN_OR_IP-ADDRESS:NN",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -436,7 +448,6 @@ DEFUN (show_ip_bgp_vpn_rd,
        return CMD_SUCCESS;
 }
 
-#ifdef KEEP_OLD_VPN_COMMANDS
 DEFUN (show_ip_bgp_vpn_all,
        show_ip_bgp_vpn_all_cmd,
        "show [ip] bgp <vpnv4|vpnv6>",
@@ -794,8 +805,9 @@ void bgp_mplsvpn_init(void)
        install_element(BGP_VPNV6_NODE, &no_vpnv6_network_cmd);
 
        install_element(VIEW_NODE, &show_bgp_ip_vpn_all_rd_cmd);
-       install_element(VIEW_NODE, &show_ip_bgp_vpn_rd_cmd);
+       install_element(VIEW_NODE, &show_bgp_ip_vpn_rd_cmd);
 #ifdef KEEP_OLD_VPN_COMMANDS
+       install_element(VIEW_NODE, &show_ip_bgp_vpn_rd_cmd);
        install_element(VIEW_NODE, &show_ip_bgp_vpn_all_cmd);
        install_element(VIEW_NODE, &show_ip_bgp_vpn_all_tags_cmd);
        install_element(VIEW_NODE, &show_ip_bgp_vpn_rd_tags_cmd);