BGP: Enhance clear commands for VRFs

Fix and enhance the entire hierarchy of clear commands in BGP to work
for VRFs.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Ticket: CM-9945
Reviewed By: CCR-4360
Testing Done: Manual (brief)

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index bf8f221fa7a55603e87f2e6dc1bb90c493d10a76..37909dd26cf159c2b6c5866e6f065e89dafd5124 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -5858,7 +5858,7 @@ DEFUN (exit_address_family,
 
 /* Recalculate bestpath and re-advertise a prefix */
 static int
-bgp_clear_prefix (struct vty *vty, char *view_name, const char *ip_str,
+bgp_clear_prefix (struct vty *vty, const char *view_name, const char *ip_str,
                   afi_t afi, safi_t safi, struct prefix_rd *prd)
 {
   int ret;
@@ -5951,6 +5951,15 @@ DEFUN (clear_ip_bgp_all,
   return bgp_clear_vty (vty, NULL, 0, 0, clear_all, BGP_CLEAR_SOFT_NONE, NULL);
 }
 
+ALIAS (clear_ip_bgp_all,
+       clear_ip_bgp_instance_all_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " *",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all peers\n")
+
 ALIAS (clear_ip_bgp_all,
        clear_bgp_all_cmd,
        "clear bgp *",
@@ -5959,28 +5968,28 @@ ALIAS (clear_ip_bgp_all,
        "Clear all peers\n")
 
 ALIAS (clear_ip_bgp_all,
-       clear_bgp_ipv6_all_cmd,
-       "clear bgp ipv6 *",
+       clear_bgp_instance_all_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " *",
        CLEAR_STR
        BGP_STR
-       "Address family\n"
+       BGP_INSTANCE_HELP_STR
        "Clear all peers\n")
 
 ALIAS (clear_ip_bgp_all,
-       clear_ip_bgp_instance_all_cmd,
-       "clear ip bgp " BGP_INSTANCE_CMD " *",
+       clear_bgp_ipv6_all_cmd,
+       "clear bgp ipv6 *",
        CLEAR_STR
-       IP_STR
        BGP_STR
-       BGP_INSTANCE_HELP_STR
+       "Address family\n"
        "Clear all peers\n")
 
 ALIAS (clear_ip_bgp_all,
-       clear_bgp_instance_all_cmd,
-       "clear bgp " BGP_INSTANCE_CMD " *",
+       clear_bgp_instance_ipv6_all_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 *",
        CLEAR_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
+       "Address family\n"
        "Clear all peers\n")
 
 DEFUN (clear_ip_bgp_peer,
@@ -5993,9 +6002,23 @@ DEFUN (clear_ip_bgp_peer,
        "BGP IPv6 neighbor to clear\n"
        "BGP neighbor on interface to clear\n")
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], 0, 0, clear_peer, BGP_CLEAR_SOFT_NONE, argv[2]);
+
   return bgp_clear_vty (vty, NULL, 0, 0, clear_peer, BGP_CLEAR_SOFT_NONE, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_peer,
+       clear_ip_bgp_instance_peer_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|X:X::X:X|WORD)",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor IP address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n")
+
 ALIAS (clear_ip_bgp_peer,
        clear_bgp_peer_cmd, 
        "clear bgp (A.B.C.D|X:X::X:X|WORD)",
@@ -6005,6 +6028,16 @@ ALIAS (clear_ip_bgp_peer,
        "BGP IPv6 neighbor to clear\n"
        "BGP neighbor on interface to clear\n")
 
+ALIAS (clear_ip_bgp_peer,
+       clear_bgp_instance_peer_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " (A.B.C.D|X:X::X:X|WORD)",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor IP address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n")
+
 ALIAS (clear_ip_bgp_peer,
        clear_bgp_ipv6_peer_cmd, 
        "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD)",
@@ -6015,6 +6048,17 @@ ALIAS (clear_ip_bgp_peer,
        "BGP IPv6 neighbor to clear\n"
        "BGP neighbor on interface to clear\n")
 
+ALIAS (clear_ip_bgp_peer,
+       clear_bgp_instance_ipv6_peer_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 (A.B.C.D|X:X::X:X|WORD)",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "BGP neighbor IP address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n")
+
 DEFUN (clear_ip_bgp_peer_group,
        clear_ip_bgp_peer_group_cmd, 
        "clear ip bgp peer-group WORD",
@@ -6024,9 +6068,22 @@ DEFUN (clear_ip_bgp_peer_group,
        "Clear all members of peer-group\n"
        "BGP peer-group name\n")
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], 0, 0, clear_group, BGP_CLEAR_SOFT_NONE, argv[2]);
+
   return bgp_clear_vty (vty, NULL, 0, 0, clear_group, BGP_CLEAR_SOFT_NONE, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_peer_group,
+       clear_ip_bgp_instance_peer_group_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n")
+
 ALIAS (clear_ip_bgp_peer_group,
        clear_bgp_peer_group_cmd, 
        "clear bgp peer-group WORD",
@@ -6035,6 +6092,15 @@ ALIAS (clear_ip_bgp_peer_group,
        "Clear all members of peer-group\n"
        "BGP peer-group name\n")
 
+ALIAS (clear_ip_bgp_peer_group,
+       clear_bgp_instance_peer_group_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " peer-group WORD",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n")
+
 ALIAS (clear_ip_bgp_peer_group,
        clear_bgp_ipv6_peer_group_cmd, 
        "clear bgp ipv6 peer-group WORD",
@@ -6044,6 +6110,16 @@ ALIAS (clear_ip_bgp_peer_group,
        "Clear all members of peer-group\n"
        "BGP peer-group name\n")
 
+ALIAS (clear_ip_bgp_peer_group,
+       clear_bgp_instance_ipv6_peer_group_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 peer-group WORD",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n")
+
 DEFUN (clear_ip_bgp_external,
        clear_ip_bgp_external_cmd,
        "clear ip bgp external",
@@ -6052,9 +6128,21 @@ DEFUN (clear_ip_bgp_external,
        BGP_STR
        "Clear all external peers\n")
 {
+  if (argc == 2)
+    return bgp_clear_vty (vty, argv[1], 0, 0, clear_external, BGP_CLEAR_SOFT_NONE, NULL);
+
   return bgp_clear_vty (vty, NULL, 0, 0, clear_external, BGP_CLEAR_SOFT_NONE, NULL);
 }
 
+ALIAS (clear_ip_bgp_external,
+       clear_ip_bgp_instance_external_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n")
+
 ALIAS (clear_ip_bgp_external,
        clear_bgp_external_cmd, 
        "clear bgp external",
@@ -6062,6 +6150,14 @@ ALIAS (clear_ip_bgp_external,
        BGP_STR
        "Clear all external peers\n")
 
+ALIAS (clear_ip_bgp_external,
+       clear_bgp_instance_external_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " external",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n")
+
 ALIAS (clear_ip_bgp_external,
        clear_bgp_ipv6_external_cmd, 
        "clear bgp ipv6 external",
@@ -6070,6 +6166,15 @@ ALIAS (clear_ip_bgp_external,
        "Address family\n"
        "Clear all external peers\n")
 
+ALIAS (clear_ip_bgp_external,
+       clear_bgp_instance_ipv6_external_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 external",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all external peers\n")
+
 DEFUN (clear_ip_bgp_prefix,
        clear_ip_bgp_prefix_cmd,
        "clear ip bgp prefix A.B.C.D/M",
@@ -6079,9 +6184,22 @@ DEFUN (clear_ip_bgp_prefix,
        "Clear bestpath and re-advertise\n"
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
 {
+  if (argc == 3)
+    return bgp_clear_prefix (vty, argv[1], argv[2], AFI_IP, SAFI_UNICAST, NULL);
+
   return bgp_clear_prefix (vty, NULL, argv[0], AFI_IP, SAFI_UNICAST, NULL);
 }
 
+ALIAS (clear_ip_bgp_prefix,
+       clear_ip_bgp_instance_prefix_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " prefix A.B.C.D/M",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear bestpath and re-advertise\n"
+       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
+
 ALIAS (clear_ip_bgp_prefix,
        clear_bgp_prefix_cmd,
        "clear bgp prefix A.B.C.D/M",
@@ -6090,6 +6208,14 @@ ALIAS (clear_ip_bgp_prefix,
        "Clear bestpath and re-advertise\n"
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
 
+ALIAS (clear_ip_bgp_prefix,
+       clear_bgp_instance_prefix_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " prefix A.B.C.D/M",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear bestpath and re-advertise\n"
+       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
 
 DEFUN (clear_ip_bgp_as,
        clear_ip_bgp_as_cmd,
@@ -6099,9 +6225,21 @@ DEFUN (clear_ip_bgp_as,
        BGP_STR
        "Clear peers with the AS number\n")
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], 0, 0, clear_as, BGP_CLEAR_SOFT_NONE, argv[2]);
+
   return bgp_clear_vty (vty, NULL, 0, 0, clear_as, BGP_CLEAR_SOFT_NONE, argv[0]);
 }       
 
+ALIAS (clear_ip_bgp_as,
+       clear_ip_bgp_instance_as_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE,
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n")
+
 ALIAS (clear_ip_bgp_as,
        clear_bgp_as_cmd,
        "clear bgp " CMD_AS_RANGE,
@@ -6109,6 +6247,14 @@ ALIAS (clear_ip_bgp_as,
        BGP_STR
        "Clear peers with the AS number\n")
 
+ALIAS (clear_ip_bgp_as,
+       clear_bgp_instance_as_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE,
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n")
+
 ALIAS (clear_ip_bgp_as,
        clear_bgp_ipv6_as_cmd,
        "clear bgp ipv6 " CMD_AS_RANGE,
@@ -6117,6 +6263,15 @@ ALIAS (clear_ip_bgp_as,
        "Address family\n"
        "Clear peers with the AS number\n")
 
+ALIAS (clear_ip_bgp_as,
+       clear_bgp_instance_ipv6_as_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE,
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear peers with the AS number\n")
+
 /* Outbound soft-reconfiguration */
 DEFUN (clear_ip_bgp_all_soft_out,
        clear_ip_bgp_all_soft_out_cmd,
@@ -6136,6 +6291,17 @@ DEFUN (clear_ip_bgp_all_soft_out,
                        BGP_CLEAR_SOFT_OUT, NULL);
 }
 
+ALIAS (clear_ip_bgp_all_soft_out,
+       clear_ip_bgp_instance_all_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " * soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all peers\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_ip_bgp_all_soft_out,
        clear_ip_bgp_all_out_cmd,
        "clear ip bgp * out",
@@ -6146,14 +6312,13 @@ ALIAS (clear_ip_bgp_all_soft_out,
        BGP_SOFT_OUT_STR)
 
 ALIAS (clear_ip_bgp_all_soft_out,
-       clear_ip_bgp_instance_all_soft_out_cmd,
-       "clear ip bgp " BGP_INSTANCE_CMD " * soft out",
+       clear_ip_bgp_instance_all_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " * out",
        CLEAR_STR
        IP_STR
        BGP_STR
        BGP_INSTANCE_HELP_STR
        "Clear all peers\n"
-       BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 
 DEFUN (clear_ip_bgp_all_ipv4_soft_out,
@@ -6177,6 +6342,27 @@ DEFUN (clear_ip_bgp_all_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, NULL);
 }
 
+DEFUN (clear_ip_bgp_instance_all_ipv4_soft_out,
+       clear_ip_bgp_instance_all_ipv4_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_OUT_STR)
+{
+  if (strncmp (argv[2], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_all,
+                          BGP_CLEAR_SOFT_OUT, NULL);
+
+  return bgp_clear_vty (vty, argv[0], AFI_IP, SAFI_UNICAST, clear_all,
+                        BGP_CLEAR_SOFT_OUT, NULL);
+}
+
 ALIAS (clear_ip_bgp_all_ipv4_soft_out,
        clear_ip_bgp_all_ipv4_out_cmd,
        "clear ip bgp * ipv4 (unicast|multicast) out",
@@ -6189,9 +6375,9 @@ ALIAS (clear_ip_bgp_all_ipv4_soft_out,
        "Address Family modifier\n"
        BGP_SOFT_OUT_STR)
 
-DEFUN (clear_ip_bgp_instance_all_ipv4_soft_out,
-       clear_ip_bgp_instance_all_ipv4_soft_out_cmd,
-       "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) soft out",
+ALIAS (clear_ip_bgp_instance_all_ipv4_soft_out,
+       clear_ip_bgp_instance_all_ipv4_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) out",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6201,14 +6387,6 @@ DEFUN (clear_ip_bgp_instance_all_ipv4_soft_out,
        "Address Family modifier\n"
        "Address Family modifier\n"
        BGP_SOFT_OUT_STR)
-{
-  if (strncmp (argv[2], "m", 1) == 0)
-    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_all,
-                          BGP_CLEAR_SOFT_OUT, NULL);
-
-  return bgp_clear_vty (vty, argv[0], AFI_IP, SAFI_UNICAST, clear_all,
-                        BGP_CLEAR_SOFT_OUT, NULL);
-}
 
 DEFUN (clear_ip_bgp_all_vpnv4_soft_out,
        clear_ip_bgp_all_vpnv4_soft_out_cmd,
@@ -6272,6 +6450,15 @@ ALIAS (clear_bgp_all_soft_out,
        "Clear all peers\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_all_soft_out,
+       clear_bgp_instance_all_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " * out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all peers\n"
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_all_soft_out,
        clear_bgp_ipv6_all_soft_out_cmd,
        "clear bgp ipv6 * soft out",
@@ -6282,6 +6469,17 @@ ALIAS (clear_bgp_all_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_all_soft_out,
+       clear_bgp_instance_ipv6_all_soft_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 * soft out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all peers\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_all_soft_out,
        clear_bgp_ipv6_all_out_cmd,
        "clear bgp ipv6 * out",
@@ -6291,6 +6489,16 @@ ALIAS (clear_bgp_all_soft_out,
        "Clear all peers\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_all_soft_out,
+       clear_bgp_instance_ipv6_all_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 * out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all peers\n"
+       BGP_SOFT_OUT_STR)
+
 DEFUN (clear_bgp_ipv6_safi_prefix,
        clear_bgp_ipv6_safi_prefix_cmd,
        "clear bgp ipv6 (unicast|multicast) prefix X:X::X:X/M",
@@ -6307,6 +6515,23 @@ DEFUN (clear_bgp_ipv6_safi_prefix,
     return bgp_clear_prefix (vty, NULL, argv[1], AFI_IP6, SAFI_UNICAST, NULL);
 }
 
+DEFUN (clear_bgp_instance_ipv6_safi_prefix,
+       clear_bgp_instance_ipv6_safi_prefix_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 (unicast|multicast) prefix X:X::X:X/M",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Clear bestpath and re-advertise\n"
+       "IPv6 prefix <network>/<length>,  e.g.,  3ffe::/16\n")
+{
+  if (strncmp (argv[2], "m", 1) == 0)
+    return bgp_clear_prefix (vty, argv[1], argv[3], AFI_IP6, SAFI_MULTICAST, NULL);
+  else
+    return bgp_clear_prefix (vty, argv[1], argv[3], AFI_IP6, SAFI_UNICAST, NULL);
+}
+
 DEFUN (clear_ip_bgp_peer_soft_out,
        clear_ip_bgp_peer_soft_out_cmd,
        "clear ip bgp (A.B.C.D|WORD) soft out",
@@ -6318,10 +6543,26 @@ DEFUN (clear_ip_bgp_peer_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_peer,
+                          BGP_CLEAR_SOFT_OUT, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_peer,
                        BGP_CLEAR_SOFT_OUT, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_peer_soft_out,
+       clear_ip_bgp_instance_peer_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_ip_bgp_peer_soft_out,
        clear_ip_bgp_peer_out_cmd,
        "clear ip bgp (A.B.C.D|WORD) out",
@@ -6332,6 +6573,17 @@ ALIAS (clear_ip_bgp_peer_soft_out,
        "BGP neighbor on interface to clear\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_ip_bgp_peer_soft_out,
+       clear_ip_bgp_instance_peer_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_OUT_STR)
+
 DEFUN (clear_ip_bgp_peer_ipv4_soft_out,
        clear_ip_bgp_peer_ipv4_soft_out_cmd,
        "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) soft out",
@@ -6354,6 +6606,29 @@ DEFUN (clear_ip_bgp_peer_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[0]);
 }
 
+DEFUN (clear_ip_bgp_instance_peer_ipv4_soft_out,
+       clear_ip_bgp_instance_peer_ipv4_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) ipv4 (unicast|multicast) soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+{
+  if (strncmp (argv[3], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_peer,
+                         BGP_CLEAR_SOFT_OUT, argv[2]);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_peer,
+                       BGP_CLEAR_SOFT_OUT, argv[2]);
+}
+
 ALIAS (clear_ip_bgp_peer_ipv4_soft_out,
        clear_ip_bgp_peer_ipv4_out_cmd,
        "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) out",
@@ -6367,6 +6642,20 @@ ALIAS (clear_ip_bgp_peer_ipv4_soft_out,
        "Address Family modifier\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_ip_bgp_instance_peer_ipv4_soft_out,
+       clear_ip_bgp_instance_peer_ipv4_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) ipv4 (unicast|multicast) out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_OUT_STR)
+
 /* 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,
@@ -6408,10 +6697,26 @@ DEFUN (clear_bgp_peer_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_peer,
+                          BGP_CLEAR_SOFT_OUT, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_peer,
                        BGP_CLEAR_SOFT_OUT, argv[0]);
 }
 
+ALIAS (clear_bgp_peer_soft_out,
+       clear_bgp_instance_peer_soft_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " (A.B.C.D|X:X::X:X|WORD) soft out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_peer_soft_out,
        clear_bgp_ipv6_peer_soft_out_cmd,
        "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) soft out",
@@ -6424,6 +6729,19 @@ ALIAS (clear_bgp_peer_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_peer_soft_out,
+       clear_bgp_instance_ipv6_peer_soft_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 (A.B.C.D|X:X::X:X|WORD) soft out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_peer_soft_out,
        clear_bgp_peer_out_cmd,
        "clear bgp (A.B.C.D|X:X::X:X|WORD) out",
@@ -6434,6 +6752,17 @@ ALIAS (clear_bgp_peer_soft_out,
        "BGP neighbor on interface to clear\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_peer_soft_out,
+       clear_bgp_instance_peer_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " (A.B.C.D|X:X::X:X|WORD) out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_peer_soft_out,
        clear_bgp_ipv6_peer_out_cmd,
        "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) out",
@@ -6445,6 +6774,18 @@ ALIAS (clear_bgp_peer_soft_out,
        "BGP neighbor on interface to clear\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_peer_soft_out,
+       clear_bgp_instance_ipv6_peer_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 (A.B.C.D|X:X::X:X|WORD) out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_OUT_STR)
+
 DEFUN (clear_ip_bgp_peer_group_soft_out,
        clear_ip_bgp_peer_group_soft_out_cmd, 
        "clear ip bgp peer-group WORD soft out",
@@ -6456,10 +6797,26 @@ DEFUN (clear_ip_bgp_peer_group_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_group,
+                          BGP_CLEAR_SOFT_OUT, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_group,
                        BGP_CLEAR_SOFT_OUT, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_peer_group_soft_out,
+       clear_ip_bgp_instance_peer_group_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_ip_bgp_peer_group_soft_out,
        clear_ip_bgp_peer_group_out_cmd, 
        "clear ip bgp peer-group WORD out",
@@ -6470,6 +6827,17 @@ ALIAS (clear_ip_bgp_peer_group_soft_out,
        "BGP peer-group name\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_ip_bgp_peer_group_soft_out,
+       clear_ip_bgp_instance_peer_group_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_OUT_STR)
+
 DEFUN (clear_ip_bgp_peer_group_ipv4_soft_out,
        clear_ip_bgp_peer_group_ipv4_soft_out_cmd,
        "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft out",
@@ -6492,6 +6860,29 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[0]);
 }
 
+DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft_out,
+       clear_ip_bgp_instance_peer_group_ipv4_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 (unicast|multicast) soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+{
+  if (strncmp (argv[3], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_group,
+                         BGP_CLEAR_SOFT_OUT, argv[2]);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_group,
+                       BGP_CLEAR_SOFT_OUT, argv[2]);
+}
+
 ALIAS (clear_ip_bgp_peer_group_ipv4_soft_out,
        clear_ip_bgp_peer_group_ipv4_out_cmd,
        "clear ip bgp peer-group WORD ipv4 (unicast|multicast) out",
@@ -6505,6 +6896,20 @@ ALIAS (clear_ip_bgp_peer_group_ipv4_soft_out,
        "Address Family modifier\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_ip_bgp_instance_peer_group_ipv4_soft_out,
+       clear_ip_bgp_instance_peer_group_ipv4_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 (unicast|multicast) out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_OUT_STR)
+
 DEFUN (clear_bgp_peer_group_soft_out,
        clear_bgp_peer_group_soft_out_cmd,
        "clear bgp peer-group WORD soft out",
@@ -6515,10 +6920,25 @@ DEFUN (clear_bgp_peer_group_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_group,
+                          BGP_CLEAR_SOFT_OUT, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_group,
                        BGP_CLEAR_SOFT_OUT, argv[0]);
 }
 
+ALIAS (clear_bgp_peer_group_soft_out,
+       clear_bgp_instance_peer_group_soft_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " peer-group WORD soft out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_peer_group_soft_out,
        clear_bgp_ipv6_peer_group_soft_out_cmd,
        "clear bgp ipv6 peer-group WORD soft out",
@@ -6530,6 +6950,18 @@ ALIAS (clear_bgp_peer_group_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_peer_group_soft_out,
+       clear_bgp_instance_ipv6_peer_group_soft_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 peer-group WORD soft out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_peer_group_soft_out,
        clear_bgp_peer_group_out_cmd,
        "clear bgp peer-group WORD out",
@@ -6539,6 +6971,16 @@ ALIAS (clear_bgp_peer_group_soft_out,
        "BGP peer-group name\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_peer_group_soft_out,
+       clear_bgp_instance_peer_group_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " peer-group WORD out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_peer_group_soft_out,
        clear_bgp_ipv6_peer_group_out_cmd,
        "clear bgp ipv6 peer-group WORD out",
@@ -6549,6 +6991,17 @@ ALIAS (clear_bgp_peer_group_soft_out,
        "BGP peer-group name\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_peer_group_soft_out,
+       clear_bgp_instance_ipv6_peer_group_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 peer-group WORD out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_OUT_STR)
+
 DEFUN (clear_ip_bgp_external_soft_out,
        clear_ip_bgp_external_soft_out_cmd, 
        "clear ip bgp external soft out",
@@ -6558,17 +7011,42 @@ DEFUN (clear_ip_bgp_external_soft_out,
        "Clear all external peers\n"
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
-{
-  return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_external,
-                       BGP_CLEAR_SOFT_OUT, NULL);
-}
+{
+  if (argc == 2)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_external,
+                          BGP_CLEAR_SOFT_OUT, NULL);
+
+  return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_external,
+                       BGP_CLEAR_SOFT_OUT, NULL);
+}
+
+ALIAS (clear_ip_bgp_external_soft_out,
+       clear_ip_bgp_instance_external_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
+ALIAS (clear_ip_bgp_external_soft_out,
+       clear_ip_bgp_external_out_cmd,
+       "clear ip bgp external out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_OUT_STR)
 
 ALIAS (clear_ip_bgp_external_soft_out,
-       clear_ip_bgp_external_out_cmd, 
-       "clear ip bgp external out",
+       clear_ip_bgp_instance_external_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external out",
        CLEAR_STR
        IP_STR
        BGP_STR
+       BGP_INSTANCE_HELP_STR
        "Clear all external peers\n"
        BGP_SOFT_OUT_STR)
 
@@ -6593,6 +7071,28 @@ DEFUN (clear_ip_bgp_external_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, NULL);
 }
 
+DEFUN (clear_ip_bgp_instance_external_ipv4_soft_out,
+       clear_ip_bgp_instance_external_ipv4_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 (unicast|multicast) soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+{
+  if (strncmp (argv[2], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_external,
+                         BGP_CLEAR_SOFT_OUT, NULL);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_external,
+                       BGP_CLEAR_SOFT_OUT, NULL);
+}
+
 ALIAS (clear_ip_bgp_external_ipv4_soft_out,
        clear_ip_bgp_external_ipv4_out_cmd,
        "clear ip bgp external ipv4 (unicast|multicast) out",
@@ -6605,6 +7105,19 @@ ALIAS (clear_ip_bgp_external_ipv4_soft_out,
        "Address Family modifier\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_ip_bgp_instance_external_ipv4_soft_out,
+       clear_ip_bgp_instance_external_ipv4_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 (unicast|multicast) out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_OUT_STR)
+
 DEFUN (clear_bgp_external_soft_out,
        clear_bgp_external_soft_out_cmd,
        "clear bgp external soft out",
@@ -6614,10 +7127,24 @@ DEFUN (clear_bgp_external_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 {
+  if (argc == 2)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_external,
+                          BGP_CLEAR_SOFT_OUT, NULL);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_external,
                        BGP_CLEAR_SOFT_OUT, NULL);
 }
 
+ALIAS (clear_bgp_external_soft_out,
+       clear_bgp_instance_external_soft_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " external soft out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_external_soft_out,
        clear_bgp_ipv6_external_soft_out_cmd,
        "clear bgp ipv6 external soft out",
@@ -6628,6 +7155,17 @@ ALIAS (clear_bgp_external_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_external_soft_out,
+       clear_bgp_instance_ipv6_external_soft_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 external soft out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all external peers\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_external_soft_out,
        clear_bgp_external_out_cmd,
        "clear bgp external out",
@@ -6636,6 +7174,15 @@ ALIAS (clear_bgp_external_soft_out,
        "Clear all external peers\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_external_soft_out,
+       clear_bgp_instance_external_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " external out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_external_soft_out,
        clear_bgp_ipv6_external_out_cmd,
        "clear bgp ipv6 external WORD out",
@@ -6645,6 +7192,16 @@ ALIAS (clear_bgp_external_soft_out,
        "Clear all external peers\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_external_soft_out,
+       clear_bgp_instance_ipv6_external_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 external WORD out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all external peers\n"
+       BGP_SOFT_OUT_STR)
+
 DEFUN (clear_ip_bgp_as_soft_out,
        clear_ip_bgp_as_soft_out_cmd,
        "clear ip bgp " CMD_AS_RANGE " soft out",
@@ -6655,10 +7212,25 @@ DEFUN (clear_ip_bgp_as_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_as,
+                          BGP_CLEAR_SOFT_OUT, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_as,
                        BGP_CLEAR_SOFT_OUT, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_as_soft_out,
+       clear_ip_bgp_instance_as_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_ip_bgp_as_soft_out,
        clear_ip_bgp_as_out_cmd,
        "clear ip bgp " CMD_AS_RANGE " out",
@@ -6668,6 +7240,16 @@ ALIAS (clear_ip_bgp_as_soft_out,
        "Clear peers with the AS number\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_ip_bgp_as_soft_out,
+       clear_ip_bgp_instance_as_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_OUT_STR)
+
 DEFUN (clear_ip_bgp_as_ipv4_soft_out,
        clear_ip_bgp_as_ipv4_soft_out_cmd,
        "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) soft out",
@@ -6689,6 +7271,28 @@ DEFUN (clear_ip_bgp_as_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[0]);
 }
 
+DEFUN (clear_ip_bgp_instance_as_ipv4_soft_out,
+       clear_ip_bgp_instance_as_ipv4_soft_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 (unicast|multicast) soft out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+{
+  if (strncmp (argv[3], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_as,
+                         BGP_CLEAR_SOFT_OUT, argv[2]);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_as,
+                       BGP_CLEAR_SOFT_OUT, argv[2]);
+}
+
 ALIAS (clear_ip_bgp_as_ipv4_soft_out,
        clear_ip_bgp_as_ipv4_out_cmd,
        "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) out",
@@ -6701,6 +7305,19 @@ ALIAS (clear_ip_bgp_as_ipv4_soft_out,
        "Address Family modifier\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_ip_bgp_instance_as_ipv4_soft_out,
+       clear_ip_bgp_instance_as_ipv4_out_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 (unicast|multicast) out",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_OUT_STR)
+
 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",
@@ -6737,10 +7354,24 @@ DEFUN (clear_bgp_as_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_as,
+                          BGP_CLEAR_SOFT_OUT, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_as,
                        BGP_CLEAR_SOFT_OUT, argv[0]);
 }
 
+ALIAS (clear_bgp_as_soft_out,
+       clear_bgp_instance_as_soft_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_as_soft_out,
        clear_bgp_ipv6_as_soft_out_cmd,
        "clear bgp ipv6 " CMD_AS_RANGE " soft out",
@@ -6751,6 +7382,17 @@ ALIAS (clear_bgp_as_soft_out,
        BGP_SOFT_STR
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_as_soft_out,
+       clear_bgp_instance_ipv6_as_soft_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE " soft out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear peers with the AS number\n"
+       BGP_SOFT_STR
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_as_soft_out,
        clear_bgp_as_out_cmd,
        "clear bgp " CMD_AS_RANGE " out",
@@ -6759,6 +7401,15 @@ ALIAS (clear_bgp_as_soft_out,
        "Clear peers with the AS number\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_as_soft_out,
+       clear_bgp_instance_as_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_OUT_STR)
+
 ALIAS (clear_bgp_as_soft_out,
        clear_bgp_ipv6_as_out_cmd,
        "clear bgp ipv6 " CMD_AS_RANGE " out",
@@ -6768,6 +7419,16 @@ ALIAS (clear_bgp_as_soft_out,
        "Clear peers with the AS number\n"
        BGP_SOFT_OUT_STR)
 
+ALIAS (clear_bgp_as_soft_out,
+       clear_bgp_instance_ipv6_as_out_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE " out",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear peers with the AS number\n"
+       BGP_SOFT_OUT_STR)
+
 /* Inbound soft-reconfiguration */
 DEFUN (clear_ip_bgp_all_soft_in,
        clear_ip_bgp_all_soft_in_cmd,
@@ -6807,6 +7468,16 @@ ALIAS (clear_ip_bgp_all_soft_in,
        "Clear all peers\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_ip_bgp_all_soft_in,
+       clear_ip_bgp_instance_all_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " * in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all peers\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_ip_bgp_all_in_prefix_filter,
        clear_ip_bgp_all_in_prefix_filter_cmd,
        "clear ip bgp * in prefix-filter",
@@ -6825,18 +7496,6 @@ DEFUN (clear_ip_bgp_all_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
 }
 
-ALIAS (clear_ip_bgp_all_in_prefix_filter,
-       clear_ip_bgp_instance_all_in_prefix_filter_cmd,
-       "clear ip bgp " BGP_INSTANCE_CMD " * in prefix-filter",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Clear all peers\n"
-       BGP_SOFT_IN_STR
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
-
-
 DEFUN (clear_ip_bgp_all_ipv4_soft_in,
        clear_ip_bgp_all_ipv4_soft_in_cmd,
        "clear ip bgp * ipv4 (unicast|multicast) soft in",
@@ -6858,18 +7517,6 @@ DEFUN (clear_ip_bgp_all_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
-ALIAS (clear_ip_bgp_all_ipv4_soft_in,
-       clear_ip_bgp_all_ipv4_in_cmd,
-       "clear ip bgp * ipv4 (unicast|multicast) in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       BGP_SOFT_IN_STR)
-
 DEFUN (clear_ip_bgp_instance_all_ipv4_soft_in,
        clear_ip_bgp_instance_all_ipv4_soft_in_cmd,
        "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) soft in",
@@ -6892,9 +7539,9 @@ DEFUN (clear_ip_bgp_instance_all_ipv4_soft_in,
                         BGP_CLEAR_SOFT_IN, NULL);
 }
 
-DEFUN (clear_ip_bgp_all_ipv4_in_prefix_filter,
-       clear_ip_bgp_all_ipv4_in_prefix_filter_cmd,
-       "clear ip bgp * ipv4 (unicast|multicast) in prefix-filter",
+ALIAS (clear_ip_bgp_all_ipv4_soft_in,
+       clear_ip_bgp_all_ipv4_in_cmd,
+       "clear ip bgp * ipv4 (unicast|multicast) in",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6902,20 +7549,24 @@ DEFUN (clear_ip_bgp_all_ipv4_in_prefix_filter,
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       BGP_SOFT_IN_STR
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
-{
-  if (strncmp (argv[0], "m", 1) == 0)
-    return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MULTICAST, clear_all,
-                         BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
+       BGP_SOFT_IN_STR)
 
-  return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_all,
-                       BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
-}
+ALIAS (clear_ip_bgp_instance_all_ipv4_soft_in,
+       clear_ip_bgp_instance_all_ipv4_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_IN_STR)
 
-DEFUN (clear_ip_bgp_instance_all_ipv4_in_prefix_filter,
-       clear_ip_bgp_instance_all_ipv4_in_prefix_filter_cmd,
-       "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) in prefix-filter",
+DEFUN (clear_ip_bgp_all_ipv4_in_prefix_filter,
+       clear_ip_bgp_all_ipv4_in_prefix_filter_cmd,
+       "clear ip bgp * ipv4 (unicast|multicast) in prefix-filter",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -6926,12 +7577,12 @@ DEFUN (clear_ip_bgp_instance_all_ipv4_in_prefix_filter,
        BGP_SOFT_IN_STR
        "Push out prefix-list ORF and do inbound soft reconfig\n")
 {
-  if (strncmp (argv[2], "m", 1) == 0)
-    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_all,
-                          BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
+  if (strncmp (argv[0], "m", 1) == 0)
+    return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MULTICAST, clear_all,
+                         BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
 
-  return bgp_clear_vty (vty, argv[0], AFI_IP, SAFI_UNICAST, clear_all,
-                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
+  return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_all,
+                       BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
 }
 
 DEFUN (clear_ip_bgp_all_vpnv4_soft_in,
@@ -6998,6 +7649,17 @@ ALIAS (clear_bgp_all_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_all_soft_in,
+       clear_bgp_instance_ipv6_all_soft_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 * soft in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all peers\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_all_soft_in,
        clear_bgp_all_in_cmd,
        "clear bgp * in",
@@ -7006,6 +7668,15 @@ ALIAS (clear_bgp_all_soft_in,
        "Clear all peers\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_all_soft_in,
+       clear_bgp_instance_all_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " * in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all peers\n"
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_all_soft_in,
        clear_bgp_ipv6_all_in_cmd,
        "clear bgp ipv6 * in",
@@ -7015,6 +7686,16 @@ ALIAS (clear_bgp_all_soft_in,
        "Clear all peers\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_all_soft_in,
+       clear_bgp_instance_ipv6_all_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 * in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all peers\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_bgp_all_in_prefix_filter,
        clear_bgp_all_in_prefix_filter_cmd,
        "clear bgp * in prefix-filter",
@@ -7049,10 +7730,26 @@ DEFUN (clear_ip_bgp_peer_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_peer,
+                          BGP_CLEAR_SOFT_IN, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_peer,
                        BGP_CLEAR_SOFT_IN, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_peer_soft_in,
+       clear_ip_bgp_instance_peer_soft_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) soft in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_ip_bgp_peer_soft_in,
        clear_ip_bgp_peer_in_cmd,
        "clear ip bgp (A.B.C.D|WORD) in",
@@ -7062,7 +7759,18 @@ ALIAS (clear_ip_bgp_peer_soft_in,
        "BGP neighbor address to clear\n"
        "BGP neighbor on interface to clear\n"
        BGP_SOFT_IN_STR)
-       
+       
+ALIAS (clear_ip_bgp_peer_soft_in,
+       clear_ip_bgp_instance_peer_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_ip_bgp_peer_in_prefix_filter,
        clear_ip_bgp_peer_in_prefix_filter_cmd,
        "clear ip bgp (A.B.C.D|WORD) in prefix-filter",
@@ -7100,6 +7808,29 @@ DEFUN (clear_ip_bgp_peer_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[0]);
 }
 
+DEFUN (clear_ip_bgp_instance_peer_ipv4_soft_in,
+       clear_ip_bgp_instance_peer_ipv4_soft_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) ipv4 (unicast|multicast) soft in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+{
+  if (strncmp (argv[3], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_peer,
+                         BGP_CLEAR_SOFT_IN, argv[2]);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_peer,
+                       BGP_CLEAR_SOFT_IN, argv[2]);
+}
+
 ALIAS (clear_ip_bgp_peer_ipv4_soft_in,
        clear_ip_bgp_peer_ipv4_in_cmd,
        "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) in",
@@ -7113,6 +7844,20 @@ ALIAS (clear_ip_bgp_peer_ipv4_soft_in,
        "Address Family modifier\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_ip_bgp_instance_peer_ipv4_soft_in,
+       clear_ip_bgp_instance_peer_ipv4_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) ipv4 (unicast|multicast) in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_ip_bgp_peer_ipv4_in_prefix_filter,
        clear_ip_bgp_peer_ipv4_in_prefix_filter_cmd,
        "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) in prefix-filter",
@@ -7175,10 +7920,26 @@ DEFUN (clear_bgp_peer_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_peer,
+                          BGP_CLEAR_SOFT_IN, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_peer,
                        BGP_CLEAR_SOFT_IN, argv[0]);
 }
 
+ALIAS (clear_bgp_peer_soft_in,
+       clear_bgp_instance_peer_soft_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " (A.B.C.D|X:X::X:X|WORD) soft in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_peer_soft_in,
        clear_bgp_ipv6_peer_soft_in_cmd,
        "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) soft in",
@@ -7191,6 +7952,19 @@ ALIAS (clear_bgp_peer_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_peer_soft_in,
+       clear_bgp_instance_ipv6_peer_soft_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 (A.B.C.D|X:X::X:X|WORD) soft in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_peer_soft_in,
        clear_bgp_peer_in_cmd,
        "clear bgp (A.B.C.D|X:X::X:X|WORD) in",
@@ -7201,6 +7975,17 @@ ALIAS (clear_bgp_peer_soft_in,
        "BGP neighbor on interface to clear\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_peer_soft_in,
+       clear_bgp_instance_peer_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " (A.B.C.D|X:X::X:X|WORD) in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_peer_soft_in,
        clear_bgp_ipv6_peer_in_cmd,
        "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) in",
@@ -7212,6 +7997,18 @@ ALIAS (clear_bgp_peer_soft_in,
        "BGP neighbor on interface to clear\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_peer_soft_in,
+       clear_bgp_instance_ipv6_peer_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 (A.B.C.D|X:X::X:X|WORD) in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_bgp_peer_in_prefix_filter,
        clear_bgp_peer_in_prefix_filter_cmd,
        "clear bgp (A.B.C.D|X:X::X:X|WORD) in prefix-filter",
@@ -7250,10 +8047,26 @@ DEFUN (clear_ip_bgp_peer_group_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_group,
+                          BGP_CLEAR_SOFT_IN, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_group,
                        BGP_CLEAR_SOFT_IN, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_peer_group_soft_in,
+       clear_ip_bgp_instance_peer_group_soft_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD soft in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_ip_bgp_peer_group_soft_in,
        clear_ip_bgp_peer_group_in_cmd,
        "clear ip bgp peer-group WORD in",
@@ -7264,6 +8077,17 @@ ALIAS (clear_ip_bgp_peer_group_soft_in,
        "BGP peer-group name\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_ip_bgp_peer_group_soft_in,
+       clear_ip_bgp_instance_peer_group_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_ip_bgp_peer_group_in_prefix_filter,
        clear_ip_bgp_peer_group_in_prefix_filter_cmd,
        "clear ip bgp peer-group WORD in prefix-filter",
@@ -7301,6 +8125,29 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[0]);
 }
 
+DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft_in,
+       clear_ip_bgp_instance_peer_group_ipv4_soft_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 (unicast|multicast) soft in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+{
+  if (strncmp (argv[3], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_group,
+                         BGP_CLEAR_SOFT_IN, argv[2]);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_group,
+                       BGP_CLEAR_SOFT_IN, argv[2]);
+}
+
 ALIAS (clear_ip_bgp_peer_group_ipv4_soft_in,
        clear_ip_bgp_peer_group_ipv4_in_cmd,
        "clear ip bgp peer-group WORD ipv4 (unicast|multicast) in",
@@ -7314,6 +8161,20 @@ ALIAS (clear_ip_bgp_peer_group_ipv4_soft_in,
        "Address Family modifier\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_ip_bgp_instance_peer_group_ipv4_soft_in,
+       clear_ip_bgp_instance_peer_group_ipv4_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 (unicast|multicast) in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_ip_bgp_peer_group_ipv4_in_prefix_filter,
        clear_ip_bgp_peer_group_ipv4_in_prefix_filter_cmd,
        "clear ip bgp peer-group WORD ipv4 (unicast|multicast) in prefix-filter",
@@ -7346,10 +8207,25 @@ DEFUN (clear_bgp_peer_group_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_group,
+                          BGP_CLEAR_SOFT_IN, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_group,
                        BGP_CLEAR_SOFT_IN, argv[0]);
 }
 
+ALIAS (clear_bgp_peer_group_soft_in,
+       clear_bgp_instance_peer_group_soft_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " peer-group WORD soft in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_peer_group_soft_in,
        clear_bgp_ipv6_peer_group_soft_in_cmd,
        "clear bgp ipv6 peer-group WORD soft in",
@@ -7361,6 +8237,18 @@ ALIAS (clear_bgp_peer_group_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_peer_group_soft_in,
+       clear_bgp_instance_ipv6_peer_group_soft_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 peer-group WORD soft in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_peer_group_soft_in,
        clear_bgp_peer_group_in_cmd,
        "clear bgp peer-group WORD in",
@@ -7370,6 +8258,16 @@ ALIAS (clear_bgp_peer_group_soft_in,
        "BGP peer-group name\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_peer_group_soft_in,
+       clear_bgp_instance_peer_group_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " peer-group WORD in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_peer_group_soft_in,
        clear_bgp_ipv6_peer_group_in_cmd,
        "clear bgp ipv6 peer-group WORD in",
@@ -7380,6 +8278,17 @@ ALIAS (clear_bgp_peer_group_soft_in,
        "BGP peer-group name\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_peer_group_soft_in,
+       clear_bgp_instance_ipv6_peer_group_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 peer-group WORD in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_bgp_peer_group_in_prefix_filter,
        clear_bgp_peer_group_in_prefix_filter_cmd,
        "clear bgp peer-group WORD in prefix-filter",
@@ -7415,10 +8324,25 @@ DEFUN (clear_ip_bgp_external_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 {
+  if (argc == 2)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_external,
+                          BGP_CLEAR_SOFT_IN, NULL);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_external,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
+ALIAS (clear_ip_bgp_external_soft_in,
+       clear_ip_bgp_instance_external_soft_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external soft in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_ip_bgp_external_soft_in,
        clear_ip_bgp_external_in_cmd,
        "clear ip bgp external in",
@@ -7428,6 +8352,16 @@ ALIAS (clear_ip_bgp_external_soft_in,
        "Clear all external peers\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_ip_bgp_external_soft_in,
+       clear_ip_bgp_instance_external_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_ip_bgp_external_in_prefix_filter,
        clear_ip_bgp_external_in_prefix_filter_cmd,
        "clear ip bgp external in prefix-filter",
@@ -7463,6 +8397,28 @@ DEFUN (clear_ip_bgp_external_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
+DEFUN (clear_ip_bgp_instance_external_ipv4_soft_in,
+       clear_ip_bgp_instance_external_ipv4_soft_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 (unicast|multicast) soft in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+{
+  if (strncmp (argv[2], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_external,
+                         BGP_CLEAR_SOFT_IN, NULL);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_external,
+                       BGP_CLEAR_SOFT_IN, NULL);
+}
+
 ALIAS (clear_ip_bgp_external_ipv4_soft_in,
        clear_ip_bgp_external_ipv4_in_cmd,
        "clear ip bgp external ipv4 (unicast|multicast) in",
@@ -7475,6 +8431,19 @@ ALIAS (clear_ip_bgp_external_ipv4_soft_in,
        "Address Family modifier\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_ip_bgp_instance_external_ipv4_soft_in,
+       clear_ip_bgp_instance_external_ipv4_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 (unicast|multicast) in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_ip_bgp_external_ipv4_in_prefix_filter,
        clear_ip_bgp_external_ipv4_in_prefix_filter_cmd,
        "clear ip bgp external ipv4 (unicast|multicast) in prefix-filter",
@@ -7505,10 +8474,24 @@ DEFUN (clear_bgp_external_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 {
+  if (argc == 2)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_external,
+                          BGP_CLEAR_SOFT_IN, NULL);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_external,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
+ALIAS (clear_bgp_external_soft_in,
+       clear_bgp_instance_external_soft_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " external soft in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_external_soft_in,
        clear_bgp_ipv6_external_soft_in_cmd,
        "clear bgp ipv6 external soft in",
@@ -7519,6 +8502,17 @@ ALIAS (clear_bgp_external_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_external_soft_in,
+       clear_bgp_instance_ipv6_external_soft_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 external soft in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all external peers\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_external_soft_in,
        clear_bgp_external_in_cmd,
        "clear bgp external in",
@@ -7527,6 +8521,15 @@ ALIAS (clear_bgp_external_soft_in,
        "Clear all external peers\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_external_soft_in,
+       clear_bgp_instance_external_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " external in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_external_soft_in,
        clear_bgp_ipv6_external_in_cmd,
        "clear bgp ipv6 external WORD in",
@@ -7536,6 +8539,16 @@ ALIAS (clear_bgp_external_soft_in,
        "Clear all external peers\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_external_soft_in,
+       clear_bgp_instance_ipv6_external_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 external WORD in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all external peers\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_bgp_external_in_prefix_filter,
        clear_bgp_external_in_prefix_filter_cmd,
        "clear bgp external in prefix-filter",
@@ -7569,16 +8582,41 @@ DEFUN (clear_ip_bgp_as_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_as,
+                          BGP_CLEAR_SOFT_IN, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_as,
                        BGP_CLEAR_SOFT_IN, argv[0]);
 }
 
 ALIAS (clear_ip_bgp_as_soft_in,
-       clear_ip_bgp_as_in_cmd,
-       "clear ip bgp " CMD_AS_RANGE " in",
+       clear_ip_bgp_instance_as_soft_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
+ALIAS (clear_ip_bgp_as_soft_in,
+       clear_ip_bgp_as_in_cmd,
+       "clear ip bgp " CMD_AS_RANGE " in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_IN_STR)
+
+ALIAS (clear_ip_bgp_as_soft_in,
+       clear_ip_bgp_instance_as_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " in",
        CLEAR_STR
        IP_STR
        BGP_STR
+       BGP_INSTANCE_HELP_STR
        "Clear peers with the AS number\n"
        BGP_SOFT_IN_STR)
 
@@ -7617,6 +8655,28 @@ DEFUN (clear_ip_bgp_as_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[0]);
 }
 
+DEFUN (clear_ip_bgp_instance_as_ipv4_soft_in,
+       clear_ip_bgp_instance_as_ipv4_soft_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 (unicast|multicast) soft in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+{
+  if (strncmp (argv[3], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_as,
+                         BGP_CLEAR_SOFT_IN, argv[2]);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_as,
+                       BGP_CLEAR_SOFT_IN, argv[2]);
+}
+
 ALIAS (clear_ip_bgp_as_ipv4_soft_in,
        clear_ip_bgp_as_ipv4_in_cmd,
        "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) in",
@@ -7629,6 +8689,19 @@ ALIAS (clear_ip_bgp_as_ipv4_soft_in,
        "Address Family modifier\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_ip_bgp_instance_as_ipv4_soft_in,
+       clear_ip_bgp_instance_as_ipv4_in_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 (unicast|multicast) in",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_ip_bgp_as_ipv4_in_prefix_filter,
        clear_ip_bgp_as_ipv4_in_prefix_filter_cmd,
        "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) in prefix-filter",
@@ -7686,10 +8759,24 @@ DEFUN (clear_bgp_as_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_as,
+                          BGP_CLEAR_SOFT_IN, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_as,
                        BGP_CLEAR_SOFT_IN, argv[0]);
 }
 
+ALIAS (clear_bgp_as_soft_in,
+       clear_bgp_instance_as_soft_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_as_soft_in,
        clear_bgp_ipv6_as_soft_in_cmd,
        "clear bgp ipv6 " CMD_AS_RANGE " soft in",
@@ -7700,6 +8787,17 @@ ALIAS (clear_bgp_as_soft_in,
        BGP_SOFT_STR
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_as_soft_in,
+       clear_bgp_instance_ipv6_as_soft_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE " soft in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear peers with the AS number\n"
+       BGP_SOFT_STR
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_as_soft_in,
        clear_bgp_as_in_cmd,
        "clear bgp " CMD_AS_RANGE " in",
@@ -7708,6 +8806,15 @@ ALIAS (clear_bgp_as_soft_in,
        "Clear peers with the AS number\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_as_soft_in,
+       clear_bgp_instance_as_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_IN_STR)
+
 ALIAS (clear_bgp_as_soft_in,
        clear_bgp_ipv6_as_in_cmd,
        "clear bgp ipv6 " CMD_AS_RANGE " in",
@@ -7717,6 +8824,16 @@ ALIAS (clear_bgp_as_soft_in,
        "Clear peers with the AS number\n"
        BGP_SOFT_IN_STR)
 
+ALIAS (clear_bgp_as_soft_in,
+       clear_bgp_instance_ipv6_as_in_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE " in",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear peers with the AS number\n"
+       BGP_SOFT_IN_STR)
+
 DEFUN (clear_bgp_as_in_prefix_filter,
        clear_bgp_as_in_prefix_filter_cmd,
        "clear bgp " CMD_AS_RANGE " in prefix-filter",
@@ -7835,10 +8952,10 @@ DEFUN (clear_bgp_all_soft,
 {
   if (argc == 2)
     return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_all,
-                        BGP_CLEAR_SOFT_BOTH, argv[0]);
+                          BGP_CLEAR_SOFT_BOTH, NULL);
  
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_all,
-                       BGP_CLEAR_SOFT_BOTH, argv[0]);
+                       BGP_CLEAR_SOFT_BOTH, NULL);
 }
 
 ALIAS (clear_bgp_all_soft,
@@ -7859,6 +8976,16 @@ ALIAS (clear_bgp_all_soft,
        "Clear all peers\n"
        BGP_SOFT_STR)
 
+ALIAS (clear_bgp_all_soft,
+       clear_bgp_instance_ipv6_all_soft_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 * soft",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all peers\n"
+       BGP_SOFT_STR)
+
 DEFUN (clear_ip_bgp_peer_soft,
        clear_ip_bgp_peer_soft_cmd,
        "clear ip bgp (A.B.C.D|WORD) soft",
@@ -7869,10 +8996,25 @@ DEFUN (clear_ip_bgp_peer_soft,
        "BGP neighbor on interface to clear\n"
        BGP_SOFT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_peer,
+                          BGP_CLEAR_SOFT_BOTH, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_peer,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_peer_soft,
+       clear_ip_bgp_instance_peer_soft_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) soft",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_STR)
+
 DEFUN (clear_ip_bgp_peer_ipv4_soft,
        clear_ip_bgp_peer_ipv4_soft_cmd,
        "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) soft",
@@ -7894,6 +9036,28 @@ DEFUN (clear_ip_bgp_peer_ipv4_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+DEFUN (clear_ip_bgp_instance_peer_ipv4_soft,
+       clear_ip_bgp_instance_peer_ipv4_soft_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " (A.B.C.D|WORD) ipv4 (unicast|multicast) soft",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP neighbor on interface to clear\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       BGP_SOFT_STR)
+{
+  if (strncmp (argv[3], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_peer,
+                         BGP_CLEAR_SOFT_BOTH, argv[2]);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_peer,
+                       BGP_CLEAR_SOFT_BOTH, argv[2]);
+}
+
 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",
@@ -7920,10 +9084,25 @@ DEFUN (clear_bgp_peer_soft,
        "BGP neighbor on interface to clear\n"
        BGP_SOFT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_peer,
+                          BGP_CLEAR_SOFT_BOTH, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_peer,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+ALIAS (clear_bgp_peer_soft,
+       clear_bgp_instance_peer_soft_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " (A.B.C.D|X:X::X:X|WORD) soft",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_STR)
+
 ALIAS (clear_bgp_peer_soft,
        clear_bgp_ipv6_peer_soft_cmd,
        "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) soft",
@@ -7935,6 +9114,18 @@ ALIAS (clear_bgp_peer_soft,
        "BGP neighbor on interface to clear\n"
        BGP_SOFT_STR)
 
+ALIAS (clear_bgp_peer_soft,
+       clear_bgp_instance_ipv6_peer_soft_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 (A.B.C.D|X:X::X:X|WORD) soft",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "BGP neighbor address to clear\n"
+       "BGP IPv6 neighbor to clear\n"
+       "BGP neighbor on interface to clear\n"
+       BGP_SOFT_STR)
+
 DEFUN (clear_ip_bgp_peer_group_soft,
        clear_ip_bgp_peer_group_soft_cmd,
        "clear ip bgp peer-group WORD soft",
@@ -7945,10 +9136,25 @@ DEFUN (clear_ip_bgp_peer_group_soft,
        "BGP peer-group name\n"
        BGP_SOFT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_group,
+                          BGP_CLEAR_SOFT_BOTH, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_group,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_peer_group_soft,
+       clear_ip_bgp_instance_peer_group_soft_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD soft",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_STR)
+
 DEFUN (clear_ip_bgp_peer_group_ipv4_soft,
        clear_ip_bgp_peer_group_ipv4_soft_cmd,
        "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft",
@@ -7970,6 +9176,28 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft,
+       clear_ip_bgp_instance_peer_group_ipv4_soft_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " peer-group WORD ipv4 (unicast|multicast) soft",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR)
+{
+  if (strncmp (argv[3], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_group,
+                         BGP_CLEAR_SOFT_BOTH, argv[2]);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_group,
+                       BGP_CLEAR_SOFT_BOTH, argv[2]);
+}
+
 DEFUN (clear_bgp_peer_group_soft,
        clear_bgp_peer_group_soft_cmd,
        "clear bgp peer-group WORD soft",
@@ -7979,10 +9207,24 @@ DEFUN (clear_bgp_peer_group_soft,
        "BGP peer-group name\n"
        BGP_SOFT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_group,
+                          BGP_CLEAR_SOFT_BOTH, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_group,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+ALIAS (clear_bgp_peer_group_soft,
+       clear_bgp_instance_peer_group_soft_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " peer-group WORD soft",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_STR)
+
 ALIAS (clear_bgp_peer_group_soft,
        clear_bgp_ipv6_peer_group_soft_cmd,
        "clear bgp ipv6 peer-group WORD soft",
@@ -7993,6 +9235,17 @@ ALIAS (clear_bgp_peer_group_soft,
        "BGP peer-group name\n"
        BGP_SOFT_STR)
 
+ALIAS (clear_bgp_peer_group_soft,
+       clear_bgp_instance_ipv6_peer_group_soft_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 peer-group WORD soft",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
+       BGP_SOFT_STR)
+
 DEFUN (clear_ip_bgp_external_soft,
        clear_ip_bgp_external_soft_cmd,
        "clear ip bgp external soft",
@@ -8002,10 +9255,24 @@ DEFUN (clear_ip_bgp_external_soft,
        "Clear all external peers\n"
        BGP_SOFT_STR)
 {
+  if (argc == 2)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_external,
+                          BGP_CLEAR_SOFT_BOTH, NULL);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_external,
                        BGP_CLEAR_SOFT_BOTH, NULL);
 }
 
+ALIAS (clear_ip_bgp_external_soft,
+       clear_ip_bgp_instance_external_soft_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external soft",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_STR)
+
 DEFUN (clear_ip_bgp_external_ipv4_soft,
        clear_ip_bgp_external_ipv4_soft_cmd,
        "clear ip bgp external ipv4 (unicast|multicast) soft",
@@ -8026,6 +9293,27 @@ DEFUN (clear_ip_bgp_external_ipv4_soft,
                        BGP_CLEAR_SOFT_BOTH, NULL);
 }
 
+DEFUN (clear_ip_bgp_instance_external_ipv4_soft,
+       clear_ip_bgp_instance_external_ipv4_soft_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " external ipv4 (unicast|multicast) soft",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       "Address family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       BGP_SOFT_STR)
+{
+  if (strncmp (argv[2], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_external,
+                         BGP_CLEAR_SOFT_BOTH, NULL);
+
+  return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_external,
+                       BGP_CLEAR_SOFT_BOTH, NULL);
+}
+
 DEFUN (clear_bgp_external_soft,
        clear_bgp_external_soft_cmd,
        "clear bgp external soft",
@@ -8034,10 +9322,23 @@ DEFUN (clear_bgp_external_soft,
        "Clear all external peers\n"
        BGP_SOFT_STR)
 {
+  if (argc == 2)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_external,
+                          BGP_CLEAR_SOFT_BOTH, NULL);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_external,
                        BGP_CLEAR_SOFT_BOTH, NULL);
 }
 
+ALIAS (clear_bgp_external_soft,
+       clear_bgp_instance_external_soft_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " external soft",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear all external peers\n"
+       BGP_SOFT_STR)
+
 ALIAS (clear_bgp_external_soft,
        clear_bgp_ipv6_external_soft_cmd,
        "clear bgp ipv6 external soft",
@@ -8047,6 +9348,16 @@ ALIAS (clear_bgp_external_soft,
        "Clear all external peers\n"
        BGP_SOFT_STR)
 
+ALIAS (clear_bgp_external_soft,
+       clear_bgp_instance_ipv6_external_soft_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 external soft",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear all external peers\n"
+       BGP_SOFT_STR)
+
 DEFUN (clear_ip_bgp_as_soft,
        clear_ip_bgp_as_soft_cmd,
        "clear ip bgp " CMD_AS_RANGE " soft",
@@ -8056,10 +9367,24 @@ DEFUN (clear_ip_bgp_as_soft,
        "Clear peers with the AS number\n"
        BGP_SOFT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_UNICAST, clear_as,
+                          BGP_CLEAR_SOFT_BOTH, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_UNICAST, clear_as,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+ALIAS (clear_ip_bgp_as_soft,
+       clear_ip_bgp_instance_as_soft_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_STR)
+
 DEFUN (clear_ip_bgp_as_ipv4_soft,
        clear_ip_bgp_as_ipv4_soft_cmd,
        "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) soft",
@@ -8080,6 +9405,27 @@ DEFUN (clear_ip_bgp_as_ipv4_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+DEFUN (clear_ip_bgp_instance_as_ipv4_soft,
+       clear_ip_bgp_instance_as_ipv4_soft_cmd,
+       "clear ip bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " ipv4 (unicast|multicast) soft",
+       CLEAR_STR
+       IP_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Address Family Modifier\n"
+       BGP_SOFT_STR)
+{
+  if (strncmp (argv[3], "m", 1) == 0)
+    return bgp_clear_vty (vty, argv[1], AFI_IP, SAFI_MULTICAST, clear_as,
+                         BGP_CLEAR_SOFT_BOTH, argv[2]);
+
+  return bgp_clear_vty (vty, argv[1],AFI_IP, SAFI_UNICAST, clear_as,
+                       BGP_CLEAR_SOFT_BOTH, argv[2]);
+}
+
 DEFUN (clear_ip_bgp_as_vpnv4_soft,
        clear_ip_bgp_as_vpnv4_soft_cmd,
        "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast soft",
@@ -8103,10 +9449,23 @@ DEFUN (clear_bgp_as_soft,
        "Clear peers with the AS number\n"
        BGP_SOFT_STR)
 {
+  if (argc == 3)
+    return bgp_clear_vty (vty, argv[1], AFI_IP6, SAFI_UNICAST, clear_as,
+                          BGP_CLEAR_SOFT_BOTH, argv[2]);
+
   return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_as,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+ALIAS (clear_bgp_as_soft,
+       clear_bgp_instance_as_soft_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE " soft",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Clear peers with the AS number\n"
+       BGP_SOFT_STR)
+
 ALIAS (clear_bgp_as_soft,
        clear_bgp_ipv6_as_soft_cmd,
        "clear bgp ipv6 " CMD_AS_RANGE " soft",
@@ -8116,6 +9475,16 @@ ALIAS (clear_bgp_as_soft,
        "Clear peers with the AS number\n"
        BGP_SOFT_STR)
 
+ALIAS (clear_bgp_as_soft,
+       clear_bgp_instance_ipv6_as_soft_cmd,
+       "clear bgp " BGP_INSTANCE_CMD " ipv6 " CMD_AS_RANGE " soft",
+       CLEAR_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Clear peers with the AS number\n"
+       BGP_SOFT_STR)
+
 DEFUN (show_bgp_views,
        show_bgp_views_cmd,
        "show bgp views",
@@ -13237,57 +14606,85 @@ bgp_vty_init (void)
   install_element (ENABLE_NODE, &clear_ip_bgp_all_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_cmd);
-#ifdef HAVE_IPV6
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_cmd);
+
   install_element (ENABLE_NODE, &clear_bgp_all_cmd);
   install_element (ENABLE_NODE, &clear_bgp_instance_all_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_all_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_all_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_group_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_group_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_group_cmd);
   install_element (ENABLE_NODE, &clear_bgp_external_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_external_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_external_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_external_cmd);
   install_element (ENABLE_NODE, &clear_bgp_as_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_as_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_as_cmd);
-#endif /* HAVE_IPV6 */
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_as_cmd);
 
   /* "clear ip bgp neighbor soft in" */
   install_element (ENABLE_NODE, &clear_ip_bgp_all_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_in_prefix_filter_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_in_prefix_filter_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_ipv4_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_ipv4_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_ipv4_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_ipv4_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_ipv4_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_ipv4_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_ipv4_soft_in_cmd);
   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);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_vpnv4_in_cmd);
@@ -13295,126 +14692,198 @@ bgp_vty_init (void)
   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);
-#ifdef HAVE_IPV6
+
   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);
+  install_element (ENABLE_NODE, &clear_bgp_instance_all_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_all_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_group_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_group_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_group_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_group_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_group_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_bgp_external_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_external_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_external_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_external_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_external_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_bgp_as_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_as_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_as_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_as_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_as_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_all_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_all_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_all_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_all_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_all_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_group_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_group_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_external_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_external_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_external_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_external_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_external_in_prefix_filter_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_as_soft_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_as_soft_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_as_in_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_as_in_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_as_in_prefix_filter_cmd);
-#endif /* HAVE_IPV6 */
 
   /* clear ip bgp prefix  */
   install_element (ENABLE_NODE, &clear_ip_bgp_prefix_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_prefix_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_safi_prefix_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_safi_prefix_cmd);
 
   /* "clear ip bgp neighbor soft out" */
   install_element (ENABLE_NODE, &clear_ip_bgp_all_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_ipv4_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_ipv4_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_ipv4_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_ipv4_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_ipv4_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_out_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_ipv4_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_ipv4_soft_out_cmd);
+  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);
   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);
-#ifdef HAVE_IPV6
+
   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);
+  install_element (ENABLE_NODE, &clear_bgp_instance_all_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_group_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_group_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_group_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_group_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_external_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_external_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_external_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_external_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_as_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_as_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_as_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_as_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_all_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_all_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_all_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_all_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_group_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_group_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_external_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_external_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_external_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_external_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_as_soft_out_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_as_soft_out_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_as_out_cmd);
-#endif /* HAVE_IPV6 */
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_as_out_cmd);
 
   /* "clear ip bgp neighbor soft" */
   install_element (ENABLE_NODE, &clear_ip_bgp_all_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_soft_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_soft_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_soft_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_external_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_soft_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_as_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_ipv4_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_instance_all_ipv4_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_ipv4_soft_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_ipv4_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_group_ipv4_soft_cmd);
+  install_element (ENABLE_NODE, &clear_ip_bgp_instance_peer_group_ipv4_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_external_ipv4_soft_cmd);
+  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);
   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);
-#ifdef HAVE_IPV6
+
   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);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_soft_cmd);
   install_element (ENABLE_NODE, &clear_bgp_peer_group_soft_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_peer_group_soft_cmd);
   install_element (ENABLE_NODE, &clear_bgp_external_soft_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_external_soft_cmd);
   install_element (ENABLE_NODE, &clear_bgp_as_soft_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_as_soft_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_all_soft_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_all_soft_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_soft_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_soft_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_peer_group_soft_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_peer_group_soft_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_external_soft_cmd);
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_external_soft_cmd);
   install_element (ENABLE_NODE, &clear_bgp_ipv6_as_soft_cmd);
-#endif /* HAVE_IPV6 */
+  install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_as_soft_cmd);
 
   /* "show ip bgp summary" commands. */
   install_element (VIEW_NODE, &show_ip_bgp_summary_cmd);