proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 13:27:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: remove code contained by ifdef KEEP_OLD_VPNV4_COMMANDS

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2017-01-12 08:54:22 -05:00
parent ec3484d972
commit 8c90786c95
3 changed files with 0 additions and 826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
bgpd/bgp_route.c
View File

@ -8297,22 +8297,6 @@ ALIAS (show_ip_bgp_ipv4_route,
"Network in the BGP routing table to display\n"
"JavaScript Object Notation\n")
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (show_ip_bgp_vpnv4_all_route,
show_ip_bgp_vpnv4_all_route_cmd,
"show ip bgp vpnv4 all A.B.C.D {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information about all VPNv4 NLRIs\n"
"Network in the BGP routing table to display\n"
"JavaScript Object Notation\n")
{
return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_MPLS_VPN, NULL, 0, BGP_PATH_ALL, use_json(argc, argv));
}
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (show_bgp_ipv4_safi_rd_route,
show_bgp_ipv4_safi_rd_route_cmd,
"show bgp ipv4 (encap|vpn) rd ASN:nn_or_IP-address:nn A.B.C.D {json}",
@ -8432,33 +8416,6 @@ DEFUN (show_bgp_ipv6_safi_rd_prefix,
return bgp_show_route (vty, NULL, argv[2], AFI_IP6, safi, &prd, 1, BGP_PATH_ALL, use_json (argc, argv));
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (show_ip_bgp_vpnv4_rd_route,
show_ip_bgp_vpnv4_rd_route_cmd,
"show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information for a route distinguisher\n"
"VPN Route Distinguisher\n"
"Network in the BGP routing table to display\n"
"JavaScript Object Notation\n")
{
int ret;
struct prefix_rd prd;
u_char uj= use_json(argc, argv);
ret = str2prefix_rd (argv[0], &prd);
if (! ret)
{
vty_out (vty, "%% Malformed Route Distinguisher%s", VTY_NEWLINE);
return CMD_WARNING;
}
return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, uj);
}
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (show_ip_bgp_prefix,
show_ip_bgp_prefix_cmd,
"show ip bgp A.B.C.D/M {json}",
@ -8550,45 +8507,6 @@ ALIAS (show_ip_bgp_ipv4_prefix_pathtype,
"Display only multipaths\n"
"JavaScript Object Notation\n")
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (show_ip_bgp_vpnv4_all_prefix,
show_ip_bgp_vpnv4_all_prefix_cmd,
"show ip bgp vpnv4 all A.B.C.D/M {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information about all VPNv4 NLRIs\n"
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
"JavaScript Object Notation\n")
{
return bgp_show_route (vty, NULL, argv[0], AFI_IP, SAFI_MPLS_VPN, NULL, 1, BGP_PATH_ALL, use_json(argc, argv));
}
DEFUN (show_ip_bgp_vpnv4_rd_prefix,
show_ip_bgp_vpnv4_rd_prefix_cmd,
"show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn A.B.C.D/M {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information for a route distinguisher\n"
"VPN Route Distinguisher\n"
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
"JavaScript Object Notation\n")
{
int ret;
struct prefix_rd prd;
ret = str2prefix_rd (argv[0], &prd);
if (! ret)
{
vty_out (vty, "%% Malformed Route Distinguisher%s", VTY_NEWLINE);
return CMD_WARNING;
}
return bgp_show_route (vty, NULL, argv[1], AFI_IP, SAFI_MPLS_VPN, &prd, 0, BGP_PATH_ALL, use_json(argc, argv));
}
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (show_ip_bgp_view,
show_ip_bgp_instance_cmd,
@ -12248,33 +12166,6 @@ DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts,
return bgp_peer_counts (vty, peer, AFI_IP, safi, uj);
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (show_ip_bgp_vpnv4_neighbor_prefix_counts,
show_ip_bgp_vpnv4_neighbor_prefix_counts_cmd,
"show ip bgp vpnv4 all neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts {json}",
SHOW_STR
IP_STR
BGP_STR
"Address family\n"
BGP_SAFI_HELP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
"Neighbor on bgp configured interface\n"
"Display detailed prefix count information\n"
"JavaScript Object Notation\n")
{
struct peer *peer;
u_char uj = use_json(argc, argv);
peer = peer_lookup_in_view (vty, NULL, argv[0], uj);
if (! peer)
return CMD_WARNING;
return bgp_peer_counts (vty, peer, AFI_IP, SAFI_MPLS_VPN, uj);
}
#endif /* KEEP_OLD_VPNV4_COMMANDS */
static void
show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
int in, const char *rmap_name, u_char use_json, json_object *json)
@ -14784,10 +14675,6 @@ bgp_route_init (void)
install_element (VIEW_NODE, &show_bgp_ipv4_safi_route_pathtype_cmd);
install_element (VIEW_NODE, &show_ip_bgp_ipv4_route_cmd);
install_element (VIEW_NODE, &show_bgp_ipv4_safi_route_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_route_cmd);
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_route_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
install_element (VIEW_NODE, &show_ip_bgp_prefix_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_prefix_cmd);
install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_cmd);
@ -14796,10 +14683,6 @@ bgp_route_init (void)
install_element (VIEW_NODE, &show_bgp_ipv4_safi_prefix_cmd);
install_element (VIEW_NODE, &show_ip_bgp_prefix_pathtype_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_prefix_pathtype_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_prefix_cmd);
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_prefix_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
install_element (VIEW_NODE, &show_ip_bgp_regexp_cmd);
install_element (VIEW_NODE, &show_ip_bgp_ipv4_regexp_cmd);
@ -14904,9 +14787,6 @@ bgp_route_init (void)
install_element (ENABLE_NODE, &show_ip_bgp_neighbor_prefix_counts_cmd);
install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbor_prefix_counts_cmd);
install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_prefix_counts_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_neighbor_prefix_counts_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
#ifdef HAVE_IPV6
install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_prefix_counts_cmd);
install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbor_prefix_counts_cmd);

