bgpd: hide "router bgp" commands also under "address-family ipv4 unicast"

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Quentin Young <qlyoung@cumulusnetworks.com>

1 files changed, 832 insertions, 101 deletions

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 361ab3396..450ddad1b 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1576,6 +1576,12 @@ DEFUN (bgp_maxpaths,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_EBGP, argv[idx_number]->arg, 0, 1);
 }
 
+ALIAS_HIDDEN (bgp_maxpaths,
+              bgp_maxpaths_hidden_cmd,
+              "maximum-paths (1-255)",
+              "Forward packets over multiple paths\n"
+              "Number of paths\n")
+
 DEFUN (bgp_maxpaths_ibgp,
        bgp_maxpaths_ibgp_cmd,
        "maximum-paths ibgp (1-255)",
@@ -1587,6 +1593,13 @@ DEFUN (bgp_maxpaths_ibgp,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_IBGP, argv[idx_number]->arg, 0, 1);
 }
 
+ALIAS_HIDDEN (bgp_maxpaths_ibgp,
+              bgp_maxpaths_ibgp_hidden_cmd,
+              "maximum-paths ibgp (1-255)",
+              "Forward packets over multiple paths\n"
+              "iBGP-multipath\n"
+              "Number of paths\n")
+
 DEFUN (bgp_maxpaths_ibgp_cluster,
        bgp_maxpaths_ibgp_cluster_cmd,
        "maximum-paths ibgp (1-255) equal-cluster-length",
@@ -1600,6 +1613,14 @@ DEFUN (bgp_maxpaths_ibgp_cluster,
 				 BGP_FLAG_IBGP_MULTIPATH_SAME_CLUSTERLEN, 1);
 }
 
+ALIAS_HIDDEN (bgp_maxpaths_ibgp_cluster,
+              bgp_maxpaths_ibgp_cluster_hidden_cmd,
+              "maximum-paths ibgp (1-255) equal-cluster-length",
+              "Forward packets over multiple paths\n"
+              "iBGP-multipath\n"
+              "Number of paths\n"
+              "Match the cluster length\n")
+
 DEFUN (no_bgp_maxpaths,
        no_bgp_maxpaths_cmd,
        "no maximum-paths [(1-255)]",
@@ -1610,6 +1631,13 @@ DEFUN (no_bgp_maxpaths,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_EBGP, NULL, 0, 0);
 }
 
+ALIAS_HIDDEN (no_bgp_maxpaths,
+              no_bgp_maxpaths_hidden_cmd,
+              "no maximum-paths [(1-255)]",
+              NO_STR
+              "Forward packets over multiple paths\n"
+              "Number of paths\n")
+
 DEFUN (no_bgp_maxpaths_ibgp,
        no_bgp_maxpaths_ibgp_cmd,
        "no maximum-paths ibgp [(1-255) [equal-cluster-length]]",
@@ -1622,6 +1650,15 @@ DEFUN (no_bgp_maxpaths_ibgp,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_IBGP, NULL, 0, 0);
 }
 
+ALIAS_HIDDEN (no_bgp_maxpaths_ibgp,
+              no_bgp_maxpaths_ibgp_hidden_cmd,
+              "no maximum-paths ibgp [(1-255) [equal-cluster-length]]",
+              NO_STR
+              "Forward packets over multiple paths\n"
+              "iBGP-multipath\n"
+              "Number of paths\n"
+              "Match the cluster length\n")
+
 int
 bgp_config_write_maxpaths (struct vty *vty, struct bgp *bgp, afi_t afi,
 			   safi_t safi, int *write)
@@ -3309,6 +3346,13 @@ DEFUN (neighbor_activate,
   return CMD_SUCCESS;
 }
 
