bgpd: remove support for ipv4|6 encap safi config

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

diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c
index 8764050b16294ba56364afdeb5d3f2009ea1badb..977eb5fd4c3f950f4d97901c8d5965ba952541f3 100644 (file)
--- a/bgpd/bgp_encap.c
+++ b/bgpd/bgp_encap.c
@@ -202,78 +202,6 @@ bgp_nlri_parse_encap(
   return 0;
 }
 
-
-/* TBD: these routes should probably all be host routes */
-
-/* For testing purpose, static route of ENCAP. */
-DEFUN (encap_network,
-       encap_network_cmd,
-       "network A.B.C.D/M rd ASN:nn_or_IP-address:nn",
-       "Specify a network to announce via BGP\n"
-       "IPv4 prefix\n"
-       "Specify Route Distinguisher\n"
-       "ENCAP Route Distinguisher\n")
-{
-  int idx_ipv4 = 1;
-  int idx_rd = 3;
-  return bgp_static_set_safi (AFI_IP, SAFI_ENCAP, vty, argv[idx_ipv4]->arg, argv[idx_rd]->arg, NULL,
-                              NULL, 0, NULL, NULL, NULL, NULL);
-}
-
-/* For testing purpose, static route of ENCAP. */
-DEFUN (no_encap_network,
-       no_encap_network_cmd,
-       "no network A.B.C.D/M rd ASN:nn_or_IP-address:nn",
-       NO_STR
-       "Specify a network to announce via BGP\n"
-       "IPv4 prefix\n"
-       "Specify Route Distinguisher\n"
-       "ENCAP Route Distinguisher\n"
-       "BGP tag\n"
-       "tag value\n")
-{
-  int idx_ipv4 = 2;
-  int idx_rd = 4;
-  return bgp_static_unset_safi (AFI_IP, SAFI_ENCAP, vty, argv[idx_ipv4]->arg, argv[idx_rd]->arg, NULL,
-                                0, NULL, NULL, NULL);
-}
-
-DEFUN (encapv6_network,
-       encapv6_network_cmd,
-       "network X:X::X:X/M rd ASN:nn_or_IP-address:nn [route-map WORD]",
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
-       "Specify Route Distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "route map\n"
-       "route map name\n")
-{
-  int idx_ipv6 = 1;
-  int idx_rd = 3;
-  int idx_rmap = 5;
-  const char *rmap_str = (argc == 6) ? argv[idx_rmap]->arg : NULL;
-  return bgp_static_set_safi (AFI_IP6, SAFI_ENCAP, vty, argv[idx_ipv6]->arg,
-                             argv[idx_rd]->arg, NULL, rmap_str, 0, NULL,
-                             NULL, NULL, NULL);
-}
-
-DEFUN (no_encapv6_network,
-       no_encapv6_network_cmd,
-       "no network X:X::X:X/M rd ASN:nn_or_IP-address:nn [route-map WORD]",
-       NO_STR
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
-       "Specify Route Distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "route map\n"
-       "route map name\n")
-{
-  int idx_ipv6 = 2;
-  int idx_rd = 4;
-  return bgp_static_unset_safi (AFI_IP6, SAFI_ENCAP, vty, argv[idx_ipv6]->arg,
-                             argv[idx_rd]->arg, NULL, 0, NULL, NULL, NULL);
-}
-
 static int
 show_adj_route_encap (struct vty *vty, struct peer *peer, struct prefix_rd *prd)
 {
@@ -792,11 +720,6 @@ DEFUN (show_bgp_ipv6_encap_rd_neighbor_advertised_routes,
 void
 bgp_encap_init (void)
 {
-  install_element (BGP_ENCAP_NODE, &encap_network_cmd);
-  install_element (BGP_ENCAP_NODE, &no_encap_network_cmd);
-  install_element (BGP_ENCAPV6_NODE, &encapv6_network_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_encapv6_network_cmd);
-
   install_element (VIEW_NODE, &show_bgp_ipv4_encap_rd_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv4_encap_tags_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv4_encap_rd_tags_cmd);

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 1372e820f9da819e64922d992db49d15697388fd..4d00fc963fcf53c3177e1ed8913cc8cb774aee87 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -71,7 +71,6 @@ bgp_node_afi (struct vty *vty)
     case BGP_IPV6_NODE:
     case BGP_IPV6M_NODE:
     case BGP_VPNV6_NODE:
-    case BGP_ENCAPV6_NODE:
       afi = AFI_IP6;
       break;
     case BGP_EVPN_NODE:
@@ -92,10 +91,6 @@ bgp_node_safi (struct vty *vty)
   safi_t safi;
   switch (vty->node)
     {
-    case BGP_ENCAP_NODE:
-    case BGP_ENCAPV6_NODE:
-      safi = SAFI_ENCAP;
-      break;
     case BGP_VPNV4_NODE:
     case BGP_VPNV6_NODE:
       safi = SAFI_MPLS_VPN;
@@ -5656,7 +5651,7 @@ DEFUN (no_neighbor_addpath_tx_bestpath_per_as,
 
 DEFUN_NOSH (address_family_ipv4_safi,
        address_family_ipv4_safi_cmd,
-       "address-family ipv4 [<unicast|multicast|vpn|encap>]",
+       "address-family ipv4 [<unicast|multicast|vpn>]",
        "Enter Address Family command mode\n"
        "Address Family\n"
        BGP_SAFI_HELP_STR)
@@ -5669,9 +5664,6 @@ DEFUN_NOSH (address_family_ipv4_safi,
         case SAFI_MULTICAST:
           vty->node = BGP_IPV4M_NODE;
           break;
-        case SAFI_ENCAP:
-          vty->node = BGP_ENCAP_NODE;
-          break;
         case SAFI_MPLS_VPN:
           vty->node = BGP_VPNV4_NODE;
           break;
@@ -5689,7 +5681,7 @@ DEFUN_NOSH (address_family_ipv4_safi,
 
 DEFUN_NOSH (address_family_ipv6_safi,
        address_family_ipv6_safi_cmd,
-       "address-family ipv6 [<unicast|multicast|vpn|encap>]",
+       "address-family ipv6 [<unicast|multicast|vpn>]",
        "Enter Address Family command mode\n"
        "Address Family\n"
        BGP_SAFI_HELP_STR)
@@ -5702,9 +5694,6 @@ DEFUN_NOSH (address_family_ipv6_safi,
         case SAFI_MULTICAST:
           vty->node = BGP_IPV6M_NODE;
           break;
-        case SAFI_ENCAP:
-          vty->node = BGP_ENCAPV6_NODE;
-          break;
         case SAFI_MPLS_VPN:
           vty->node = BGP_VPNV6_NODE;
           break;
@@ -5744,28 +5733,6 @@ DEFUN_NOSH (address_family_vpnv6,
 }
 #endif
 
-DEFUN_NOSH (address_family_encap,
-       address_family_encap_cmd,
-       "address-family <encap|encapv4>",
-       "Enter Address Family command mode\n"
-       "Address Family\n"
-       "Address Family\n")
-{
-  vty->node = BGP_ENCAP_NODE;
-  return CMD_SUCCESS;
-}
-
-
-DEFUN_NOSH (address_family_encapv6,
-       address_family_encapv6_cmd,
-       "address-family encapv6",
-       "Enter Address Family command mode\n"
-       "Address Family\n")
-{
-  vty->node = BGP_ENCAPV6_NODE;
-  return CMD_SUCCESS;
-}
-
 DEFUN_NOSH (address_family_evpn,
        address_family_evpn_cmd,
        "address-family <l2vpn evpn>",
@@ -5789,8 +5756,6 @@ DEFUN_NOSH (exit_address_family,
       || vty->node == BGP_IPV6_NODE
       || vty->node == BGP_IPV6M_NODE
       || vty->node == BGP_VPNV6_NODE
-      || vty->node == BGP_ENCAP_NODE
-      || vty->node == BGP_ENCAPV6_NODE
       || vty->node == BGP_EVPN_NODE)
     vty->node = BGP_NODE;
   return CMD_SUCCESS;
@@ -10094,20 +10059,6 @@ static struct cmd_node bgp_vpnv6_node =
   1
 };
 
-static struct cmd_node bgp_encap_node =
-{
-  BGP_ENCAP_NODE,
-  "%s(config-router-af-encap)# ",
-  1
-};
-
-static struct cmd_node bgp_encapv6_node =
-{
-  BGP_ENCAPV6_NODE,
-  "%s(config-router-af-encapv6)# ",
-  1
-};
-
 static struct cmd_node bgp_evpn_node =
 {
   BGP_EVPN_NODE,
@@ -10128,8 +10079,6 @@ bgp_vty_init (void)
   install_node (&bgp_ipv6_multicast_node, NULL);
   install_node (&bgp_vpnv4_node, NULL);
   install_node (&bgp_vpnv6_node, NULL);
-  install_node (&bgp_encap_node, NULL);
-  install_node (&bgp_encapv6_node, NULL);
   install_node (&bgp_evpn_node, NULL);
 
   /* Install default VTY commands to new nodes.  */
@@ -10140,8 +10089,6 @@ bgp_vty_init (void)
   install_default (BGP_IPV6M_NODE);
   install_default (BGP_VPNV4_NODE);
   install_default (BGP_VPNV6_NODE);
-  install_default (BGP_ENCAP_NODE);
-  install_default (BGP_ENCAPV6_NODE);
   install_default (BGP_EVPN_NODE);
 
   /* "bgp multiple-instance" commands. */
@@ -10354,8 +10301,6 @@ bgp_vty_init (void)
   install_element (BGP_IPV6M_NODE, &neighbor_activate_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_activate_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_activate_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_activate_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_activate_cmd);
   install_element (BGP_EVPN_NODE, &neighbor_activate_cmd);
 
   /* "no neighbor activate" commands. */
@@ -10366,8 +10311,6 @@ bgp_vty_init (void)
   install_element (BGP_IPV6M_NODE, &no_neighbor_activate_cmd);
   install_element (BGP_VPNV4_NODE, &no_neighbor_activate_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_activate_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_activate_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_activate_cmd);
   install_element (BGP_EVPN_NODE, &no_neighbor_activate_cmd);
 
   /* "neighbor peer-group" set commands.
@@ -10383,8 +10326,6 @@ bgp_vty_init (void)
   install_element (BGP_IPV6M_NODE, &neighbor_set_peer_group_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_set_peer_group_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_set_peer_group_cmd);
 
   /* "no neighbor peer-group unset" commands. */
   install_element (BGP_NODE, &no_neighbor_set_peer_group_cmd);
@@ -10394,8 +10335,6 @@ bgp_vty_init (void)
   install_element (BGP_IPV6M_NODE, &no_neighbor_set_peer_group_cmd);
   install_element (BGP_VPNV4_NODE, &no_neighbor_set_peer_group_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_set_peer_group_cmd);
 
   /* "neighbor softreconfiguration inbound" commands.*/
   install_element (BGP_NODE, &neighbor_soft_reconfiguration_cmd);
@@ -10412,10 +10351,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_soft_reconfiguration_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_soft_reconfiguration_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_soft_reconfiguration_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_soft_reconfiguration_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_soft_reconfiguration_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_soft_reconfiguration_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_soft_reconfiguration_cmd);
 
   /* "neighbor attribute-unchanged" commands.  */
   install_element (BGP_NODE, &neighbor_attr_unchanged_cmd);
@@ -10433,12 +10368,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged_cmd);
 
-  install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged_cmd);
-
-  install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged_cmd);
-
   install_element (BGP_EVPN_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_EVPN_NODE, &no_neighbor_attr_unchanged_cmd);
 
@@ -10461,10 +10390,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_nexthop_self_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_nexthop_self_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_nexthop_self_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_nexthop_self_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_nexthop_self_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_nexthop_self_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_nexthop_self_cmd);
 
   /* "neighbor next-hop-self force" commands. */
   install_element (BGP_NODE, &neighbor_nexthop_self_force_cmd);
@@ -10555,10 +10480,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &no_neighbor_remove_private_as_replace_as_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_remove_private_as_all_replace_as_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_remove_private_as_all_replace_as_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_remove_private_as_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_remove_private_as_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_remove_private_as_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_remove_private_as_cmd);
 
   /* "neighbor send-community" commands.*/
   install_element (BGP_NODE, &neighbor_send_community_cmd);
@@ -10589,14 +10510,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &neighbor_send_community_type_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_send_community_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_send_community_type_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_send_community_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_send_community_type_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_send_community_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_send_community_type_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_send_community_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_send_community_type_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_send_community_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_send_community_type_cmd);
 
   /* "neighbor route-reflector" commands.*/
   install_element (BGP_NODE, &neighbor_route_reflector_client_cmd);
@@ -10613,10 +10526,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_route_reflector_client_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_route_reflector_client_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_route_reflector_client_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_route_reflector_client_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_route_reflector_client_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_route_reflector_client_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_route_reflector_client_cmd);
 
   /* "neighbor route-server" commands.*/
   install_element (BGP_NODE, &neighbor_route_server_client_cmd);
@@ -10633,10 +10542,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_route_server_client_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_route_server_client_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_route_server_client_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_route_server_client_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_route_server_client_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_route_server_client_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_route_server_client_cmd);
 
   /* "neighbor addpath-tx-all-paths" commands.*/
   install_element (BGP_NODE, &neighbor_addpath_tx_all_paths_cmd);