102
bgpd/bgp_routemap.c
View File

@ -2342,64 +2342,6 @@ struct route_map_rule_cmd route_set_ipv6_nexthop_peer_cmd =
#endif /* HAVE_IPV6 */
#ifdef KEEP_OLD_VPNV4_COMMANDS
/* `set ip vpn nexthop A.B.C.D' */
static route_map_result_t
route_set_vpnv4_nexthop (void *rule, struct prefix *prefix,
route_map_object_t type, void *object)
{
struct in_addr *address;
struct bgp_info *bgp_info;
if (type == RMAP_BGP)
{
/* Fetch routemap's rule information. */
address = rule;
bgp_info = object;
/* Set next hop value. */
(bgp_attr_extra_get (bgp_info->attr))->mp_nexthop_global_in = *address;
(bgp_attr_extra_get (bgp_info->attr))->mp_nexthop_len = 4;
}
return RMAP_OKAY;
}
static void *
route_set_vpnv4_nexthop_compile (const char *arg)
{
int ret;
struct in_addr *address;
address = XMALLOC (MTYPE_ROUTE_MAP_COMPILED, sizeof (struct in_addr));
ret = inet_aton (arg, address);
if (ret == 0)
{
XFREE (MTYPE_ROUTE_MAP_COMPILED, address);
return NULL;
}
return address;
}
static void
route_set_vpnv4_nexthop_free (void *rule)
{
XFREE (MTYPE_ROUTE_MAP_COMPILED, rule);
}
/* Route map commands for ip nexthop set. */
struct route_map_rule_cmd route_set_vpnv4_nexthop_cmd =
{
"ip vpn next-hop",
route_set_vpnv4_nexthop,
route_set_vpnv4_nexthop_compile,
route_set_vpnv4_nexthop_free
};
#endif /* KEEP_OLD_VPNV4_COMMANDS */
/* `set originator-id' */
/* For origin set. */
@ -4501,42 +4443,6 @@ ALIAS (no_set_ipv6_nexthop_local,
"IPv6 address of next hop\n")
#endif /* HAVE_IPV6 */
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (set_vpnv4_nexthop,
set_vpnv4_nexthop_cmd,
"set ip vpn next-hop A.B.C.D",
SET_STR
"IP VPN information\n"
"IP VPN next-hop address\n"
"IP address of next hop\n")
{
return bgp_route_set_add (vty, vty->index, "ip vpn next-hop", argv[0]);
}
DEFUN (no_set_vpnv4_nexthop,
no_set_vpnv4_nexthop_cmd,
"no set ip vpn next-hop",
NO_STR
SET_STR
"IP VPN information\n"
"IP VPN next-hop address\n")
{
if (argc == 0)
return bgp_route_set_delete (vty, vty->index, "ip vpn next-hop", NULL);
return bgp_route_set_delete (vty, vty->index, "ip vpn next-hop", argv[0]);
}
ALIAS (no_set_vpnv4_nexthop,
no_set_vpnv4_nexthop_val_cmd,
"no set ip vpn next-hop A.B.C.D",
NO_STR
SET_STR
"IP VPN information\n"
"IP VPN next-hop address\n"
"IP address of next hop\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (set_originator_id,
set_originator_id_cmd,
"set originator-id A.B.C.D",
@ -4607,9 +4513,6 @@ bgp_route_map_init (void)
route_map_install_set (&route_set_aggregator_as_cmd);
route_map_install_set (&route_set_community_cmd);
route_map_install_set (&route_set_community_delete_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
route_map_install_set (&route_set_vpnv4_nexthop_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
route_map_install_set (&route_set_originator_id_cmd);
route_map_install_set (&route_set_ecommunity_rt_cmd);
route_map_install_set (&route_set_ecommunity_soo_cmd);
@ -4715,11 +4618,6 @@ bgp_route_map_init (void)
install_element (RMAP_NODE, &set_ecommunity_soo_cmd);
install_element (RMAP_NODE, &no_set_ecommunity_soo_cmd);
install_element (RMAP_NODE, &no_set_ecommunity_soo_val_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (RMAP_NODE, &set_vpnv4_nexthop_cmd);
install_element (RMAP_NODE, &no_set_vpnv4_nexthop_cmd);
install_element (RMAP_NODE, &no_set_vpnv4_nexthop_val_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
install_element (RMAP_NODE, &set_originator_id_cmd);
install_element (RMAP_NODE, &no_set_originator_id_cmd);
install_element (RMAP_NODE, &no_set_originator_id_val_cmd);

604
bgpd/bgp_vty.c
View File

@ -6139,15 +6139,6 @@ DEFUN (address_family_vpnv4,
return CMD_SUCCESS;
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
ALIAS (address_family_vpnv4,
address_family_vpnv4_unicast_cmd,
"address-family vpnv4 unicast",
"Enter Address Family command mode\n"
"Address family\n"
"Address Family Modifier\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (address_family_vpnv6,
address_family_vpnv6_cmd,
"address-family vpnv6",
@ -6158,15 +6149,6 @@ DEFUN (address_family_vpnv6,
return CMD_SUCCESS;
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
ALIAS (address_family_vpnv6,
address_family_vpnv6_unicast_cmd,
"address-family vpnv6 unicast",
"Enter Address Family command mode\n"
"Address family\n"
"Address Family Modifier\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (address_family_encap,
address_family_encap_cmd,
"address-family encap",
@ -6734,62 +6716,6 @@ ALIAS (clear_ip_bgp_instance_all_ipv4_soft_out,
BGP_SAFI_HELP_STR
BGP_SOFT_OUT_STR)
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (clear_ip_bgp_all_vpnv4_soft_out,
clear_ip_bgp_all_vpnv4_soft_out_cmd,
"clear ip bgp * vpnv4 unicast soft out",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_STR
BGP_SOFT_OUT_STR)
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_all,
BGP_CLEAR_SOFT_OUT, NULL);
}
ALIAS (clear_ip_bgp_all_vpnv4_soft_out,
clear_ip_bgp_all_vpnv4_out_cmd,
"clear ip bgp * vpnv4 unicast out",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_OUT_STR)
DEFUN (clear_ip_bgp_all_encap_soft_out,
clear_ip_bgp_all_encap_soft_out_cmd,
"clear ip bgp * encap unicast soft out",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig\n"
"Soft reconfig outbound update\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_all,
BGP_CLEAR_SOFT_OUT, NULL);
}
ALIAS (clear_ip_bgp_all_encap_soft_out,
clear_ip_bgp_all_encap_out_cmd,
"clear ip bgp * encap unicast out",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig outbound update\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (clear_bgp_all_soft_out,
clear_bgp_all_soft_out_cmd,
"clear bgp * soft out",
@ -7021,65 +6947,6 @@ ALIAS (clear_ip_bgp_instance_peer_ipv4_soft_out,
BGP_SAFI_HELP_STR
BGP_SOFT_OUT_STR)
#ifdef KEEP_OLD_VPNV4_COMMANDS
/* NOTE: WORD peers have not been tested for vpnv4 */
DEFUN (clear_ip_bgp_peer_vpnv4_soft_out,
clear_ip_bgp_peer_vpnv4_soft_out_cmd,
"clear ip bgp (A.B.C.D|WORD) vpnv4 unicast soft out",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP neighbor on interface to clear\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_STR
BGP_SOFT_OUT_STR)
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_peer,
BGP_CLEAR_SOFT_OUT, argv[0]);
}
ALIAS (clear_ip_bgp_peer_vpnv4_soft_out,
clear_ip_bgp_peer_vpnv4_out_cmd,
"clear ip bgp (A.B.C.D|WORD) vpnv4 unicast out",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP neighbor on interface to clear\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_OUT_STR)
DEFUN (clear_ip_bgp_peer_encap_soft_out,
clear_ip_bgp_peer_encap_soft_out_cmd,
"clear ip bgp A.B.C.D encap unicast soft out",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig\n"
"Soft reconfig outbound update\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_peer,
BGP_CLEAR_SOFT_OUT, argv[0]);
}
ALIAS (clear_ip_bgp_peer_encap_soft_out,
clear_ip_bgp_peer_encap_out_cmd,
"clear ip bgp A.B.C.D encap unicast out",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig outbound update\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (clear_bgp_peer_soft_out,
clear_bgp_peer_soft_out_cmd,
"clear bgp (A.B.C.D|X:X::X:X|WORD) soft out",
@ -7688,62 +7555,6 @@ ALIAS (clear_ip_bgp_instance_as_ipv4_soft_out,
BGP_SAFI_HELP_STR
BGP_SOFT_OUT_STR)
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (clear_ip_bgp_as_vpnv4_soft_out,
clear_ip_bgp_as_vpnv4_soft_out_cmd,
"clear ip bgp " CMD_AS_RANGE " vpnv4 unicast soft out",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family modifier\n"
BGP_SOFT_STR
BGP_SOFT_OUT_STR)
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_as,
BGP_CLEAR_SOFT_OUT, argv[0]);
}
ALIAS (clear_ip_bgp_as_vpnv4_soft_out,
clear_ip_bgp_as_vpnv4_out_cmd,
"clear ip bgp " CMD_AS_RANGE " vpnv4 unicast out",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family modifier\n"
BGP_SOFT_OUT_STR)
DEFUN (clear_ip_bgp_as_encap_soft_out,
clear_ip_bgp_as_encap_soft_out_cmd,
"clear ip bgp " CMD_AS_RANGE " encap unicast soft out",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family modifier\n"
"Soft reconfig\n"
"Soft reconfig outbound update\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_as,
BGP_CLEAR_SOFT_OUT, argv[0]);
}
ALIAS (clear_ip_bgp_as_encap_soft_out,
clear_ip_bgp_as_encap_out_cmd,
"clear ip bgp " CMD_AS_RANGE " encap unicast out",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family modifier\n"
"Soft reconfig outbound update\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (clear_bgp_as_soft_out,
clear_bgp_as_soft_out_cmd,
"clear bgp " CMD_AS_RANGE " soft out",
@ -7973,62 +7784,6 @@ DEFUN (clear_ip_bgp_all_ipv4_in_prefix_filter,
BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (clear_ip_bgp_all_vpnv4_soft_in,
clear_ip_bgp_all_vpnv4_soft_in_cmd,
"clear ip bgp * vpnv4 unicast soft in",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_STR
BGP_SOFT_IN_STR)
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_all,
BGP_CLEAR_SOFT_IN, NULL);
}
ALIAS (clear_ip_bgp_all_vpnv4_soft_in,
clear_ip_bgp_all_vpnv4_in_cmd,
"clear ip bgp * vpnv4 unicast in",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_IN_STR)
DEFUN (clear_ip_bgp_all_encap_soft_in,
clear_ip_bgp_all_encap_soft_in_cmd,
"clear ip bgp * encap unicast soft in",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig\n"
"Soft reconfig inbound update\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_all,
BGP_CLEAR_SOFT_IN, NULL);
}
ALIAS (clear_ip_bgp_all_encap_soft_in,
clear_ip_bgp_all_encap_in_cmd,
"clear ip bgp * encap unicast in",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig inbound update\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (clear_bgp_all_soft_in,
clear_bgp_all_soft_in_cmd,
"clear bgp * soft in",
@ -8286,64 +8041,6 @@ DEFUN (clear_ip_bgp_peer_ipv4_in_prefix_filter,
BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[0]);
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (clear_ip_bgp_peer_vpnv4_soft_in,
clear_ip_bgp_peer_vpnv4_soft_in_cmd,
"clear ip bgp (A.B.C.D|WORD) vpnv4 unicast soft in",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP neighbor on interface to clear\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_STR
BGP_SOFT_IN_STR)
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_peer,
BGP_CLEAR_SOFT_IN, argv[0]);
}
ALIAS (clear_ip_bgp_peer_vpnv4_soft_in,
clear_ip_bgp_peer_vpnv4_in_cmd,
"clear ip bgp (A.B.C.D|WORD) vpnv4 unicast in",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP neighbor on interface to clear\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_IN_STR)
DEFUN (clear_ip_bgp_peer_encap_soft_in,
clear_ip_bgp_peer_encap_soft_in_cmd,
"clear ip bgp A.B.C.D encap unicast soft in",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig\n"
"Soft reconfig inbound update\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_peer,
BGP_CLEAR_SOFT_IN, argv[0]);
}
ALIAS (clear_ip_bgp_peer_encap_soft_in,
clear_ip_bgp_peer_encap_in_cmd,
"clear ip bgp A.B.C.D encap unicast in",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig inbound update\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (clear_bgp_peer_soft_in,
clear_bgp_peer_soft_in_cmd,
"clear bgp (A.B.C.D|X:X::X:X|WORD) soft in",
@ -9125,62 +8822,6 @@ DEFUN (clear_ip_bgp_as_ipv4_in_prefix_filter,
BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[0]);
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (clear_ip_bgp_as_vpnv4_soft_in,
clear_ip_bgp_as_vpnv4_soft_in_cmd,
"clear ip bgp " CMD_AS_RANGE " vpnv4 unicast soft in",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family modifier\n"
BGP_SOFT_STR
BGP_SOFT_IN_STR)
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_as,
BGP_CLEAR_SOFT_IN, argv[0]);
}
ALIAS (clear_ip_bgp_as_vpnv4_soft_in,
clear_ip_bgp_as_vpnv4_in_cmd,
"clear ip bgp " CMD_AS_RANGE " vpnv4 unicast in",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family modifier\n"
BGP_SOFT_IN_STR)
DEFUN (clear_ip_bgp_as_encap_soft_in,
clear_ip_bgp_as_encap_soft_in_cmd,
"clear ip bgp " CMD_AS_RANGE " encap unicast soft in",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family modifier\n"
"Soft reconfig\n"
"Soft reconfig inbound update\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_as,
BGP_CLEAR_SOFT_IN, argv[0]);
}
ALIAS (clear_ip_bgp_as_encap_soft_in,
clear_ip_bgp_as_encap_in_cmd,
"clear ip bgp " CMD_AS_RANGE " encap unicast in",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family modifier\n"
"Soft reconfig inbound update\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (clear_bgp_as_soft_in,
clear_bgp_as_soft_in_cmd,
"clear bgp " CMD_AS_RANGE " soft in",
@ -9354,38 +8995,6 @@ DEFUN (clear_ip_bgp_instance_all_ipv4_soft,
BGP_CLEAR_SOFT_BOTH, NULL);
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (clear_ip_bgp_all_vpnv4_soft,
clear_ip_bgp_all_vpnv4_soft_cmd,
"clear ip bgp * vpnv4 unicast soft",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_STR)
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_all,
BGP_CLEAR_SOFT_BOTH, argv[0]);
}
DEFUN (clear_ip_bgp_all_encap_soft,
clear_ip_bgp_all_encap_soft_cmd,
"clear ip bgp * encap unicast soft",
CLEAR_STR
IP_STR
BGP_STR
"Clear all peers\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_all,
BGP_CLEAR_SOFT_BOTH, argv[0]);
}
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (clear_bgp_all_soft,
clear_bgp_all_soft_cmd,
"clear bgp * soft",
@ -9498,39 +9107,6 @@ DEFUN (clear_ip_bgp_instance_peer_ipv4_soft,
BGP_CLEAR_SOFT_BOTH, argv[2]);
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (clear_ip_bgp_peer_vpnv4_soft,
clear_ip_bgp_peer_vpnv4_soft_cmd,
"clear ip bgp (A.B.C.D|WORD) vpnv4 unicast soft",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP neighbor on interface to clear\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_STR)
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_peer,
BGP_CLEAR_SOFT_BOTH, argv[0]);
}
DEFUN (clear_ip_bgp_peer_encap_soft,
clear_ip_bgp_peer_encap_soft_cmd,
"clear ip bgp A.B.C.D encap unicast soft",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor address to clear\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_peer,
BGP_CLEAR_SOFT_BOTH, argv[0]);
}
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (clear_bgp_peer_soft,
clear_bgp_peer_soft_cmd,
"clear bgp (A.B.C.D|X:X::X:X|WORD) soft",
@ -9867,38 +9443,6 @@ DEFUN (clear_ip_bgp_instance_as_ipv4_soft,
BGP_CLEAR_SOFT_BOTH, argv[2]);
}
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (clear_ip_bgp_as_vpnv4_soft,
clear_ip_bgp_as_vpnv4_soft_cmd,
"clear ip bgp " CMD_AS_RANGE " vpnv4 unicast soft",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family Modifier\n"
BGP_SOFT_STR)
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_as,
BGP_CLEAR_SOFT_BOTH, argv[0]);
}
DEFUN (clear_ip_bgp_as_encap_soft,
clear_ip_bgp_as_encap_soft_cmd,
"clear ip bgp " CMD_AS_RANGE " encap unicast soft",
CLEAR_STR
IP_STR
BGP_STR
"Clear peers with the AS number\n"
"Address family\n"
"Address Family Modifier\n"
"Soft reconfig\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_as,
BGP_CLEAR_SOFT_BOTH, argv[0]);
}
#endif /* KEEP_OLD_VPNV4_COMMANDS */
DEFUN (clear_bgp_as_soft,
clear_bgp_as_soft_cmd,
"clear bgp " CMD_AS_RANGE " soft",
@ -10805,49 +10349,6 @@ ALIAS (show_ip_bgp_instance_ipv4_summary,
BGP_AFI_SAFI_HELP_STR
"Summary of BGP neighbor status\n")
#ifdef KEEP_OLD_VPNV4_COMMANDS
DEFUN (show_ip_bgp_vpnv4_all_summary,
show_ip_bgp_vpnv4_all_summary_cmd,
"show ip bgp vpnv4 all summary {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information about all VPNv4 NLRIs\n"
"Summary of BGP neighbor status\n"
"JavaScript Object Notation\n")
{
u_char uj = use_json(argc, argv);
return bgp_show_summary_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, uj);
}
DEFUN (show_ip_bgp_vpnv4_rd_summary,
show_ip_bgp_vpnv4_rd_summary_cmd,
"show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn summary {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information for a route distinguisher\n"
"VPN Route Distinguisher\n"
"Summary of BGP neighbor status\n"
"JavaScript Object Notation\n")
{
int ret;
struct prefix_rd prd;
u_char uj = use_json(argc, argv);
ret = str2prefix_rd (argv[0], &prd);
if (! ret)
{
vty_out (vty, "%% Malformed Route Distinguisher%s", VTY_NEWLINE);
return CMD_WARNING;
}
return bgp_show_summary_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, uj);
}
#endif /* KEEP_OLD_VPNV4_COMMANDS */
#ifdef HAVE_IPV6
DEFUN (show_bgp_summary,
show_bgp_summary_cmd,
@ -12845,31 +12346,6 @@ ALIAS (show_ip_bgp_neighbors,
"Detailed information on TCP and BGP neighbor connections\n"
"JavaScript Object Notation\n")
#ifdef KEEP_OLD_VPNV4_COMMANDS
ALIAS (show_ip_bgp_neighbors,
show_ip_bgp_vpnv4_all_neighbors_cmd,
"show ip bgp vpnv4 all neighbors {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information about all VPNv4 NLRIs\n"
"Detailed information on TCP and BGP neighbor connections\n"
"JavaScript Object Notation\n")
ALIAS (show_ip_bgp_neighbors,
show_ip_bgp_vpnv4_rd_neighbors_cmd,
"show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information for a route distinguisher\n"
"VPN Route Distinguisher\n"
"Detailed information on TCP and BGP neighbor connections\n"
"JavaScript Object Notation\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
ALIAS (show_ip_bgp_neighbors,
show_bgp_neighbors_cmd,
"show bgp neighbors {json}",
@ -12918,32 +12394,6 @@ ALIAS (show_ip_bgp_neighbors_peer,
"Neighbor on bgp configured interface\n"
"JavaScript Object Notation\n")
#ifdef KEEP_OLD_VPNV4_COMMANDS
ALIAS (show_ip_bgp_neighbors_peer,
show_ip_bgp_vpnv4_all_neighbors_peer_cmd,
"show ip bgp vpnv4 all neighbors A.B.C.D {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information about all VPNv4 NLRIs\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"JavaScript Object Notation\n")
ALIAS (show_ip_bgp_neighbors_peer,
show_ip_bgp_vpnv4_rd_neighbors_peer_cmd,
"show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D {json}",
SHOW_STR
IP_STR
BGP_STR
"Display VPNv4 NLRI specific information\n"
"Display information about all VPNv4 NLRIs\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"JavaScript Object Notation\n")
#endif /* KEEP_OLD_VPNV4_COMMANDS */
ALIAS (show_ip_bgp_neighbors_peer,
show_bgp_neighbors_peer_cmd,
"show bgp neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
@ -15645,15 +15095,7 @@ bgp_vty_init (void)
install_element (BGP_NODE, &address_family_ipv6_safi_cmd);
#endif /* HAVE_IPV6 */
install_element (BGP_NODE, &address_family_vpnv4_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (BGP_NODE, &address_family_vpnv4_unicast_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
install_element (BGP_NODE, &address_family_vpnv6_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (BGP_NODE, &address_family_vpnv6_unicast_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
install_element (BGP_NODE, &address_family_encap_cmd);
install_element (BGP_NODE, &address_family_encapv4_cmd);
#ifdef HAVE_IPV6
@ -15754,20 +15196,6 @@ bgp_vty_init (void)
install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_ipv4_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_in_prefix_filter_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_soft_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_all_encap_soft_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_all_encap_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_soft_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_soft_in_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_in_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
install_element (ENABLE_NODE, &clear_bgp_all_soft_in_cmd);
install_element (ENABLE_NODE, &clear_bgp_instance_all_soft_in_cmd);
install_element (ENABLE_NODE, &clear_bgp_all_in_cmd);
@ -15866,20 +15294,6 @@ bgp_vty_init (void)
install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_ipv4_soft_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_ipv4_out_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_soft_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_all_encap_soft_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_all_encap_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_soft_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_soft_out_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_out_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
install_element (ENABLE_NODE, &clear_bgp_all_soft_out_cmd);
install_element (ENABLE_NODE, &clear_bgp_instance_all_soft_out_cmd);
install_element (ENABLE_NODE, &clear_bgp_all_out_cmd);
@ -15942,14 +15356,6 @@ bgp_vty_init (void)
install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_ipv4_soft_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_soft_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_ipv4_soft_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_soft_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_all_encap_soft_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_soft_cmd);
install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_soft_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
install_element (ENABLE_NODE, &clear_bgp_all_soft_cmd);
install_element (ENABLE_NODE, &clear_bgp_instance_all_soft_cmd);
install_element (ENABLE_NODE, &clear_bgp_peer_soft_cmd);
@ -16001,10 +15407,6 @@ bgp_vty_init (void)
install_element (VIEW_NODE, &show_bgp_ipv4_safi_summary_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_ipv4_summary_cmd);
install_element (VIEW_NODE, &show_bgp_instance_ipv4_safi_summary_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_summary_cmd);
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
#ifdef HAVE_IPV6
install_element (VIEW_NODE, &show_bgp_summary_cmd);
install_element (VIEW_NODE, &show_bgp_instance_summary_cmd);
@ -16020,12 +15422,6 @@ bgp_vty_init (void)
install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbors_cmd);
install_element (VIEW_NODE, &show_ip_bgp_neighbors_peer_cmd);
install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbors_peer_cmd);
#ifdef KEEP_OLD_VPNV4_COMMANDS
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbors_cmd);
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbors_cmd);
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbors_peer_cmd);
install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd);
#endif /* KEEP_OLD_VPNV4_COMMANDS */
install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_all_neighbors_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_peer_cmd);