bgpd: conditionally compile out old vpnv4 syntax (Issue #61)

      (under ifdef KEEP_OLD_VPNV4_COMMANDS)

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

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index d55acdd5129bc0320d2515b73a67bb4deaefbf19..02febf86308f57ec554bbf942e2b52d22c003106 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -198,7 +198,7 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr,
 
       if (prefixlen < VPN_PREFIXLEN_MIN_BYTES*8)
        {
-         zlog_err ("%s [Error] Update packet error / VPNv4 (prefix length %d less than VPNv4 min length)",
+         zlog_err ("%s [Error] Update packet error / VPN (prefix length %d less than VPN min length)",
                    peer->host, prefixlen);
          return -1;
        }
@@ -206,7 +206,7 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr,
       /* sanity check against packet data */
       if ((pnt + psize) > lim)
         {
-          zlog_err ("%s [Error] Update packet error / VPNv4 (prefix length %d exceeds packet size %u)",
+          zlog_err ("%s [Error] Update packet error / VPN (prefix length %d exceeds packet size %u)",
                     peer->host,
                     prefixlen, (uint)(lim-pnt));
           return -1;
@@ -215,7 +215,7 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr,
       /* sanity check against storage for the IP address portion */
       if ((psize - VPN_PREFIXLEN_MIN_BYTES) > (ssize_t) sizeof(p.u))
         {
-          zlog_err ("%s [Error] Update packet error / VPNv4 (psize %d exceeds storage size %zu)",
+          zlog_err ("%s [Error] Update packet error / VPN (psize %d exceeds storage size %zu)",
                     peer->host,
                     prefixlen - VPN_PREFIXLEN_MIN_BYTES*8, sizeof(p.u));
           return -1;
@@ -224,7 +224,7 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr,
       /* Sanity check against max bitlen of the address family */
       if ((psize - VPN_PREFIXLEN_MIN_BYTES) > prefix_blen (&p))
         {
-          zlog_err ("%s [Error] Update packet error / VPNv4 (psize %d exceeds family (%u) max byte len %u)",
+          zlog_err ("%s [Error] Update packet error / VPN (psize %d exceeds family (%u) max byte len %u)",
                     peer->host,
                     prefixlen - VPN_PREFIXLEN_MIN_BYTES*8, 
                     p.family, prefix_blen (&p));
@@ -295,7 +295,7 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr,
   /* Packet length consistency check. */
   if (pnt != lim)
     {
-      zlog_err ("%s [Error] Update packet error / VPNv4 (%zu data remaining after parsing)",
+      zlog_err ("%s [Error] Update packet error / VPN (%zu data remaining after parsing)",
                 peer->host, lim - pnt);
       return -1;
     }
@@ -484,6 +484,7 @@ DEFUN (no_vpnv4_network,
   return bgp_static_unset_safi (SAFI_MPLS_VPN, vty, argv[0], argv[1], argv[2]);
 }
 
+#ifdef KEEP_OLD_VPNV4_COMMANDS
 static int
 show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd, u_char use_json)
 {
@@ -650,6 +651,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd, u
     }
   return CMD_SUCCESS;
 }
+#endif  /* KEEP_OLD_VPNV4_COMMANDS */
 
 enum bgp_show_type
 {
@@ -954,6 +956,7 @@ DEFUN (show_bgp_ipv6_vpn_rd,
   return bgp_show_mpls_vpn (vty, AFI_IP6, &prd, bgp_show_type_normal, NULL, 0, use_json (argc, argv));
 }
 
+#ifdef KEEP_OLD_VPNV4_COMMANDS
 DEFUN (show_ip_bgp_vpnv4_all,
        show_ip_bgp_vpnv4_all_cmd,
        "show ip bgp vpnv4 all",
@@ -1269,6 +1272,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_neighbor_advertised_routes,
 
   return show_adj_route_vpn (vty, peer, &prd, uj);
 }
+#endif  /* KEEP_OLD_VPNV4_COMMANDS */
 
 void
 bgp_mplsvpn_init (void)
@@ -1281,6 +1285,7 @@ bgp_mplsvpn_init (void)
   install_element (VIEW_NODE, &show_bgp_ipv4_vpn_rd_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_vpn_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_vpn_rd_cmd);
+#ifdef KEEP_OLD_VPNV4_COMMANDS
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_tags_cmd);
@@ -1289,4 +1294,6 @@ bgp_mplsvpn_init (void)
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbor_routes_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbor_advertised_routes_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbor_advertised_routes_cmd);
+#endif  /* KEEP_OLD_VPNV4_COMMANDS */
+
 }

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index e31c745e56f8a38e56b87ef4d5b312def444dd09..2320c08b1fdd2306abe44ac9c01a622e610b1626 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -8297,6 +8297,7 @@ 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}",
@@ -8310,6 +8311,7 @@ DEFUN (show_ip_bgp_vpnv4_all_route,
 {
   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,
@@ -8430,6 +8432,7 @@ 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}",
@@ -8454,6 +8457,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_route,
     }
   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,
@@ -8546,6 +8550,7 @@ 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}",
@@ -8583,6 +8588,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_prefix,
     }
   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,
@@ -12242,6 +12248,7 @@ 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}",
@@ -12266,6 +12273,7 @@ DEFUN (show_ip_bgp_vpnv4_neighbor_prefix_counts,
   
   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,
@@ -14776,8 +14784,10 @@ 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);
@@ -14786,8 +14796,10 @@ 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);
@@ -14892,7 +14904,9 @@ 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);

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index ea42cb57c98084e94458584630b6a1e4a0f00535..61435ce2074b39734f66579d13e4365566bca718 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -2342,8 +2342,8 @@ struct route_map_rule_cmd route_set_ipv6_nexthop_peer_cmd =
 
 #endif /* HAVE_IPV6 */
 