@@ -10759,10 +10664,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_weight_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_weight_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_weight_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_weight_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_weight_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_weight_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_weight_cmd);
 
   /* "neighbor override-capability" commands. */
   install_element (BGP_NODE, &neighbor_override_capability_cmd);
@@ -10803,10 +10704,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_distribute_list_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_distribute_list_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_distribute_list_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_distribute_list_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_distribute_list_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_distribute_list_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_distribute_list_cmd);
 
   /* "neighbor prefix-list" commands. */
   install_element (BGP_NODE, &neighbor_prefix_list_cmd);
@@ -10823,10 +10720,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_prefix_list_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_prefix_list_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_prefix_list_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_prefix_list_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_prefix_list_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_prefix_list_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_prefix_list_cmd);
 
   /* "neighbor filter-list" commands. */
   install_element (BGP_NODE, &neighbor_filter_list_cmd);
@@ -10843,10 +10736,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_filter_list_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_filter_list_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_filter_list_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_filter_list_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_filter_list_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_filter_list_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_filter_list_cmd);
 
   /* "neighbor route-map" commands. */
   install_element (BGP_NODE, &neighbor_route_map_cmd);
@@ -10863,10 +10752,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_route_map_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_route_map_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_route_map_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_route_map_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_route_map_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_route_map_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_route_map_cmd);
 
   /* "neighbor unsuppress-map" commands. */
   install_element (BGP_NODE, &neighbor_unsuppress_map_cmd);