+ALIAS_HIDDEN (neighbor_activate,
+              neighbor_activate_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> activate",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Enable the Address Family for this Neighbor\n")
+
 DEFUN (no_neighbor_activate,
        no_neighbor_activate_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> activate",
@@ -3333,6 +3377,14 @@ DEFUN (no_neighbor_activate,
   return CMD_SUCCESS;
 }
 
+ALIAS_HIDDEN (no_neighbor_activate,
+              no_neighbor_activate_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> activate",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Enable the Address Family for this Neighbor\n")
+
 DEFUN (neighbor_set_peer_group,
        neighbor_set_peer_group_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
@@ -3399,6 +3451,14 @@ DEFUN (neighbor_set_peer_group,
   return bgp_vty_return (vty, ret);
 }
 
+ALIAS_HIDDEN (neighbor_set_peer_group,
+              neighbor_set_peer_group_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Member of the peer-group\n"
+              "Peer-group name\n")
+
 DEFUN (no_neighbor_set_peer_group,
        no_neighbor_set_peer_group_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
@@ -3431,6 +3491,15 @@ DEFUN (no_neighbor_set_peer_group,
   return bgp_vty_return (vty, ret);
 }
 
+ALIAS_HIDDEN (no_neighbor_set_peer_group,
+              no_neighbor_set_peer_group_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Member of the peer-group\n"
+              "Peer-group name\n")
+
 static int
 peer_flag_modify_vty (struct vty *vty, const char *ip_str,
                       u_int16_t flag, int set)
@@ -3693,6 +3762,18 @@ DEFUN (neighbor_capability_orf_prefix,
 			       bgp_node_safi (vty), flag);
 }
 
+ALIAS_HIDDEN (neighbor_capability_orf_prefix,
+              neighbor_capability_orf_prefix_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> capability orf prefix-list <both|send|receive>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Advertise capability to the peer\n"
+              "Advertise ORF capability to the peer\n"
+              "Advertise prefixlist ORF capability to this neighbor\n"
+              "Capability to SEND and RECEIVE the ORF to/from this neighbor\n"
+              "Capability to RECEIVE the ORF from this neighbor\n"
+              "Capability to SEND the ORF to this neighbor\n")
+
 DEFUN (no_neighbor_capability_orf_prefix,
        no_neighbor_capability_orf_prefix_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> capability orf prefix-list <both|send|receive>",
@@ -3723,6 +3804,19 @@ DEFUN (no_neighbor_capability_orf_prefix,
 				 bgp_node_safi (vty), flag);
 }
 
+ALIAS_HIDDEN (no_neighbor_capability_orf_prefix,
+              no_neighbor_capability_orf_prefix_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> capability orf prefix-list <both|send|receive>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Advertise capability to the peer\n"
+              "Advertise ORF capability to the peer\n"
+              "Advertise prefixlist ORF capability to this neighbor\n"
+              "Capability to SEND and RECEIVE the ORF to/from this neighbor\n"
+              "Capability to RECEIVE the ORF from this neighbor\n"
+              "Capability to SEND the ORF to this neighbor\n")
+
 /* neighbor next-hop-self. */
 DEFUN (neighbor_nexthop_self,
        neighbor_nexthop_self_cmd,
@@ -3736,6 +3830,13 @@ DEFUN (neighbor_nexthop_self,
 			       bgp_node_safi (vty), PEER_FLAG_NEXTHOP_SELF);
 }
 
+ALIAS_HIDDEN (neighbor_nexthop_self,
+              neighbor_nexthop_self_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Disable the next hop calculation for this neighbor\n")
+
 /* neighbor next-hop-self. */
 DEFUN (neighbor_nexthop_self_force,
        neighbor_nexthop_self_force_cmd,
@@ -3751,6 +3852,14 @@ DEFUN (neighbor_nexthop_self_force,
 			       PEER_FLAG_FORCE_NEXTHOP_SELF);
 }
 
+ALIAS_HIDDEN (neighbor_nexthop_self_force,
+              neighbor_nexthop_self_force_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self force",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Disable the next hop calculation for this neighbor\n"
+              "Set the next hop to self for reflected routes\n")
+
 DEFUN (no_neighbor_nexthop_self,
        no_neighbor_nexthop_self_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self",
@@ -3765,6 +3874,14 @@ DEFUN (no_neighbor_nexthop_self,
 				 PEER_FLAG_NEXTHOP_SELF);
 }
 
+ALIAS_HIDDEN (no_neighbor_nexthop_self,
+              no_neighbor_nexthop_self_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Disable the next hop calculation for this neighbor\n")
+
 DEFUN (no_neighbor_nexthop_self_force,
        no_neighbor_nexthop_self_force_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self force",
@@ -3780,6 +3897,15 @@ DEFUN (no_neighbor_nexthop_self_force,
 				 PEER_FLAG_FORCE_NEXTHOP_SELF);
 }
 
+ALIAS_HIDDEN (no_neighbor_nexthop_self_force,
+              no_neighbor_nexthop_self_force_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self force",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Disable the next hop calculation for this neighbor\n"
+              "Set the next hop to self for reflected routes\n")
+
 /* neighbor as-override */
 DEFUN (neighbor_as_override,
        neighbor_as_override_cmd,
@@ -3794,6 +3920,13 @@ DEFUN (neighbor_as_override,
                                PEER_FLAG_AS_OVERRIDE);
 }
 
+ALIAS_HIDDEN (neighbor_as_override,
+              neighbor_as_override_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> as-override",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Override ASNs in outbound updates if aspath equals remote-as\n")
+
 DEFUN (no_neighbor_as_override,
        no_neighbor_as_override_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> as-override",
@@ -3808,6 +3941,14 @@ DEFUN (no_neighbor_as_override,
                                  PEER_FLAG_AS_OVERRIDE);
 }
 
+ALIAS_HIDDEN (no_neighbor_as_override,
+              no_neighbor_as_override_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> as-override",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Override ASNs in outbound updates if aspath equals remote-as\n")
+
 /* neighbor remove-private-AS. */
 DEFUN (neighbor_remove_private_as,
        neighbor_remove_private_as_cmd,
@@ -3822,6 +3963,13 @@ DEFUN (neighbor_remove_private_as,
 			       PEER_FLAG_REMOVE_PRIVATE_AS);
 }
 
+ALIAS_HIDDEN (neighbor_remove_private_as,
+              neighbor_remove_private_as_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n")
+
 DEFUN (neighbor_remove_private_as_all,
        neighbor_remove_private_as_all_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
@@ -3836,6 +3984,14 @@ DEFUN (neighbor_remove_private_as_all,
                                PEER_FLAG_REMOVE_PRIVATE_AS_ALL);
 }
 
+ALIAS_HIDDEN (neighbor_remove_private_as_all,
+              neighbor_remove_private_as_all_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Apply to all AS numbers")
+
 DEFUN (neighbor_remove_private_as_replace_as,
        neighbor_remove_private_as_replace_as_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
@@ -3850,6 +4006,14 @@ DEFUN (neighbor_remove_private_as_replace_as,
                                PEER_FLAG_REMOVE_PRIVATE_AS_REPLACE);
 }
 
+ALIAS_HIDDEN (neighbor_remove_private_as_replace_as,
+              neighbor_remove_private_as_replace_as_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Replace private ASNs with our ASN in outbound updates\n")
+
 DEFUN (neighbor_remove_private_as_all_replace_as,
        neighbor_remove_private_as_all_replace_as_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
@@ -3865,6 +4029,15 @@ DEFUN (neighbor_remove_private_as_all_replace_as,
                                PEER_FLAG_REMOVE_PRIVATE_AS_ALL_REPLACE);
 }
 
+ALIAS_HIDDEN (neighbor_remove_private_as_all_replace_as,
+              neighbor_remove_private_as_all_replace_as_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Apply to all AS numbers\n"
+              "Replace private ASNs with our ASN in outbound updates\n")
+
 DEFUN (no_neighbor_remove_private_as,
        no_neighbor_remove_private_as_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS",
@@ -3879,6 +4052,14 @@ DEFUN (no_neighbor_remove_private_as,
 				 PEER_FLAG_REMOVE_PRIVATE_AS);
 }
 
+ALIAS_HIDDEN (no_neighbor_remove_private_as,
+              no_neighbor_remove_private_as_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n")
+
 DEFUN (no_neighbor_remove_private_as_all,
        no_neighbor_remove_private_as_all_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
@@ -3894,6 +4075,15 @@ DEFUN (no_neighbor_remove_private_as_all,
 				 PEER_FLAG_REMOVE_PRIVATE_AS_ALL);
 }
 
+ALIAS_HIDDEN (no_neighbor_remove_private_as_all,
+              no_neighbor_remove_private_as_all_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Apply to all AS numbers\n")
+
 DEFUN (no_neighbor_remove_private_as_replace_as,
        no_neighbor_remove_private_as_replace_as_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
@@ -3909,6 +4099,15 @@ DEFUN (no_neighbor_remove_private_as_replace_as,
 				 PEER_FLAG_REMOVE_PRIVATE_AS_REPLACE);
 }
 
+ALIAS_HIDDEN (no_neighbor_remove_private_as_replace_as,
+              no_neighbor_remove_private_as_replace_as_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Replace private ASNs with our ASN in outbound updates\n")
+
 DEFUN (no_neighbor_remove_private_as_all_replace_as,
        no_neighbor_remove_private_as_all_replace_as_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
@@ -3925,6 +4124,16 @@ DEFUN (no_neighbor_remove_private_as_all_replace_as,
 				 PEER_FLAG_REMOVE_PRIVATE_AS_ALL_REPLACE);
 }
 
+ALIAS_HIDDEN (no_neighbor_remove_private_as_all_replace_as,
+              no_neighbor_remove_private_as_all_replace_as_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Apply to all AS numbers\n"
+              "Replace private ASNs with our ASN in outbound updates\n")
+
 
 /* neighbor send-community. */
 DEFUN (neighbor_send_community,
@@ -3940,6 +4149,13 @@ DEFUN (neighbor_send_community,
 			       PEER_FLAG_SEND_COMMUNITY);
 }
 
+ALIAS_HIDDEN (neighbor_send_community,
+              neighbor_send_community_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> send-community",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Send Community attribute to this neighbor\n")
+
 DEFUN (no_neighbor_send_community,
        no_neighbor_send_community_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> send-community",
@@ -3954,6 +4170,14 @@ DEFUN (no_neighbor_send_community,
 				 PEER_FLAG_SEND_COMMUNITY);
 }
 
+ALIAS_HIDDEN (no_neighbor_send_community,
+              no_neighbor_send_community_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> send-community",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Send Community attribute to this neighbor\n")
+
 /* neighbor send-community extended. */
 DEFUN (neighbor_send_community_type,
        neighbor_send_community_type_cmd,
@@ -3993,6 +4217,18 @@ DEFUN (neighbor_send_community_type,
   return peer_af_flag_set_vty (vty, peer, bgp_node_afi (vty), bgp_node_safi (vty), flag);
 }
 
+ALIAS_HIDDEN (neighbor_send_community_type,
+              neighbor_send_community_type_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> send-community <both|all|extended|standard|large>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Send Community attribute to this neighbor\n"
+              "Send Standard and Extended Community attributes\n"
+              "Send Standard, Large and Extended Community attributes\n"
+              "Send Extended Community attributes\n"
+              "Send Standard Community attributes\n"
+              "Send Large Community attributes\n")
+
 DEFUN (no_neighbor_send_community_type,
        no_neighbor_send_community_type_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> send-community <both|all|extended|standard|large>",
@@ -4033,6 +4269,19 @@ DEFUN (no_neighbor_send_community_type,
 				  PEER_FLAG_SEND_LARGE_COMMUNITY));
 }
 
+ALIAS_HIDDEN (no_neighbor_send_community_type,
+              no_neighbor_send_community_type_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> send-community <both|all|extended|standard|large>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Send Community attribute to this neighbor\n"
+              "Send Standard and Extended Community attributes\n"
+              "Send Standard, Large and Extended Community attributes\n"
+              "Send Extended Community attributes\n"
+              "Send Standard Community attributes\n"
+              "Send Large Community attributes\n")
+
 /* neighbor soft-reconfig. */
 DEFUN (neighbor_soft_reconfiguration,
        neighbor_soft_reconfiguration_cmd,
@@ -4048,6 +4297,14 @@ DEFUN (neighbor_soft_reconfiguration,
 			       PEER_FLAG_SOFT_RECONFIG);
 }
 
+ALIAS_HIDDEN (neighbor_soft_reconfiguration,
+              neighbor_soft_reconfiguration_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> soft-reconfiguration inbound",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Per neighbor soft reconfiguration\n"
+              "Allow inbound soft reconfiguration for this neighbor\n")
+
 DEFUN (no_neighbor_soft_reconfiguration,
        no_neighbor_soft_reconfiguration_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> soft-reconfiguration inbound",
@@ -4063,6 +4320,15 @@ DEFUN (no_neighbor_soft_reconfiguration,
 				 PEER_FLAG_SOFT_RECONFIG);
 }
 
+ALIAS_HIDDEN (no_neighbor_soft_reconfiguration,
+              no_neighbor_soft_reconfiguration_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> soft-reconfiguration inbound",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Per neighbor soft reconfiguration\n"
+              "Allow inbound soft reconfiguration for this neighbor\n")
+
 DEFUN (neighbor_route_reflector_client,
        neighbor_route_reflector_client_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
@@ -4083,6 +4349,13 @@ DEFUN (neighbor_route_reflector_client,
 			       PEER_FLAG_REFLECTOR_CLIENT);
 }
 
+ALIAS_HIDDEN (neighbor_route_reflector_client,
+              neighbor_route_reflector_client_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Configure a neighbor as Route Reflector client\n")
+
 DEFUN (no_neighbor_route_reflector_client,
        no_neighbor_route_reflector_client_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
@@ -4097,6 +4370,14 @@ DEFUN (no_neighbor_route_reflector_client,
 				 PEER_FLAG_REFLECTOR_CLIENT);
 }
 
+ALIAS_HIDDEN (no_neighbor_route_reflector_client,
+              no_neighbor_route_reflector_client_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Configure a neighbor as Route Reflector client\n")
+
 /* neighbor route-server-client. */
 DEFUN (neighbor_route_server_client,
        neighbor_route_server_client_cmd,
@@ -4116,6 +4397,13 @@ DEFUN (neighbor_route_server_client,
                                PEER_FLAG_RSERVER_CLIENT);
 }
 
+ALIAS_HIDDEN (neighbor_route_server_client,
+              neighbor_route_server_client_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> route-server-client",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Configure a neighbor as Route Server client\n")
+
 DEFUN (no_neighbor_route_server_client,
        no_neighbor_route_server_client_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> route-server-client",
@@ -4130,6 +4418,14 @@ DEFUN (no_neighbor_route_server_client,
                                  PEER_FLAG_RSERVER_CLIENT);
 }
 
+ALIAS_HIDDEN (no_neighbor_route_server_client,
+              no_neighbor_route_server_client_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> route-server-client",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Configure a neighbor as Route Server client\n")
+
 DEFUN (neighbor_nexthop_local_unchanged,
        neighbor_nexthop_local_unchanged_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> nexthop-local unchanged",
@@ -4209,6 +4505,33 @@ DEFUN (neighbor_attr_unchanged,
   return peer_af_flag_set_vty (vty, peer, bgp_node_afi (vty), bgp_node_safi (vty), flags);
 }
 
+ALIAS_HIDDEN (neighbor_attr_unchanged,
+              neighbor_attr_unchanged_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged\
+              [<\
+                 as-path [<next-hop [med]|med [next-hop]>]|\
+                 next-hop [<as-path [med]|med [as-path]>]|\
+                 med [<as-path [next-hop]|next-hop [as-path]>]\
+              >]",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "BGP attribute is propagated unchanged to this neighbor\n"
+              "As-path attribute\n"
+              "Nexthop attribute\n"
+              "Med attribute\n"
+              "Med attribute\n"
+              "Nexthop attribute\n"
+              "Nexthop attribute\n"
+              "As-path attribute\n"
+              "Med attribute\n"
+              "Med attribute\n"
+              "As-path attribute\n"
+              "Med attribute\n"
+              "As-path attribute\n"
+              "Nexthop attribute\n"
+              "Nexthop attribute\n"
+              "As-path attribute\n")
+
 DEFUN (no_neighbor_attr_unchanged,
        no_neighbor_attr_unchanged_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged\
@@ -4260,6 +4583,34 @@ DEFUN (no_neighbor_attr_unchanged,
   return peer_af_flag_unset_vty (vty, peer, bgp_node_afi (vty), bgp_node_safi (vty), flags);
 }
 
+ALIAS_HIDDEN (no_neighbor_attr_unchanged,
+              no_neighbor_attr_unchanged_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged\
+              [<\
+                 as-path [<next-hop [med]|med [next-hop]>]|\
+                 next-hop [<as-path [med]|med [as-path]>]|\
+                 med [<as-path [next-hop]|next-hop [as-path]>]\
+              >]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "BGP attribute is propagated unchanged to this neighbor\n"
+              "As-path attribute\n"
+              "Nexthop attribute\n"
+              "Med attribute\n"
+              "Med attribute\n"
+              "Nexthop attribute\n"
+              "Nexthop attribute\n"
+              "As-path attribute\n"
+              "Med attribute\n"
+              "Med attribute\n"
+              "As-path attribute\n"
+              "Med attribute\n"
+              "As-path attribute\n"
+              "Nexthop attribute\n"
+              "Nexthop attribute\n"
+              "As-path attribute\n")
+
 
 /* EBGP multihop configuration. */
 static int
@@ -4513,6 +4864,13 @@ DEFUN (neighbor_default_originate,
 					 bgp_node_safi (vty), NULL, 1);
 }
 
+ALIAS_HIDDEN (neighbor_default_originate,
+              neighbor_default_originate_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> default-originate",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Originate default route to this neighbor\n")
+
 DEFUN (neighbor_default_originate_rmap,
        neighbor_default_originate_rmap_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> default-originate route-map WORD",
@@ -4528,6 +4886,15 @@ DEFUN (neighbor_default_originate_rmap,
 					 bgp_node_safi (vty), argv[idx_word]->arg, 1);
 }
 
+ALIAS_HIDDEN (neighbor_default_originate_rmap,
+              neighbor_default_originate_rmap_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> default-originate route-map WORD",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Originate default route to this neighbor\n"
+              "Route-map to specify criteria to originate default\n"
+              "route-map name\n")
+
 DEFUN (no_neighbor_default_originate,
        no_neighbor_default_originate_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> default-originate [route-map WORD]",
@@ -4543,6 +4910,16 @@ DEFUN (no_neighbor_default_originate,
 					 bgp_node_safi (vty), NULL, 0);
 }
 
+ALIAS_HIDDEN (no_neighbor_default_originate,
+              no_neighbor_default_originate_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> default-originate [route-map WORD]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Originate default route to this neighbor\n"
+              "Route-map to specify criteria to originate default\n"
+              "route-map name\n")
+
 
 /* Set neighbor's BGP port.  */
 static int
@@ -4652,6 +5029,14 @@ DEFUN (neighbor_weight,
                               argv[idx_number]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_weight,
+              neighbor_weight_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> weight (0-65535)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Set default weight for routes from this neighbor\n"
+              "default weight\n")
+
 DEFUN (no_neighbor_weight,
        no_neighbor_weight_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> weight [(0-65535)]",
@@ -4665,6 +5050,15 @@ DEFUN (no_neighbor_weight,
   return peer_weight_unset_vty (vty, argv[idx_peer]->arg, bgp_node_afi (vty), bgp_node_safi (vty));
 }
 
+ALIAS_HIDDEN (no_neighbor_weight,
+              no_neighbor_weight_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> weight [(0-65535)]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Set default weight for routes from this neighbor\n"
+              "default weight\n")
+
 
 /* Override capability negotiation. */
 DEFUN (neighbor_override_capability,
@@ -5050,6 +5444,18 @@ DEFUN (neighbor_distribute_list,
 				  bgp_node_safi (vty), argv[idx_acl]->arg, argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_distribute_list,
+              neighbor_distribute_list_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> distribute-list <(1-199)|(1300-2699)|WORD> <in|out>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Filter updates to/from this neighbor\n"
+              "IP access-list number\n"
+              "IP access-list number (expanded range)\n"
+              "IP Access-list name\n"
+              "Filter incoming updates\n"
+              "Filter outgoing updates\n")
+
 DEFUN (no_neighbor_distribute_list,
        no_neighbor_distribute_list_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> distribute-list <(1-199)|(1300-2699)|WORD> <in|out>",
@@ -5069,6 +5475,19 @@ DEFUN (no_neighbor_distribute_list,
 				    bgp_node_safi (vty), argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (no_neighbor_distribute_list,
+              no_neighbor_distribute_list_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> distribute-list <(1-199)|(1300-2699)|WORD> <in|out>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Filter updates to/from this neighbor\n"
+              "IP access-list number\n"
+              "IP access-list number (expanded range)\n"
+              "IP Access-list name\n"
+              "Filter incoming updates\n"
+              "Filter outgoing updates\n")
+
 /* Set prefix list to the peer. */
 static int
 peer_prefix_list_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
@@ -5134,6 +5553,16 @@ DEFUN (neighbor_prefix_list,
 				   bgp_node_safi (vty), argv[idx_word]->arg, argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_prefix_list,
+              neighbor_prefix_list_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> prefix-list WORD <in|out>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Filter updates to/from this neighbor\n"
+              "Name of a prefix list\n"
+              "Filter incoming updates\n"
+              "Filter outgoing updates\n")
+
 DEFUN (no_neighbor_prefix_list,
        no_neighbor_prefix_list_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> prefix-list WORD <in|out>",
@@ -5151,6 +5580,17 @@ DEFUN (no_neighbor_prefix_list,
 				     bgp_node_safi (vty), argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (no_neighbor_prefix_list,
+              no_neighbor_prefix_list_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> prefix-list WORD <in|out>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Filter updates to/from this neighbor\n"
+              "Name of a prefix list\n"
+              "Filter incoming updates\n"
+              "Filter outgoing updates\n")
+
 static int
 peer_aslist_set_vty (struct vty *vty, const char *ip_str,
                      afi_t afi, safi_t safi,
@@ -5216,6 +5656,16 @@ DEFUN (neighbor_filter_list,
 			      bgp_node_safi (vty), argv[idx_word]->arg, argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_filter_list,
+              neighbor_filter_list_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> filter-list WORD <in|out>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Establish BGP filters\n"
+              "AS path access-list name\n"
+              "Filter incoming routes\n"
+              "Filter outgoing routes\n")
+
 DEFUN (no_neighbor_filter_list,
        no_neighbor_filter_list_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> filter-list WORD <in|out>",
@@ -5233,6 +5683,17 @@ DEFUN (no_neighbor_filter_list,
 				bgp_node_safi (vty), argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (no_neighbor_filter_list,
+              no_neighbor_filter_list_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> filter-list WORD <in|out>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Establish BGP filters\n"
+              "AS path access-list name\n"
+              "Filter incoming routes\n"
+              "Filter outgoing routes\n")
+
 /* Set route-map to the peer. */
 static int
 peer_route_map_set_vty (struct vty *vty, const char *ip_str,
@@ -5298,6 +5759,16 @@ DEFUN (neighbor_route_map,
 				 bgp_node_safi (vty), argv[idx_word]->arg, argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_route_map,
+              neighbor_route_map_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Apply route map to neighbor\n"
+              "Name of route map\n"
+              "Apply map to incoming routes\n"
+              "Apply map to outbound routes\n")
+
 DEFUN (no_neighbor_route_map,
        no_neighbor_route_map_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
@@ -5315,6 +5786,17 @@ DEFUN (no_neighbor_route_map,
 				   bgp_node_safi (vty), argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (no_neighbor_route_map,
+              no_neighbor_route_map_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Apply route map to neighbor\n"
+              "Name of route map\n"
+              "Apply map to incoming routes\n"
+              "Apply map to outbound routes\n")
+
 /* Set unsuppress-map to the peer. */
 static int
 peer_unsuppress_map_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
@@ -5363,6 +5845,14 @@ DEFUN (neighbor_unsuppress_map,
 				      bgp_node_safi (vty), argv[idx_word]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_unsuppress_map,
+              neighbor_unsuppress_map_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> unsuppress-map WORD",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Route-map to selectively unsuppress suppressed routes\n"
+              "Name of route map\n")
+
 DEFUN (no_neighbor_unsuppress_map,
        no_neighbor_unsuppress_map_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> unsuppress-map WORD",
@@ -5377,6 +5867,15 @@ DEFUN (no_neighbor_unsuppress_map,
 					bgp_node_safi (vty));
 }
 
+ALIAS_HIDDEN (no_neighbor_unsuppress_map,
+              no_neighbor_unsuppress_map_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> unsuppress-map WORD",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Route-map to selectively unsuppress suppressed routes\n"
+              "Name of route map\n")
+
 static int
 peer_maximum_prefix_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
 			     safi_t safi, const char *num_str,
@@ -5443,6 +5942,14 @@ DEFUN (neighbor_maximum_prefix,
 				      NULL);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix,
+              neighbor_maximum_prefix_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n")
+
 DEFUN (neighbor_maximum_prefix_threshold,
        neighbor_maximum_prefix_threshold_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100)",
@@ -5460,6 +5967,15 @@ DEFUN (neighbor_maximum_prefix_threshold,
 				      NULL);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_threshold,
+              neighbor_maximum_prefix_threshold_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Threshold value (%) at which to generate a warning msg\n")
+
 DEFUN (neighbor_maximum_prefix_warning,
        neighbor_maximum_prefix_warning_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) warning-only",
@@ -5476,6 +5992,15 @@ DEFUN (neighbor_maximum_prefix_warning,
 				      NULL);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_warning,
+              neighbor_maximum_prefix_warning_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) warning-only",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Only give warning message when limit is exceeded\n")
+
 DEFUN (neighbor_maximum_prefix_threshold_warning,
        neighbor_maximum_prefix_threshold_warning_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) warning-only",
@@ -5493,6 +6018,16 @@ DEFUN (neighbor_maximum_prefix_threshold_warning,
 				      bgp_node_safi (vty), argv[idx_number]->arg, argv[idx_number_2]->arg, 1, NULL);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_threshold_warning,
+              neighbor_maximum_prefix_threshold_warning_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) warning-only",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Threshold value (%) at which to generate a warning msg\n"
+              "Only give warning message when limit is exceeded\n")
+
 DEFUN (neighbor_maximum_prefix_restart,
        neighbor_maximum_prefix_restart_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) restart (1-65535)",
@@ -5510,6 +6045,16 @@ DEFUN (neighbor_maximum_prefix_restart,
 				      bgp_node_safi (vty), argv[idx_number]->arg, NULL, 0, argv[idx_number_2]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_restart,
+              neighbor_maximum_prefix_restart_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) restart (1-65535)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Restart bgp connection after limit is exceeded\n"
+              "Restart interval in minutes")
+
 DEFUN (neighbor_maximum_prefix_threshold_restart,
        neighbor_maximum_prefix_threshold_restart_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) restart (1-65535)",
@@ -5529,6 +6074,17 @@ DEFUN (neighbor_maximum_prefix_threshold_restart,
 				      bgp_node_safi (vty), argv[idx_number]->arg, argv[idx_number_2]->arg, 0, argv[idx_number_3]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_threshold_restart,
+              neighbor_maximum_prefix_threshold_restart_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) restart (1-65535)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefixes to accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Threshold value (%) at which to generate a warning msg\n"
+              "Restart bgp connection after limit is exceeded\n"
+              "Restart interval in minutes\n")
+
 DEFUN (no_neighbor_maximum_prefix,
        no_neighbor_maximum_prefix_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix [(1-4294967295) [(1-100)] [restart (1-65535)] [warning-only]]",
@@ -5547,6 +6103,19 @@ DEFUN (no_neighbor_maximum_prefix,
 					bgp_node_safi (vty));
 }
 
+ALIAS_HIDDEN (no_neighbor_maximum_prefix,
+              no_neighbor_maximum_prefix_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix [(1-4294967295) [(1-100)] [restart (1-65535)] [warning-only]]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefixes to accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Threshold value (%) at which to generate a warning msg\n"
+              "Restart bgp connection after limit is exceeded\n"
+              "Restart interval in minutes\n"
+              "Only give warning message when limit is exceeded\n")
+
 
 /* "neighbor allowas-in" */
 DEFUN (neighbor_allowas_in,
@@ -5585,6 +6154,15 @@ DEFUN (neighbor_allowas_in,
   return bgp_vty_return (vty, ret);
 }
 
+ALIAS_HIDDEN (neighbor_allowas_in,
+              neighbor_allowas_in_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> allowas-in [<(1-10)|origin>]",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Accept as-path with my AS present in it\n"
+              "Number of occurances of AS number\n"
+              "Only accept my AS in the as-path if the route was originated in my AS\n")
+
 DEFUN (no_neighbor_allowas_in,
        no_neighbor_allowas_in_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> allowas-in [<(1-10)|origin>]",
@@ -5608,6 +6186,16 @@ DEFUN (no_neighbor_allowas_in,
   return bgp_vty_return (vty, ret);
 }
 
+ALIAS_HIDDEN (no_neighbor_allowas_in,
+              no_neighbor_allowas_in_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> allowas-in [<(1-10)|origin>]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "allow local ASN appears in aspath attribute\n"
+              "Number of occurances of AS number\n"
+              "Only accept my AS in the as-path if the route was originated in my AS\n")
+
 DEFUN (neighbor_ttl_security,
        neighbor_ttl_security_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> ttl-security hops (1-254)",
@@ -5680,6 +6268,13 @@ DEFUN (neighbor_addpath_tx_all_paths,
 			       PEER_FLAG_ADDPATH_TX_ALL_PATHS);
 }
 
+ALIAS_HIDDEN (neighbor_addpath_tx_all_paths,
+              neighbor_addpath_tx_all_paths_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-all-paths",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Use addpath to advertise all paths to a neighbor\n")
+
 DEFUN (no_neighbor_addpath_tx_all_paths,
        no_neighbor_addpath_tx_all_paths_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-all-paths",
@@ -5694,6 +6289,14 @@ DEFUN (no_neighbor_addpath_tx_all_paths,
 				 PEER_FLAG_ADDPATH_TX_ALL_PATHS);
 }
 
+ALIAS_HIDDEN (no_neighbor_addpath_tx_all_paths,
+              no_neighbor_addpath_tx_all_paths_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-all-paths",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Use addpath to advertise all paths to a neighbor\n")
+
 DEFUN (neighbor_addpath_tx_bestpath_per_as,
        neighbor_addpath_tx_bestpath_per_as_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
@@ -5713,6 +6316,13 @@ DEFUN (neighbor_addpath_tx_bestpath_per_as,
 			       PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS);
 }
 
+ALIAS_HIDDEN (neighbor_addpath_tx_bestpath_per_as,
+              neighbor_addpath_tx_bestpath_per_as_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Use addpath to advertise the bestpath per each neighboring AS\n")
+
 DEFUN (no_neighbor_addpath_tx_bestpath_per_as,
        no_neighbor_addpath_tx_bestpath_per_as_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
@@ -5727,6 +6337,14 @@ DEFUN (no_neighbor_addpath_tx_bestpath_per_as,
 				 PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS);
 }
 
+ALIAS_HIDDEN (no_neighbor_addpath_tx_bestpath_per_as,
+              no_neighbor_addpath_tx_bestpath_per_as_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Use addpath to advertise the bestpath per each neighboring AS\n")
+
 DEFUN_NOSH (address_family_ipv4_safi,
        address_family_ipv4_safi_cmd,
        "address-family ipv4 [<unicast|multicast|vpn|encap|labeled-unicast>]",
@@ -9559,6 +10177,12 @@ DEFUN (bgp_redistribute_ipv4,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4,
+              bgp_redistribute_ipv4_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD,
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD)
+
 DEFUN (bgp_redistribute_ipv4_rmap,
        bgp_redistribute_ipv4_rmap_cmd,
        "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD",
@@ -9585,6 +10209,14 @@ DEFUN (bgp_redistribute_ipv4_rmap,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_rmap,
+              bgp_redistribute_ipv4_rmap_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD",
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (bgp_redistribute_ipv4_metric,
        bgp_redistribute_ipv4_metric_cmd,
        "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295)",
@@ -9613,6 +10245,14 @@ DEFUN (bgp_redistribute_ipv4_metric,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_metric,
+              bgp_redistribute_ipv4_metric_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295)",
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Metric for redistributed routes\n"
+              "Default metric\n")
+
 DEFUN (bgp_redistribute_ipv4_rmap_metric,
        bgp_redistribute_ipv4_rmap_metric_cmd,
        "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)",
@@ -9645,6 +10285,16 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_rmap_metric,
+              bgp_redistribute_ipv4_rmap_metric_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)",
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Route map reference\n"
+              "Pointer to route-map entries\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n")
+
 DEFUN (bgp_redistribute_ipv4_metric_rmap,
        bgp_redistribute_ipv4_metric_rmap_cmd,
        "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD",
@@ -9677,6 +10327,16 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_metric_rmap,
+              bgp_redistribute_ipv4_metric_rmap_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD",
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Metric for redistributed routes\n"
+              "Default metric\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf,
        bgp_redistribute_ipv4_ospf_cmd,
        "redistribute <ospf|table> (1-65535)",
@@ -9702,6 +10362,14 @@ DEFUN (bgp_redistribute_ipv4_ospf,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf,
+              bgp_redistribute_ipv4_ospf_hidden_cmd,
+              "redistribute <ospf|table> (1-65535)",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf_rmap,
        bgp_redistribute_ipv4_ospf_rmap_cmd,
        "redistribute <ospf|table> (1-65535) route-map WORD",
@@ -9731,6 +10399,16 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf_rmap,
+              bgp_redistribute_ipv4_ospf_rmap_hidden_cmd,
+              "redistribute <ospf|table> (1-65535) route-map WORD",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf_metric,
        bgp_redistribute_ipv4_ospf_metric_cmd,
        "redistribute <ospf|table> (1-65535) metric (0-4294967295)",
@@ -9763,6 +10441,16 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf_metric,
+              bgp_redistribute_ipv4_ospf_metric_hidden_cmd,
+              "redistribute <ospf|table> (1-65535) metric (0-4294967295)",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric,
        bgp_redistribute_ipv4_ospf_rmap_metric_cmd,
        "redistribute <ospf|table> (1-65535) route-map WORD metric (0-4294967295)",
@@ -9799,6 +10487,18 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf_rmap_metric,
+              bgp_redistribute_ipv4_ospf_rmap_metric_hidden_cmd,
+              "redistribute <ospf|table> (1-65535) route-map WORD metric (0-4294967295)",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap,
        bgp_redistribute_ipv4_ospf_metric_rmap_cmd,
        "redistribute <ospf|table> (1-65535) metric (0-4294967295) route-map WORD",
@@ -9835,6 +10535,18 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf_metric_rmap,
+              bgp_redistribute_ipv4_ospf_metric_rmap_hidden_cmd,
+              "redistribute <ospf|table> (1-65535) metric (0-4294967295) route-map WORD",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (no_bgp_redistribute_ipv4_ospf,
        no_bgp_redistribute_ipv4_ospf_cmd,
        "no redistribute <ospf|table> (1-65535) [metric (0-4294967295)] [route-map WORD]",
@@ -9863,6 +10575,19 @@ DEFUN (no_bgp_redistribute_ipv4_ospf,
   return bgp_redistribute_unset (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (no_bgp_redistribute_ipv4_ospf,
+              no_bgp_redistribute_ipv4_ospf_hidden_cmd,
+              "no redistribute <ospf|table> (1-65535) [metric (0-4294967295)] [route-map WORD]",
+              NO_STR
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (no_bgp_redistribute_ipv4,
        no_bgp_redistribute_ipv4_cmd,
        "no redistribute " FRR_IP_REDIST_STR_BGPD " [metric (0-4294967295)] [route-map WORD]",
@@ -9887,6 +10612,17 @@ DEFUN (no_bgp_redistribute_ipv4,
   return bgp_redistribute_unset (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (no_bgp_redistribute_ipv4,
+              no_bgp_redistribute_ipv4_hidden_cmd,
+              "no redistribute " FRR_IP_REDIST_STR_BGPD " [metric (0-4294967295)] [route-map WORD]",
+              NO_STR
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Metric for redistributed routes\n"
+              "Default metric\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (bgp_redistribute_ipv6,
        bgp_redistribute_ipv6_cmd,
        "redistribute " FRR_IP6_REDIST_STR_BGPD,
@@ -10274,15 +11010,15 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_bgp_coalesce_time_cmd);
 
   /* "maximum-paths" commands. */
-  install_element (BGP_NODE, &bgp_maxpaths_cmd);
-  install_element (BGP_NODE, &no_bgp_maxpaths_cmd);
+  install_element (BGP_NODE, &bgp_maxpaths_hidden_cmd);
+  install_element (BGP_NODE, &no_bgp_maxpaths_hidden_cmd);
   install_element (BGP_IPV4_NODE, &bgp_maxpaths_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_maxpaths_cmd);
   install_element (BGP_IPV6_NODE, &bgp_maxpaths_cmd);
   install_element (BGP_IPV6_NODE, &no_bgp_maxpaths_cmd);
-  install_element (BGP_NODE, &bgp_maxpaths_ibgp_cmd);
-  install_element (BGP_NODE, &bgp_maxpaths_ibgp_cluster_cmd);
-  install_element (BGP_NODE, &no_bgp_maxpaths_ibgp_cmd);
+  install_element (BGP_NODE, &bgp_maxpaths_ibgp_hidden_cmd);
+  install_element (BGP_NODE, &bgp_maxpaths_ibgp_cluster_hidden_cmd);
+  install_element (BGP_NODE, &no_bgp_maxpaths_ibgp_hidden_cmd);
   install_element (BGP_IPV4_NODE, &bgp_maxpaths_ibgp_cmd);
   install_element (BGP_IPV4_NODE, &bgp_maxpaths_ibgp_cluster_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_maxpaths_ibgp_cmd);
@@ -10427,7 +11163,7 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_password_cmd);
 
   /* "neighbor activate" commands. */
-  install_element (BGP_NODE, &neighbor_activate_cmd);
+  install_element (BGP_NODE, &neighbor_activate_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_activate_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_activate_cmd);
   install_element (BGP_IPV4L_NODE, &neighbor_activate_cmd);
@@ -10441,7 +11177,7 @@ bgp_vty_init (void)
   install_element (BGP_EVPN_NODE, &neighbor_activate_cmd);
 
   /* "no neighbor activate" commands. */
-  install_element (BGP_NODE, &no_neighbor_activate_cmd);
+  install_element (BGP_NODE, &no_neighbor_activate_hidden_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_activate_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_activate_cmd);
   install_element (BGP_IPV4L_NODE, &no_neighbor_activate_cmd);
@@ -10454,40 +11190,35 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_activate_cmd);
   install_element (BGP_EVPN_NODE, &no_neighbor_activate_cmd);
 
-  /* "neighbor peer-group" set commands.
-   * Long term we should only accept this command under BGP_NODE and not all of
-   * the afi/safi sub-contexts. For now though we need to accept it for backwards
-   * compatibility. This changed when we stopped requiring that peers be assigned
-   * to their peer-group under each address-family sub-context.
-   */
+  /* "neighbor peer-group" set commands. */
   install_element (BGP_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4M_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4L_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6M_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6L_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_VPNV4_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_VPNV6_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_set_peer_group_cmd);
+  install_element (BGP_IPV4_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV4M_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV4L_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6M_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6L_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_VPNV4_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_VPNV6_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_ENCAP_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_ENCAPV6_NODE, &neighbor_set_peer_group_hidden_cmd);
 
   /* "no neighbor peer-group unset" commands. */
   install_element (BGP_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4L_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6L_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_set_peer_group_cmd);
+  install_element (BGP_IPV4_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV4L_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6M_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6L_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_VPNV6_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_ENCAP_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_ENCAPV6_NODE, &no_neighbor_set_peer_group_hidden_cmd);
 
   /* "neighbor softreconfiguration inbound" commands.*/
-  install_element (BGP_NODE, &neighbor_soft_reconfiguration_cmd);
-  install_element (BGP_NODE, &no_neighbor_soft_reconfiguration_cmd);
+  install_element (BGP_NODE, &neighbor_soft_reconfiguration_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_soft_reconfiguration_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_soft_reconfiguration_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_soft_reconfiguration_cmd);
   install_element (BGP_IPV4L_NODE, &neighbor_soft_reconfiguration_cmd);
@@ -10510,8 +11241,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_soft_reconfiguration_cmd);
 
   /* "neighbor attribute-unchanged" commands.  */
-  install_element (BGP_NODE, &neighbor_attr_unchanged_cmd);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged_cmd);
+  install_element (BGP_NODE, &neighbor_attr_unchanged_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged_cmd);
@@ -10543,8 +11274,8 @@ bgp_vty_init (void)
   install_element (BGP_IPV6_NODE, &no_neighbor_nexthop_local_unchanged_cmd);
 
   /* "neighbor next-hop-self" commands. */
-  install_element (BGP_NODE, &neighbor_nexthop_self_cmd);
-  install_element (BGP_NODE, &no_neighbor_nexthop_self_cmd);
+  install_element (BGP_NODE, &neighbor_nexthop_self_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_nexthop_self_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_nexthop_self_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_nexthop_self_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_nexthop_self_cmd);
@@ -10567,8 +11298,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_nexthop_self_cmd);
 
   /* "neighbor next-hop-self force" commands. */
-  install_element (BGP_NODE, &neighbor_nexthop_self_force_cmd);
-  install_element (BGP_NODE, &no_neighbor_nexthop_self_force_cmd);
+  install_element (BGP_NODE, &neighbor_nexthop_self_force_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_nexthop_self_force_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_nexthop_self_force_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_nexthop_self_force_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_nexthop_self_force_cmd);
@@ -10587,8 +11318,8 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &no_neighbor_nexthop_self_force_cmd);
 
   /* "neighbor as-override" commands. */
-  install_element (BGP_NODE, &neighbor_as_override_cmd);
-  install_element (BGP_NODE, &no_neighbor_as_override_cmd);
+  install_element (BGP_NODE, &neighbor_as_override_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_as_override_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_as_override_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_as_override_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_as_override_cmd);
@@ -10607,14 +11338,14 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &no_neighbor_as_override_cmd);
 
   /* "neighbor remove-private-AS" commands. */
-  install_element (BGP_NODE, &neighbor_remove_private_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_remove_private_as_cmd);
-  install_element (BGP_NODE, &neighbor_remove_private_as_all_cmd);
-  install_element (BGP_NODE, &no_neighbor_remove_private_as_all_cmd);
-  install_element (BGP_NODE, &neighbor_remove_private_as_replace_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_remove_private_as_replace_as_cmd);
-  install_element (BGP_NODE, &neighbor_remove_private_as_all_replace_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_remove_private_as_all_replace_as_cmd);
+  install_element (BGP_NODE, &neighbor_remove_private_as_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_remove_private_as_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_remove_private_as_all_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_remove_private_as_all_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_remove_private_as_replace_as_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_remove_private_as_replace_as_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_remove_private_as_all_replace_as_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_remove_private_as_all_replace_as_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_remove_private_as_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_remove_private_as_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_remove_private_as_all_cmd);
@@ -10685,10 +11416,10 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_remove_private_as_cmd);
 
   /* "neighbor send-community" commands.*/
-  install_element (BGP_NODE, &neighbor_send_community_cmd);
-  install_element (BGP_NODE, &neighbor_send_community_type_cmd);
-  install_element (BGP_NODE, &no_neighbor_send_community_cmd);
-  install_element (BGP_NODE, &no_neighbor_send_community_type_cmd);
+  install_element (BGP_NODE, &neighbor_send_community_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_send_community_type_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_send_community_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_send_community_type_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_send_community_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_send_community_type_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_send_community_cmd);
@@ -10731,8 +11462,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_send_community_type_cmd);
 
   /* "neighbor route-reflector" commands.*/
-  install_element (BGP_NODE, &neighbor_route_reflector_client_cmd);
-  install_element (BGP_NODE, &no_neighbor_route_reflector_client_cmd);
+  install_element (BGP_NODE, &neighbor_route_reflector_client_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_route_reflector_client_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_route_reflector_client_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_route_reflector_client_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_route_reflector_client_cmd);
@@ -10755,8 +11486,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_route_reflector_client_cmd);
 
   /* "neighbor route-server" commands.*/
-  install_element (BGP_NODE, &neighbor_route_server_client_cmd);
-  install_element (BGP_NODE, &no_neighbor_route_server_client_cmd);
+  install_element (BGP_NODE, &neighbor_route_server_client_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_route_server_client_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_route_server_client_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_route_server_client_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_route_server_client_cmd);
@@ -10779,8 +11510,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_route_server_client_cmd);
 
   /* "neighbor addpath-tx-all-paths" commands.*/
-  install_element (BGP_NODE, &neighbor_addpath_tx_all_paths_cmd);
-  install_element (BGP_NODE, &no_neighbor_addpath_tx_all_paths_cmd);
+  install_element (BGP_NODE, &neighbor_addpath_tx_all_paths_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_addpath_tx_all_paths_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_addpath_tx_all_paths_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_addpath_tx_all_paths_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_addpath_tx_all_paths_cmd);
@@ -10799,8 +11530,8 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &no_neighbor_addpath_tx_all_paths_cmd);
 
   /* "neighbor addpath-tx-bestpath-per-AS" commands.*/
-  install_element (BGP_NODE, &neighbor_addpath_tx_bestpath_per_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_addpath_tx_bestpath_per_as_cmd);
+  install_element (BGP_NODE, &neighbor_addpath_tx_bestpath_per_as_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_addpath_tx_bestpath_per_as_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_addpath_tx_bestpath_per_as_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_addpath_tx_bestpath_per_as_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_addpath_tx_bestpath_per_as_cmd);
@@ -10834,8 +11565,8 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_capability_enhe_cmd);
 
   /* "neighbor capability orf prefix-list" commands.*/
-  install_element (BGP_NODE, &neighbor_capability_orf_prefix_cmd);
-  install_element (BGP_NODE, &no_neighbor_capability_orf_prefix_cmd);
+  install_element (BGP_NODE, &neighbor_capability_orf_prefix_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_capability_orf_prefix_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_capability_orf_prefix_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_capability_orf_prefix_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_capability_orf_prefix_cmd);
@@ -10875,9 +11606,9 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_update_source_cmd);
 
   /* "neighbor default-originate" commands. */
-  install_element (BGP_NODE, &neighbor_default_originate_cmd);
-  install_element (BGP_NODE, &neighbor_default_originate_rmap_cmd);
-  install_element (BGP_NODE, &no_neighbor_default_originate_cmd);
+  install_element (BGP_NODE, &neighbor_default_originate_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_default_originate_rmap_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_default_originate_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_default_originate_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_default_originate_rmap_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_default_originate_cmd);
@@ -10902,8 +11633,8 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_port_cmd);
 
   /* "neighbor weight" commands. */
-  install_element (BGP_NODE, &neighbor_weight_cmd);
-  install_element (BGP_NODE, &no_neighbor_weight_cmd);
+  install_element (BGP_NODE, &neighbor_weight_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_weight_hidden_cmd);
 
   install_element (BGP_IPV4_NODE, &neighbor_weight_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_weight_cmd);
@@ -10951,8 +11682,8 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_interface_cmd);
 
   /* "neighbor distribute" commands. */
-  install_element (BGP_NODE, &neighbor_distribute_list_cmd);
-  install_element (BGP_NODE, &no_neighbor_distribute_list_cmd);
+  install_element (BGP_NODE, &neighbor_distribute_list_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_distribute_list_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_distribute_list_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_distribute_list_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_distribute_list_cmd);
@@ -10975,8 +11706,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_distribute_list_cmd);
 
   /* "neighbor prefix-list" commands. */
-  install_element (BGP_NODE, &neighbor_prefix_list_cmd);
-  install_element (BGP_NODE, &no_neighbor_prefix_list_cmd);
+  install_element (BGP_NODE, &neighbor_prefix_list_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_prefix_list_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_prefix_list_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_prefix_list_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_prefix_list_cmd);
@@ -10999,8 +11730,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_prefix_list_cmd);
 
   /* "neighbor filter-list" commands. */
-  install_element (BGP_NODE, &neighbor_filter_list_cmd);
-  install_element (BGP_NODE, &no_neighbor_filter_list_cmd);
+  install_element (BGP_NODE, &neighbor_filter_list_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_filter_list_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_filter_list_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_filter_list_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_filter_list_cmd);
@@ -11023,8 +11754,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_filter_list_cmd);
 
   /* "neighbor route-map" commands. */
-  install_element (BGP_NODE, &neighbor_route_map_cmd);
-  install_element (BGP_NODE, &no_neighbor_route_map_cmd);
+  install_element (BGP_NODE, &neighbor_route_map_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_route_map_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_route_map_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_route_map_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_route_map_cmd);
@@ -11047,8 +11778,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_route_map_cmd);
 
   /* "neighbor unsuppress-map" commands. */
-  install_element (BGP_NODE, &neighbor_unsuppress_map_cmd);
-  install_element (BGP_NODE, &no_neighbor_unsuppress_map_cmd);
+  install_element (BGP_NODE, &neighbor_unsuppress_map_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_unsuppress_map_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_unsuppress_map_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_unsuppress_map_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_unsuppress_map_cmd);
@@ -11071,13 +11802,13 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_unsuppress_map_cmd);
 
   /* "neighbor maximum-prefix" commands. */
-  install_element (BGP_NODE, &neighbor_maximum_prefix_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_warning_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_warning_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_restart_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_restart_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_maximum_prefix_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_threshold_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_warning_cmd);
@@ -11152,8 +11883,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_cmd);
 
   /* "neighbor allowas-in" */
-  install_element (BGP_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_NODE, &no_neighbor_allowas_in_cmd);
+  install_element (BGP_NODE, &neighbor_allowas_in_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_allowas_in_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_allowas_in_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_allowas_in_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_allowas_in_cmd);
@@ -11244,18 +11975,18 @@ bgp_vty_init (void)
   install_element (VIEW_NODE, &show_ip_bgp_attr_info_cmd);
 
   /* "redistribute" commands.  */
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_cmd);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_metric_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_rmap_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_cmd);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_ospf_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_rmap_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_rmap_metric_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_rmap_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_hidden_cmd);
+  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_metric_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_rmap_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_hidden_cmd);
+  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_ospf_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_rmap_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_rmap_metric_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_rmap_hidden_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_rmap_cmd);