-/* `set vpnv4 nexthop A.B.C.D' */
-
+#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)
@@ -2393,11 +2393,12 @@ route_set_vpnv4_nexthop_free (void *rule)
 /* Route map commands for ip nexthop set. */
 struct route_map_rule_cmd route_set_vpnv4_nexthop_cmd =
 {
-  "vpnv4 next-hop",
+  "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' */
 
@@ -4500,39 +4501,41 @@ 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 vpnv4 next-hop A.B.C.D",
+       "set ip vpn next-hop A.B.C.D",
        SET_STR
-       "VPNv4 information\n"
-       "VPNv4 next-hop address\n"
+       "IP VPN information\n"
+       "IP VPN next-hop address\n"
        "IP address of next hop\n")
 {
-  return bgp_route_set_add (vty, vty->index, "vpnv4 next-hop", argv[0]);
+  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 vpnv4 next-hop",
+       "no set ip vpn next-hop",
        NO_STR
        SET_STR
-       "VPNv4 information\n"
-       "VPNv4 next-hop address\n")
+       "IP VPN information\n"
+       "IP VPN next-hop address\n")
 {
   if (argc == 0)
-    return bgp_route_set_delete (vty, vty->index, "vpnv4 next-hop", NULL);
+    return bgp_route_set_delete (vty, vty->index, "ip vpn next-hop", NULL);
 
-  return bgp_route_set_delete (vty, vty->index, "vpnv4 next-hop", argv[0]);
+  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 vpnv4 next-hop A.B.C.D",
+       "no set ip vpn next-hop A.B.C.D",
        NO_STR
        SET_STR
-       "VPNv4 information\n"
-       "VPNv4 next-hop address\n"
+       "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,
@@ -4604,7 +4607,9 @@ 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);
@@ -4710,9 +4715,11 @@ 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);

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index fad2d7ac1cfa7c4f39a79f8d83800b92ed61c2ec..f2190c83031f73504b1ac2e9f68415cb64f1a6b9 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -6139,12 +6139,14 @@ 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,
@@ -6156,12 +6158,14 @@ 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,
@@ -6730,6 +6734,7 @@ 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",
@@ -6783,6 +6788,7 @@ ALIAS (clear_ip_bgp_all_encap_soft_out,
        "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,
@@ -7015,6 +7021,7 @@ 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,
@@ -7071,6 +7078,7 @@ ALIAS (clear_ip_bgp_peer_encap_soft_out,
        "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,
@@ -7680,6 +7688,7 @@ 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",
@@ -7733,6 +7742,7 @@ ALIAS (clear_ip_bgp_as_encap_soft_out,
        "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,
@@ -7963,6 +7973,7 @@ 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",
@@ -8016,6 +8027,7 @@ ALIAS (clear_ip_bgp_all_encap_soft_in,
        "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,
@@ -8274,6 +8286,7 @@ 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",
@@ -8329,6 +8342,7 @@ ALIAS (clear_ip_bgp_peer_encap_soft_in,
        "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,
@@ -9111,6 +9125,7 @@ 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",
@@ -9164,6 +9179,7 @@ ALIAS (clear_ip_bgp_as_encap_soft_in,
        "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,
@@ -9338,6 +9354,7 @@ 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",
@@ -9367,6 +9384,7 @@ DEFUN (clear_ip_bgp_all_encap_soft,
   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,
@@ -9480,6 +9498,7 @@ 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",
@@ -9510,6 +9529,7 @@ DEFUN (clear_ip_bgp_peer_encap_soft,
   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,
@@ -9847,6 +9867,7 @@ 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",
@@ -9876,6 +9897,7 @@ DEFUN (clear_ip_bgp_as_encap_soft,
   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,
@@ -10783,6 +10805,7 @@ 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}",
@@ -10823,6 +10846,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_summary,
 
   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,
@@ -12821,6 +12845,7 @@ 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}",
@@ -12843,6 +12868,7 @@ ALIAS (show_ip_bgp_neighbors,
        "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,
@@ -12892,6 +12918,7 @@ 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}",
@@ -12915,6 +12942,7 @@ ALIAS (show_ip_bgp_neighbors_peer,
        "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,
@@ -15617,10 +15645,14 @@ 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);
@@ -15722,6 +15754,7 @@ 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);
@@ -15734,6 +15767,7 @@ bgp_vty_init (void)
   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);
@@ -15832,6 +15866,7 @@ 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);
@@ -15844,6 +15879,7 @@ bgp_vty_init (void)
   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);
@@ -15906,12 +15942,14 @@ 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);
@@ -15963,8 +16001,10 @@ 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);
@@ -15980,10 +16020,12 @@ 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);