@@ -10883,10 +10768,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_unsuppress_map_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_unsuppress_map_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_unsuppress_map_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_unsuppress_map_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_unsuppress_map_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_unsuppress_map_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_unsuppress_map_cmd);
 
   /* "neighbor maximum-prefix" commands. */
   install_element (BGP_NODE, &neighbor_maximum_prefix_cmd);
@@ -10939,22 +10820,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_cmd);
 
-  install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_maximum_prefix_cmd);
-
-  install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_cmd);
-
   /* "neighbor allowas-in" */
   install_element (BGP_NODE, &neighbor_allowas_in_cmd);
   install_element (BGP_NODE, &no_neighbor_allowas_in_cmd);
@@ -10970,10 +10835,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &no_neighbor_allowas_in_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_allowas_in_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_allowas_in_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_allowas_in_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_allowas_in_cmd);
 
   /* address-family commands. */
   install_element (BGP_NODE, &address_family_ipv4_safi_cmd);
@@ -10983,9 +10844,6 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &address_family_vpnv6_cmd);
 #endif /* KEEP_OLD_VPN_COMMANDS */
 
-  install_element (BGP_NODE, &address_family_encap_cmd);
-  install_element (BGP_NODE, &address_family_encapv6_cmd);
-
   install_element (BGP_NODE, &address_family_evpn_cmd);
 
   /* "exit-address-family" command. */
@@ -10995,8 +10853,6 @@ bgp_vty_init (void)
   install_element (BGP_IPV6M_NODE, &exit_address_family_cmd);
   install_element (BGP_VPNV4_NODE, &exit_address_family_cmd);
   install_element (BGP_VPNV6_NODE, &exit_address_family_cmd);
-  install_element (BGP_ENCAP_NODE, &exit_address_family_cmd);
-  install_element (BGP_ENCAPV6_NODE, &exit_address_family_cmd);
   install_element (BGP_EVPN_NODE, &exit_address_family_cmd);
 
   /* "clear ip bgp commands" */