]> git.puffer.fish Git - matthieu/frr.git/commitdiff
ALIAS removal for bgp, ospf, pim, isis, rip, ripng, lib and zebra
authorDaniel Walton <dwalton@cumulusnetworks.com>
Fri, 23 Sep 2016 03:55:26 +0000 (03:55 +0000)
committerDaniel Walton <dwalton@cumulusnetworks.com>
Fri, 23 Sep 2016 03:55:26 +0000 (03:55 +0000)
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
44 files changed:
bgpd/bgp_bfd.c
bgpd/bgp_debug.c
bgpd/bgp_route.c
bgpd/bgp_routemap.c
bgpd/bgp_vty.c
isisd/isis_routemap.c
isisd/isis_vty.c
isisd/isisd.c
lib/command.c
lib/filter.c
lib/if_rmap.c
lib/plist.c
lib/routemap.c
lib/vty.c
ospf6d/ospf6_area.c
ospf6d/ospf6_asbr.c
ospf6d/ospf6_interface.c
ospf6d/ospf6_lsa.c
ospf6d/ospf6_message.c
ospf6d/ospf6_neighbor.c
ospf6d/ospf6_spf.c
ospf6d/ospf6_top.c
ospf6d/ospf6_zebra.c
ospf6d/ospf6d.c
ospfd/ospf_bfd.c
ospfd/ospf_dump.c
ospfd/ospf_opaque.c
ospfd/ospf_ri.c
ospfd/ospf_routemap.c
ospfd/ospf_te.c
ospfd/ospf_vty.c
pimd/pim_cmd.c
ripd/rip_interface.c
ripd/rip_routemap.c
ripd/ripd.c
ripngd/ripng_interface.c
ripngd/ripng_routemap.c
ripngd/ripng_zebra.c
ripngd/ripngd.c
zebra/interface.c
zebra/router-id.c
zebra/rtadv.c
zebra/zebra_routemap.c
zebra/zebra_vty.c

index ad221d922d1d0c1928057ff8d649febf2d71635c..170b207a85185b4d2f04580024e0ba395ffded0c 100644 (file)
@@ -638,6 +638,18 @@ DEFUN_HIDDEN (neighbor_bfd_type,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "bfd " BFD_CMD_DETECT_MULT_RANGE BFD_CMD_MIN_RX_RANGE BFD_CMD_MIN_TX_RANGE,
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Disables BFD support\n"
+ *     "Detect Multiplier\n"
+ *     "Required min receive interval\n"
+ *     "Desired min transmit interval\n"
+ *
+ */
 DEFUN (no_neighbor_bfd,
        no_neighbor_bfd_cmd,
        NO_NEIGHBOR_CMD2 "bfd",
@@ -660,16 +672,6 @@ DEFUN (no_neighbor_bfd,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_neighbor_bfd,
-       no_neighbor_bfd_val_cmd,
-       NO_NEIGHBOR_CMD2 "bfd " BFD_CMD_DETECT_MULT_RANGE BFD_CMD_MIN_RX_RANGE BFD_CMD_MIN_TX_RANGE,
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Disables BFD support\n"
-       "Detect Multiplier\n"
-       "Required min receive interval\n"
-       "Desired min transmit interval\n")
 
 DEFUN_HIDDEN (no_neighbor_bfd_type,
        no_neighbor_bfd_type_cmd,
@@ -711,6 +713,5 @@ bgp_bfd_init(void)
   install_element (BGP_NODE, &neighbor_bfd_param_cmd);
   install_element (BGP_NODE, &neighbor_bfd_type_cmd);
   install_element (BGP_NODE, &no_neighbor_bfd_cmd);
-  install_element (BGP_NODE, &no_neighbor_bfd_val_cmd);
   install_element (BGP_NODE, &no_neighbor_bfd_type_cmd);
 }
index bf865afdcbd3ba98d51678ca675717466c6fb75a..e64730624aaf0cb33fff06de8b0cc16e467c8f3c 100644 (file)
@@ -1538,6 +1538,14 @@ DEFUN (debug_bgp_allow_martians,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug bgp allow-martians",
+ *     UNDEBUG_STR
+ *     BGP_STR
+ *     "BGP allow martian next hops\n"
+ *
+ */
 DEFUN (no_debug_bgp_allow_martians,
        no_debug_bgp_allow_martians_cmd,
        "no debug bgp allow-martians",
@@ -1556,12 +1564,6 @@ DEFUN (no_debug_bgp_allow_martians,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_bgp_allow_martians,
-       undebug_bgp_allow_martians_cmd,
-       "undebug bgp allow-martians",
-       UNDEBUG_STR
-       BGP_STR
-       "BGP allow martian next hops\n")
 
 /* debug bgp update-groups */
 DEFUN (debug_bgp_update_groups,
@@ -1862,7 +1864,6 @@ bgp_debug_init (void)
   install_element (ENABLE_NODE, &no_debug_bgp_zebra_cmd);
   install_element (CONFIG_NODE, &no_debug_bgp_zebra_cmd);
   install_element (ENABLE_NODE, &no_debug_bgp_allow_martians_cmd);
-  install_element (ENABLE_NODE, &undebug_bgp_allow_martians_cmd);
   install_element (CONFIG_NODE, &no_debug_bgp_allow_martians_cmd);
   install_element (ENABLE_NODE, &no_debug_bgp_update_groups_cmd);
   install_element (CONFIG_NODE, &no_debug_bgp_update_groups_cmd);
index 2472511fe777307c8940ac43f6d194deaf86b05b..37009e1ab9d514665de25289b865a8a134e1549d 100644 (file)
@@ -4442,6 +4442,22 @@ DEFUN (bgp_network_mask_natural_backdoor,
                          NULL, 1);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no network A.B.C.D/M route-map WORD",
+ *     NO_STR
+ *     "Specify a network to announce via BGP\n"
+ *     "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
+ *     "Route-map to modify the attributes\n"
+ *     "Name of the route map\n"
+ *
+ * "no network A.B.C.D/M backdoor",
+ *     NO_STR
+ *     "Specify a network to announce via BGP\n"
+ *     "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
+ *     "Specify a BGP backdoor route\n"
+ *
+ */
 DEFUN (no_bgp_network,
        no_bgp_network_cmd,
        "no network A.B.C.D/M",
@@ -4453,23 +4469,28 @@ DEFUN (no_bgp_network,
                           bgp_node_safi (vty));
 }
 
-ALIAS (no_bgp_network,
-       no_bgp_network_route_map_cmd,
-       "no network A.B.C.D/M route-map WORD",
-       NO_STR
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
 
-ALIAS (no_bgp_network,
-       no_bgp_network_backdoor_cmd,
-       "no network A.B.C.D/M backdoor",
-       NO_STR
-       "Specify a network to announce via BGP\n"
-       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
-       "Specify a BGP backdoor route\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no network A.B.C.D mask A.B.C.D backdoor",
+ *     NO_STR
+ *     "Specify a network to announce via BGP\n"
+ *     "Network number\n"
+ *     "Network mask\n"
+ *     "Network mask\n"
+ *     "Specify a BGP backdoor route\n"
+ *
+ * "no network A.B.C.D mask A.B.C.D route-map WORD",
+ *     NO_STR
+ *     "Specify a network to announce via BGP\n"
+ *     "Network number\n"
+ *     "Network mask\n"
+ *     "Network mask\n"
+ *     "Route-map to modify the attributes\n"
+ *     "Name of the route map\n"
+ *
+ */
 DEFUN (no_bgp_network_mask,
        no_bgp_network_mask_cmd,
        "no network A.B.C.D mask A.B.C.D",
@@ -4493,27 +4514,24 @@ DEFUN (no_bgp_network_mask,
                           bgp_node_safi (vty));
 }
 
-ALIAS (no_bgp_network_mask,
-       no_bgp_network_mask_route_map_cmd,
-       "no network A.B.C.D mask A.B.C.D route-map WORD",
-       NO_STR
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Network mask\n"
-       "Network mask\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
 
-ALIAS (no_bgp_network_mask,
-       no_bgp_network_mask_backdoor_cmd,
-       "no network A.B.C.D mask A.B.C.D backdoor",
-       NO_STR
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Network mask\n"
-       "Network mask\n"
-       "Specify a BGP backdoor route\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no network A.B.C.D backdoor",
+ *     NO_STR
+ *     "Specify a network to announce via BGP\n"
+ *     "Network number\n"
+ *     "Specify a BGP backdoor route\n"
+ *
+ * "no network A.B.C.D route-map WORD",
+ *     NO_STR
+ *     "Specify a network to announce via BGP\n"
+ *     "Network number\n"
+ *     "Route-map to modify the attributes\n"
+ *     "Name of the route map\n"
+ *
+ */
 DEFUN (no_bgp_network_mask_natural,
        no_bgp_network_mask_natural_cmd,
        "no network A.B.C.D",
@@ -4535,24 +4553,18 @@ DEFUN (no_bgp_network_mask_natural,
                           bgp_node_safi (vty));
 }
 
-ALIAS (no_bgp_network_mask_natural,
-       no_bgp_network_mask_natural_route_map_cmd,
-       "no network A.B.C.D route-map WORD",
-       NO_STR
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
 
-ALIAS (no_bgp_network_mask_natural,
-       no_bgp_network_mask_natural_backdoor_cmd,
-       "no network A.B.C.D backdoor",
-       NO_STR
-       "Specify a network to announce via BGP\n"
-       "Network number\n"
-       "Specify a BGP backdoor route\n")
 
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ipv6 bgp network X:X::X:X/M",
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Specify a network to announce via BGP\n"
+ *     "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
+ *
+ */
 DEFUN (ipv6_bgp_network,
        ipv6_bgp_network_cmd,
        "network X:X::X:X/M",
@@ -4575,6 +4587,23 @@ DEFUN (ipv6_bgp_network_route_map,
                         bgp_node_safi (vty), argv[3]->arg, 0);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no network X:X::X:X/M route-map WORD",
+ *     NO_STR
+ *     "Specify a network to announce via BGP\n"
+ *     "IPv6 prefix <network>/<length>\n"
+ *     "Route-map to modify the attributes\n"
+ *     "Name of the route map\n"
+ *
+ * "no ipv6 bgp network X:X::X:X/M",
+ *     NO_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Specify a network to announce via BGP\n"
+ *     "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
+ *
+ */
 DEFUN (no_ipv6_bgp_network,
        no_ipv6_bgp_network_cmd,
        "no network X:X::X:X/M",
@@ -4585,31 +4614,8 @@ DEFUN (no_ipv6_bgp_network,
   return bgp_static_unset (vty, vty->index, argv[2]->arg, AFI_IP6, bgp_node_safi(vty));
 }
 
-ALIAS (no_ipv6_bgp_network,
-       no_ipv6_bgp_network_route_map_cmd,
-       "no network X:X::X:X/M route-map WORD",
-       NO_STR
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>\n"
-       "Route-map to modify the attributes\n"
-       "Name of the route map\n")
 
-ALIAS (ipv6_bgp_network,
-       old_ipv6_bgp_network_cmd,
-       "ipv6 bgp network X:X::X:X/M",
-       IPV6_STR
-       BGP_STR
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n")
 
-ALIAS (no_ipv6_bgp_network,
-       old_no_ipv6_bgp_network_cmd,
-       "no ipv6 bgp network X:X::X:X/M",
-       NO_STR
-       IPV6_STR
-       BGP_STR
-       "Specify a network to announce via BGP\n"
-       "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n")
 #endif /* HAVE_IPV6 */
 
 /* Aggreagete address:
@@ -5313,6 +5319,15 @@ DEFUN (aggregate_address_mask_as_set,
 }
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "aggregate-address A.B.C.D/M summary-only as-set",
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate prefix\n"
+ *     "Filter more specific routes from updates\n"
+ *     "Generate AS set path information\n"
+ *
+ */
 DEFUN (aggregate_address_as_set_summary,
        aggregate_address_as_set_summary_cmd,
        "aggregate-address A.B.C.D/M as-set summary-only",
@@ -5325,14 +5340,17 @@ DEFUN (aggregate_address_as_set_summary,
                            AGGREGATE_SUMMARY_ONLY, AGGREGATE_AS_SET);
 }
 
-ALIAS (aggregate_address_as_set_summary,
-       aggregate_address_summary_as_set_cmd,
-       "aggregate-address A.B.C.D/M summary-only as-set",
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n"
-       "Generate AS set path information\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "aggregate-address A.B.C.D A.B.C.D summary-only as-set",
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate address\n"
+ *     "Aggregate mask\n"
+ *     "Filter more specific routes from updates\n"
+ *     "Generate AS set path information\n"
+ *
+ */
 DEFUN (aggregate_address_mask_as_set_summary,
        aggregate_address_mask_as_set_summary_cmd,
        "aggregate-address A.B.C.D A.B.C.D as-set summary-only",
@@ -5357,15 +5375,36 @@ DEFUN (aggregate_address_mask_as_set_summary,
                            AGGREGATE_SUMMARY_ONLY, AGGREGATE_AS_SET);
 }
 
-ALIAS (aggregate_address_mask_as_set_summary,
-       aggregate_address_mask_summary_as_set_cmd,
-       "aggregate-address A.B.C.D A.B.C.D summary-only as-set",
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Filter more specific routes from updates\n"
-       "Generate AS set path information\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no aggregate-address A.B.C.D/M summary-only",
+ *     NO_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate prefix\n"
+ *     "Filter more specific routes from updates\n"
+ *
+ * "no aggregate-address A.B.C.D/M as-set summary-only",
+ *     NO_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate prefix\n"
+ *     "Generate AS set path information\n"
+ *     "Filter more specific routes from updates\n"
+ *
+ * "no aggregate-address A.B.C.D/M summary-only as-set",
+ *     NO_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate prefix\n"
+ *     "Filter more specific routes from updates\n"
+ *     "Generate AS set path information\n"
+ *
+ * "no aggregate-address A.B.C.D/M as-set",
+ *     NO_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate prefix\n"
+ *     "Generate AS set path information\n"
+ *
+ */
 DEFUN (no_aggregate_address,
        no_aggregate_address_cmd,
        "no aggregate-address A.B.C.D/M",
@@ -5376,40 +5415,43 @@ DEFUN (no_aggregate_address,
   return bgp_aggregate_unset (vty, argv[2]->arg, AFI_IP, bgp_node_safi (vty));
 }
 
-ALIAS (no_aggregate_address,
-       no_aggregate_address_summary_only_cmd,
-       "no aggregate-address A.B.C.D/M summary-only",
-       NO_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n")
 
-ALIAS (no_aggregate_address,
-       no_aggregate_address_as_set_cmd,
-       "no aggregate-address A.B.C.D/M as-set",
-       NO_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Generate AS set path information\n")
 
-ALIAS (no_aggregate_address,
-       no_aggregate_address_as_set_summary_cmd,
-       "no aggregate-address A.B.C.D/M as-set summary-only",
-       NO_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Generate AS set path information\n"
-       "Filter more specific routes from updates\n")
 
-ALIAS (no_aggregate_address,
-       no_aggregate_address_summary_as_set_cmd,
-       "no aggregate-address A.B.C.D/M summary-only as-set",
-       NO_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n"
-       "Generate AS set path information\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no aggregate-address A.B.C.D A.B.C.D summary-only as-set",
+ *     NO_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate address\n"
+ *     "Aggregate mask\n"
+ *     "Filter more specific routes from updates\n"
+ *     "Generate AS set path information\n"
+ *
+ * "no aggregate-address A.B.C.D A.B.C.D as-set summary-only",
+ *     NO_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate address\n"
+ *     "Aggregate mask\n"
+ *     "Generate AS set path information\n"
+ *     "Filter more specific routes from updates\n"
+ *
+ * "no aggregate-address A.B.C.D A.B.C.D summary-only",
+ *     NO_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate address\n"
+ *     "Aggregate mask\n"
+ *     "Filter more specific routes from updates\n"
+ *
+ * "no aggregate-address A.B.C.D A.B.C.D as-set",
+ *     NO_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate address\n"
+ *     "Aggregate mask\n"
+ *     "Generate AS set path information\n"
+ *
+ */
 DEFUN (no_aggregate_address_mask,
        no_aggregate_address_mask_cmd,
        "no aggregate-address A.B.C.D A.B.C.D",
@@ -5432,45 +5474,20 @@ DEFUN (no_aggregate_address_mask,
   return bgp_aggregate_unset (vty, prefix_str, AFI_IP, bgp_node_safi (vty));
 }
 
-ALIAS (no_aggregate_address_mask,
-       no_aggregate_address_mask_summary_only_cmd,
-       "no aggregate-address A.B.C.D A.B.C.D summary-only",
-       NO_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Filter more specific routes from updates\n")
 
-ALIAS (no_aggregate_address_mask,
-       no_aggregate_address_mask_as_set_cmd,
-       "no aggregate-address A.B.C.D A.B.C.D as-set",
-       NO_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Generate AS set path information\n")
 
-ALIAS (no_aggregate_address_mask,
-       no_aggregate_address_mask_as_set_summary_cmd,
-       "no aggregate-address A.B.C.D A.B.C.D as-set summary-only",
-       NO_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Generate AS set path information\n"
-       "Filter more specific routes from updates\n")
 
-ALIAS (no_aggregate_address_mask,
-       no_aggregate_address_mask_summary_as_set_cmd,
-       "no aggregate-address A.B.C.D A.B.C.D summary-only as-set",
-       NO_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate address\n"
-       "Aggregate mask\n"
-       "Filter more specific routes from updates\n"
-       "Generate AS set path information\n")
 
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ipv6 bgp aggregate-address X:X::X:X/M",
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate prefix\n"
+ *
+ */
 DEFUN (ipv6_aggregate_address,
        ipv6_aggregate_address_cmd,
        "aggregate-address X:X::X:X/M",
@@ -5480,6 +5497,16 @@ DEFUN (ipv6_aggregate_address,
   return bgp_aggregate_set (vty, argv[1]->arg, AFI_IP6, SAFI_UNICAST, 0, 0);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ipv6 bgp aggregate-address X:X::X:X/M summary-only",
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate prefix\n"
+ *     "Filter more specific routes from updates\n"
+ *
+ */
 DEFUN (ipv6_aggregate_address_summary_only,
        ipv6_aggregate_address_summary_only_cmd,
        "aggregate-address X:X::X:X/M summary-only",
@@ -5491,6 +5518,16 @@ DEFUN (ipv6_aggregate_address_summary_only,
                            AGGREGATE_SUMMARY_ONLY, 0);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 bgp aggregate-address X:X::X:X/M",
+ *     NO_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate prefix\n"
+ *
+ */
 DEFUN (no_ipv6_aggregate_address,
        no_ipv6_aggregate_address_cmd,
        "no aggregate-address X:X::X:X/M",
@@ -5501,6 +5538,17 @@ DEFUN (no_ipv6_aggregate_address,
   return bgp_aggregate_unset (vty, argv[2]->arg, AFI_IP6, SAFI_UNICAST);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 bgp aggregate-address X:X::X:X/M summary-only",
+ *     NO_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Configure BGP aggregate entries\n"
+ *     "Aggregate prefix\n"
+ *     "Filter more specific routes from updates\n"
+ *
+ */
 DEFUN (no_ipv6_aggregate_address_summary_only,
        no_ipv6_aggregate_address_summary_only_cmd,
        "no aggregate-address X:X::X:X/M summary-only",
@@ -5512,41 +5560,9 @@ DEFUN (no_ipv6_aggregate_address_summary_only,
   return bgp_aggregate_unset (vty, argv[2]->arg, AFI_IP6, SAFI_UNICAST);
 }
 
-ALIAS (ipv6_aggregate_address,
-       old_ipv6_aggregate_address_cmd,
-       "ipv6 bgp aggregate-address X:X::X:X/M",
-       IPV6_STR
-       BGP_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n")
 
-ALIAS (ipv6_aggregate_address_summary_only,
-       old_ipv6_aggregate_address_summary_only_cmd,
-       "ipv6 bgp aggregate-address X:X::X:X/M summary-only",
-       IPV6_STR
-       BGP_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n")
 
-ALIAS (no_ipv6_aggregate_address,
-       old_no_ipv6_aggregate_address_cmd,
-       "no ipv6 bgp aggregate-address X:X::X:X/M",
-       NO_STR
-       IPV6_STR
-       BGP_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n")
 
-ALIAS (no_ipv6_aggregate_address_summary_only,
-       old_no_ipv6_aggregate_address_summary_only_cmd,
-       "no ipv6 bgp aggregate-address X:X::X:X/M summary-only",
-       NO_STR
-       IPV6_STR
-       BGP_STR
-       "Configure BGP aggregate entries\n"
-       "Aggregate prefix\n"
-       "Filter more specific routes from updates\n")
 #endif /* HAVE_IPV6 */
 
 /* Redistribute route treatment. */
@@ -7934,6 +7950,17 @@ DEFUN (show_ip_bgp,
   return bgp_show (vty, NULL, AFI_IP, SAFI_UNICAST, bgp_show_type_normal, NULL, use_json(argc, argv));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv4 (unicast|multicast) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_ipv4,
        show_ip_bgp_ipv4_cmd,
        "show ip bgp ipv4 (unicast|multicast) {json}",
@@ -7954,15 +7981,6 @@ DEFUN (show_ip_bgp_ipv4,
   return bgp_show (vty, NULL, AFI_IP, SAFI_UNICAST, bgp_show_type_normal, NULL, uj);
 }
 
-ALIAS (show_ip_bgp_ipv4,
-       show_bgp_ipv4_safi_cmd,
-       "show bgp ipv4 (unicast|multicast) {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "JavaScript Object Notation\n")
 
 DEFUN (show_ip_bgp_route,
        show_ip_bgp_route_cmd,
@@ -8058,6 +8076,18 @@ DEFUN (show_bgp_ipv6_prefix,
   return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json (argc,argv));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv4 (unicast|multicast) A.B.C.D {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Network in the BGP routing table to display\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_ipv4_route,
        show_ip_bgp_ipv4_route_cmd,
        "show ip bgp ipv4 (unicast|multicast) A.B.C.D {json}",
@@ -8078,16 +8108,6 @@ DEFUN (show_ip_bgp_ipv4_route,
   return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, uj);
 }
 
-ALIAS (show_ip_bgp_ipv4_route,
-       show_bgp_ipv4_safi_route_cmd,
-       "show bgp ipv4 (unicast|multicast) A.B.C.D {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Network in the BGP routing table to display\n"
-       "JavaScript Object Notation\n")
 
 DEFUN (show_ip_bgp_vpnv4_all_route,
        show_ip_bgp_vpnv4_all_route_cmd,
@@ -8232,6 +8252,18 @@ DEFUN (show_ip_bgp_prefix_pathtype,
     return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv4 (unicast|multicast) A.B.C.D/M {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_ipv4_prefix,
        show_ip_bgp_ipv4_prefix_cmd,
        "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M {json}",
@@ -8252,17 +8284,21 @@ DEFUN (show_ip_bgp_ipv4_prefix,
   return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, uj);
 }
 
-ALIAS (show_ip_bgp_ipv4_prefix,
-       show_bgp_ipv4_safi_prefix_cmd,
-       "show bgp ipv4 (unicast|multicast) A.B.C.D/M {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv4 (unicast|multicast) A.B.C.D/M (bestpath|multipath) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
+ *     "Display only the bestpath\n"
+ *     "Display only multipaths\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_ipv4_prefix_pathtype,
        show_ip_bgp_ipv4_prefix_pathtype_cmd,
        "show ip bgp ipv4 (unicast|multicast) A.B.C.D/M (bestpath|multipath) {json}",
@@ -8291,18 +8327,6 @@ DEFUN (show_ip_bgp_ipv4_prefix_pathtype,
       return bgp_show_route (vty, NULL, argv[5]->arg, AFI_IP, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj);
 }
 
-ALIAS (show_ip_bgp_ipv4_prefix_pathtype,
-       show_bgp_ipv4_safi_prefix_pathtype_cmd,
-       "show bgp ipv4 (unicast|multicast) A.B.C.D/M (bestpath|multipath) {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
-       "Display only the bestpath\n"
-       "Display only multipaths\n"
-       "JavaScript Object Notation\n")
 
 DEFUN (show_ip_bgp_vpnv4_all_prefix,
        show_ip_bgp_vpnv4_all_prefix_cmd,
@@ -8445,6 +8469,15 @@ DEFUN (show_ip_bgp_instance_prefix_pathtype,
 }
 
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp,
        show_bgp_cmd,
        "show bgp {json}",
@@ -8456,13 +8489,6 @@ DEFUN (show_bgp,
                    NULL, use_json(argc, argv));
 }
 
-ALIAS (show_bgp,
-       show_bgp_ipv6_cmd,
-       "show bgp ipv6 {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "JavaScript Object Notation\n")
 
 DEFUN (show_bgp_ipv6_safi,
        show_bgp_ipv6_safi_cmd,
@@ -8533,6 +8559,18 @@ DEFUN (show_bgp_ipv6_safi_route,
   return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, uj);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 X:X::X:X (bestpath|multipath) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Network in the BGP routing table to display\n"
+ *     "Display only the bestpath\n"
+ *     "Display only multipaths\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_route_pathtype,
        show_bgp_route_pathtype_cmd,
        "show bgp X:X::X:X (bestpath|multipath) {json}",
@@ -8550,16 +8588,6 @@ DEFUN (show_bgp_route_pathtype,
     return bgp_show_route (vty, NULL, argv[2]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj);
 }
 
-ALIAS (show_bgp_route_pathtype,
-       show_bgp_ipv6_route_pathtype_cmd,
-       "show bgp ipv6 X:X::X:X (bestpath|multipath) {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Network in the BGP routing table to display\n"
-       "Display only the bestpath\n"
-       "Display only multipaths\n"
-       "JavaScript Object Notation\n")
 
 DEFUN (show_bgp_ipv6_safi_route_pathtype,
        show_bgp_ipv6_safi_route_pathtype_cmd,
@@ -8630,6 +8658,18 @@ DEFUN (show_bgp_ipv6_safi_prefix,
   return bgp_show_route (vty, NULL, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, uj);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 X:X::X:X/M (bestpath|multipath) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "IPv6 prefix <network>/<length>\n"
+ *     "Display only the bestpath\n"
+ *     "Display only multipaths\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_prefix_pathtype,
        show_bgp_prefix_pathtype_cmd,
        "show bgp X:X::X:X/M (bestpath|multipath) {json}",
@@ -8647,16 +8687,6 @@ DEFUN (show_bgp_prefix_pathtype,
     return bgp_show_route (vty, NULL, argv[2]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj);
 }
 
-ALIAS (show_bgp_prefix_pathtype,
-       show_bgp_ipv6_prefix_pathtype_cmd,
-       "show bgp ipv6 X:X::X:X/M (bestpath|multipath) {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "IPv6 prefix <network>/<length>\n"
-       "Display only the bestpath\n"
-       "Display only multipaths\n"
-       "JavaScript Object Notation\n")
 
 DEFUN (show_bgp_ipv6_safi_prefix_pathtype,
        show_bgp_ipv6_safi_prefix_pathtype_cmd,
@@ -8698,6 +8728,16 @@ DEFUN (show_ipv6_bgp_prefix,
   return bgp_show_route (vty, NULL, argv[3]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_view,
        show_bgp_instance_cmd,
        "show bgp " BGP_INSTANCE_CMD " {json}",
@@ -8733,15 +8773,18 @@ DEFUN (show_bgp_instance_all,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_bgp_view,
-       show_bgp_instance_ipv6_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 {json}",
-       SHOW_STR
-       BGP_STR             
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "JavaScript Object Notation\n")
   
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Network in the BGP routing table to display\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_instance_route,
        show_bgp_instance_route_cmd,
        "show bgp " BGP_INSTANCE_CMD " X:X::X:X {json}",
@@ -8754,16 +8797,20 @@ DEFUN (show_bgp_instance_route,
   return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_ALL, use_json(argc, argv));
 }
 
-ALIAS (show_bgp_instance_route,
-       show_bgp_instance_ipv6_route_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Network in the BGP routing table to display\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X (bestpath|multipath) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Network in the BGP routing table to display\n"
+ *     "Display only the bestpath\n"
+ *     "Display only multipaths\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_instance_route_pathtype,
        show_bgp_instance_route_pathtype_cmd,
        "show bgp " BGP_INSTANCE_CMD " X:X::X:X (bestpath|multipath) {json}",
@@ -8782,18 +8829,18 @@ DEFUN (show_bgp_instance_route_pathtype,
     return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 0, BGP_PATH_MULTIPATH, uj);
 }
 
-ALIAS (show_bgp_instance_route_pathtype,
-       show_bgp_instance_ipv6_route_pathtype_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X (bestpath|multipath) {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Network in the BGP routing table to display\n"
-       "Display only the bestpath\n"
-       "Display only multipaths\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "IPv6 prefix <network>/<length>\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_instance_prefix,
        show_bgp_instance_prefix_cmd,
        "show bgp " BGP_INSTANCE_CMD " X:X::X:X/M {json}",
@@ -8806,16 +8853,20 @@ DEFUN (show_bgp_instance_prefix,
   return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_ALL, use_json(argc, argv));
 }
 
-ALIAS (show_bgp_instance_prefix,
-       show_bgp_instance_ipv6_prefix_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "IPv6 prefix <network>/<length>\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M (bestpath|multipath) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "IPv6 prefix <network>/<length>\n"
+ *     "Display only the bestpath\n"
+ *     "Display only multipaths\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_instance_prefix_pathtype,
        show_bgp_instance_prefix_pathtype_cmd,
        "show bgp " BGP_INSTANCE_CMD " X:X::X:X/M (bestpath|multipath) {json}",
@@ -8834,18 +8885,18 @@ DEFUN (show_bgp_instance_prefix_pathtype,
     return bgp_show_route (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, SAFI_UNICAST, NULL, 1, BGP_PATH_MULTIPATH, uj);
 }
 
-ALIAS (show_bgp_instance_prefix_pathtype,
-       show_bgp_instance_ipv6_prefix_pathtype_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M (bestpath|multipath) {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "IPv6 prefix <network>/<length>\n"
-       "Display only the bestpath\n"
-       "Display only multipaths\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 prefix-list WORD",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Display routes conforming to the prefix-list\n"
+ *     "IPv6 prefix-list name\n"
+ *
+ */
 DEFUN (show_bgp_instance_prefix_list,
        show_bgp_instance_prefix_list_cmd,
        "show bgp " BGP_INSTANCE_CMD " prefix-list WORD",
@@ -8859,16 +8910,18 @@ DEFUN (show_bgp_instance_prefix_list,
                               bgp_show_type_prefix_list);
 }
 
-ALIAS (show_bgp_instance_prefix_list,
-       show_bgp_instance_ipv6_prefix_list_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 prefix-list WORD",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Display routes conforming to the prefix-list\n"
-       "IPv6 prefix-list name\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 filter-list WORD",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Display routes conforming to the filter-list\n"
+ *     "Regular expression access list name\n"
+ *
+ */
 DEFUN (show_bgp_instance_filter_list,
        show_bgp_instance_filter_list_cmd,
        "show bgp " BGP_INSTANCE_CMD " filter-list WORD",
@@ -8882,16 +8935,18 @@ DEFUN (show_bgp_instance_filter_list,
                               bgp_show_type_filter_list);
 }
 
-ALIAS (show_bgp_instance_filter_list,
-       show_bgp_instance_ipv6_filter_list_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 filter-list WORD",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 route-map WORD",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Display routes matching the route-map\n"
+ *     "A route-map to match on\n"
+ *
+ */
 DEFUN (show_bgp_instance_route_map,
        show_bgp_instance_route_map_cmd,
        "show bgp " BGP_INSTANCE_CMD " route-map WORD",
@@ -8905,16 +8960,19 @@ DEFUN (show_bgp_instance_route_map,
                             bgp_show_type_route_map);
 }
 
-ALIAS (show_bgp_instance_route_map,
-       show_bgp_instance_ipv6_route_map_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 route-map WORD",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 community-list (<1-500>|WORD)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Display routes matching the community-list\n"
+ *     "community-list number\n"
+ *     "community-list name\n"
+ *
+ */
 DEFUN (show_bgp_instance_community_list,
        show_bgp_instance_community_list_cmd,
        "show bgp " BGP_INSTANCE_CMD " community-list (<1-500>|WORD)",
@@ -8928,17 +8986,18 @@ DEFUN (show_bgp_instance_community_list,
   return bgp_show_community_list (vty, argv[3]->arg, argv[5]->arg, 0, AFI_IP6, SAFI_UNICAST);
 }
 
-ALIAS (show_bgp_instance_community_list,
-       show_bgp_instance_ipv6_community_list_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 community-list (<1-500>|WORD)",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Display routes matching the community-list\n"
-       "community-list number\n"
-       "community-list name\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M longer-prefixes",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "IPv6 prefix <network>/<length>\n"
+ *     "Display route and more specific routes\n"
+ *
+ */
 DEFUN (show_bgp_instance_prefix_longer,
        show_bgp_instance_prefix_longer_cmd,
        "show bgp " BGP_INSTANCE_CMD " X:X::X:X/M longer-prefixes",
@@ -8952,15 +9011,6 @@ DEFUN (show_bgp_instance_prefix_longer,
                                 bgp_show_type_prefix_longer);
 }
 
-ALIAS (show_bgp_instance_prefix_longer,
-       show_bgp_instance_ipv6_prefix_longer_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 X:X::X:X/M longer-prefixes",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "IPv6 prefix <network>/<length>\n"
-       "Display route and more specific routes\n")
 
 /* old command */
 DEFUN (show_ipv6_mbgp,
@@ -9051,7 +9101,7 @@ bgp_show_regexp (struct vty *vty, int argc, struct cmd_token **argv, afi_t afi,
   return rc;
 }
 
-DEFUN (show_ip_bgp_regexp, 
+DEFUN (show_ip_bgp_regexp,
        show_ip_bgp_regexp_cmd,
        "show ip bgp regexp .LINE",
        SHOW_STR
@@ -9064,7 +9114,19 @@ DEFUN (show_ip_bgp_regexp,
                          bgp_show_type_regexp);
 }
 
-DEFUN (show_ip_bgp_flap_regexp, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening flap-statistics regexp .LINE",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display flap statistics of routes\n"
+ *     "Display routes matching the AS path regular expression\n"
+ *     "A regular-expression to match the BGP AS paths\n"
+ *
+ */
+DEFUN (show_ip_bgp_flap_regexp,
        show_ip_bgp_flap_regexp_cmd,
        "show ip bgp flap-statistics regexp .LINE",
        SHOW_STR
@@ -9078,18 +9140,8 @@ DEFUN (show_ip_bgp_flap_regexp,
                          bgp_show_type_flap_regexp);
 }
 
-ALIAS (show_ip_bgp_flap_regexp,
-       show_ip_bgp_damp_flap_regexp_cmd,
-       "show ip bgp dampening flap-statistics regexp .LINE",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the BGP AS paths\n")
 
-DEFUN (show_ip_bgp_ipv4_regexp, 
+DEFUN (show_ip_bgp_ipv4_regexp,
        show_ip_bgp_ipv4_regexp_cmd,
        "show ip bgp ipv4 (unicast|multicast) regexp .LINE",
        SHOW_STR
@@ -9110,7 +9162,17 @@ DEFUN (show_ip_bgp_ipv4_regexp,
 }
 
 #ifdef HAVE_IPV6
-DEFUN (show_bgp_regexp, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 regexp .LINE",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the AS path regular expression\n"
+ *     "A regular-expression to match the BGP AS paths\n"
+ *
+ */
+DEFUN (show_bgp_regexp,
        show_bgp_regexp_cmd,
        "show bgp regexp .LINE",
        SHOW_STR
@@ -9122,17 +9184,9 @@ DEFUN (show_bgp_regexp,
                          bgp_show_type_regexp);
 }
 
-ALIAS (show_bgp_regexp, 
-       show_bgp_ipv6_regexp_cmd,
-       "show bgp ipv6 regexp .LINE",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the AS path regular expression\n"
-       "A regular-expression to match the BGP AS paths\n")
 
 /* old command */
-DEFUN (show_ipv6_bgp_regexp, 
+DEFUN (show_ipv6_bgp_regexp,
        show_ipv6_bgp_regexp_cmd,
        "show ipv6 bgp regexp .LINE",
        SHOW_STR
@@ -9147,7 +9201,7 @@ DEFUN (show_ipv6_bgp_regexp,
 }
 
 /* old command */
-DEFUN (show_ipv6_mbgp_regexp, 
+DEFUN (show_ipv6_mbgp_regexp,
        show_ipv6_mbgp_regexp_cmd,
        "show ipv6 mbgp regexp .LINE",
        SHOW_STR
@@ -9187,7 +9241,7 @@ bgp_show_prefix_list (struct vty *vty, const char *name,
   return bgp_show (vty, bgp, afi, safi, type, plist, 0);
 }
 
-DEFUN (show_ip_bgp_prefix_list, 
+DEFUN (show_ip_bgp_prefix_list,
        show_ip_bgp_prefix_list_cmd,
        "show ip bgp prefix-list WORD",
        SHOW_STR
@@ -9214,7 +9268,19 @@ DEFUN (show_ip_bgp_instance_prefix_list,
                               bgp_show_type_prefix_list);
 }
 
-DEFUN (show_ip_bgp_flap_prefix_list, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening flap-statistics prefix-list WORD",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display flap statistics of routes\n"
+ *     "Display routes conforming to the prefix-list\n"
+ *     "IP prefix-list name\n"
+ *
+ */
+DEFUN (show_ip_bgp_flap_prefix_list,
        show_ip_bgp_flap_prefix_list_cmd,
        "show ip bgp flap-statistics prefix-list WORD",
        SHOW_STR
@@ -9228,18 +9294,8 @@ DEFUN (show_ip_bgp_flap_prefix_list,
                               bgp_show_type_flap_prefix_list);
 }
 
-ALIAS (show_ip_bgp_flap_prefix_list,
-       show_ip_bgp_damp_flap_prefix_list_cmd,
-       "show ip bgp dampening flap-statistics prefix-list WORD",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Display routes conforming to the prefix-list\n"
-       "IP prefix-list name\n")
 
-DEFUN (show_ip_bgp_ipv4_prefix_list, 
+DEFUN (show_ip_bgp_ipv4_prefix_list,
        show_ip_bgp_ipv4_prefix_list_cmd,
        "show ip bgp ipv4 (unicast|multicast) prefix-list WORD",
        SHOW_STR
@@ -9260,7 +9316,17 @@ DEFUN (show_ip_bgp_ipv4_prefix_list,
 }
 
 #ifdef HAVE_IPV6
-DEFUN (show_bgp_prefix_list, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 prefix-list WORD",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes conforming to the prefix-list\n"
+ *     "IPv6 prefix-list name\n"
+ *
+ */
+DEFUN (show_bgp_prefix_list,
        show_bgp_prefix_list_cmd,
        "show bgp prefix-list WORD",
        SHOW_STR
@@ -9272,17 +9338,9 @@ DEFUN (show_bgp_prefix_list,
                               bgp_show_type_prefix_list);
 }
 
-ALIAS (show_bgp_prefix_list, 
-       show_bgp_ipv6_prefix_list_cmd,
-       "show bgp ipv6 prefix-list WORD",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes conforming to the prefix-list\n"
-       "IPv6 prefix-list name\n")
 
 /* old command */
-DEFUN (show_ipv6_bgp_prefix_list, 
+DEFUN (show_ipv6_bgp_prefix_list,
        show_ipv6_bgp_prefix_list_cmd,
        "show ipv6 bgp prefix-list WORD",
        SHOW_STR
@@ -9297,7 +9355,7 @@ DEFUN (show_ipv6_bgp_prefix_list,
 }
 
 /* old command */
-DEFUN (show_ipv6_mbgp_prefix_list, 
+DEFUN (show_ipv6_mbgp_prefix_list,
        show_ipv6_mbgp_prefix_list_cmd,
        "show ipv6 mbgp prefix-list WORD",
        SHOW_STR
@@ -9336,7 +9394,7 @@ bgp_show_filter_list (struct vty *vty, const char *name,
   return bgp_show (vty, bgp, afi, safi, type, as_list, 0);
 }
 
-DEFUN (show_ip_bgp_filter_list, 
+DEFUN (show_ip_bgp_filter_list,
        show_ip_bgp_filter_list_cmd,
        "show ip bgp filter-list WORD",
        SHOW_STR
@@ -9363,7 +9421,19 @@ DEFUN (show_ip_bgp_instance_filter_list,
                               bgp_show_type_filter_list);
 }
 
-DEFUN (show_ip_bgp_flap_filter_list, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening flap-statistics filter-list WORD",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display flap statistics of routes\n"
+ *     "Display routes conforming to the filter-list\n"
+ *     "Regular expression access list name\n"
+ *
+ */
+DEFUN (show_ip_bgp_flap_filter_list,
        show_ip_bgp_flap_filter_list_cmd,
        "show ip bgp flap-statistics filter-list WORD",
        SHOW_STR
@@ -9377,18 +9447,8 @@ DEFUN (show_ip_bgp_flap_filter_list,
                               bgp_show_type_flap_filter_list);
 }
 
-ALIAS (show_ip_bgp_flap_filter_list, 
-       show_ip_bgp_damp_flap_filter_list_cmd,
-       "show ip bgp dampening flap-statistics filter-list WORD",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
 
-DEFUN (show_ip_bgp_ipv4_filter_list, 
+DEFUN (show_ip_bgp_ipv4_filter_list,
        show_ip_bgp_ipv4_filter_list_cmd,
        "show ip bgp ipv4 (unicast|multicast) filter-list WORD",
        SHOW_STR
@@ -9409,7 +9469,17 @@ DEFUN (show_ip_bgp_ipv4_filter_list,
 }
 
 #ifdef HAVE_IPV6
-DEFUN (show_bgp_filter_list, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 filter-list WORD",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes conforming to the filter-list\n"
+ *     "Regular expression access list name\n"
+ *
+ */
+DEFUN (show_bgp_filter_list,
        show_bgp_filter_list_cmd,
        "show bgp filter-list WORD",
        SHOW_STR
@@ -9421,17 +9491,9 @@ DEFUN (show_bgp_filter_list,
                               bgp_show_type_filter_list);
 }
 
-ALIAS (show_bgp_filter_list, 
-       show_bgp_ipv6_filter_list_cmd,
-       "show bgp ipv6 filter-list WORD",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes conforming to the filter-list\n"
-       "Regular expression access list name\n")
 
 /* old command */
-DEFUN (show_ipv6_bgp_filter_list, 
+DEFUN (show_ipv6_bgp_filter_list,
        show_ipv6_bgp_filter_list_cmd,
        "show ipv6 bgp filter-list WORD",
        SHOW_STR
@@ -9446,7 +9508,7 @@ DEFUN (show_ipv6_bgp_filter_list,
 }
 
 /* old command */
-DEFUN (show_ipv6_mbgp_filter_list, 
+DEFUN (show_ipv6_mbgp_filter_list,
        show_ipv6_mbgp_filter_list_cmd,
        "show ipv6 mbgp filter-list WORD",
        SHOW_STR
@@ -9558,7 +9620,7 @@ bgp_show_route_map (struct vty *vty, const char *name,
   return bgp_show (vty, bgp, afi, safi, type, rmap, 0);
 }
 
-DEFUN (show_ip_bgp_route_map, 
+DEFUN (show_ip_bgp_route_map,
        show_ip_bgp_route_map_cmd,
        "show ip bgp route-map WORD",
        SHOW_STR
@@ -9585,7 +9647,19 @@ DEFUN (show_ip_bgp_instance_route_map,
                             bgp_show_type_route_map);
 }
 
-DEFUN (show_ip_bgp_flap_route_map, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening flap-statistics route-map WORD",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display flap statistics of routes\n"
+ *     "Display routes matching the route-map\n"
+ *     "A route-map to match on\n"
+ *
+ */
+DEFUN (show_ip_bgp_flap_route_map,
        show_ip_bgp_flap_route_map_cmd,
        "show ip bgp flap-statistics route-map WORD",
        SHOW_STR
@@ -9599,18 +9673,8 @@ DEFUN (show_ip_bgp_flap_route_map,
                             bgp_show_type_flap_route_map);
 }
 
-ALIAS (show_ip_bgp_flap_route_map, 
-       show_ip_bgp_damp_flap_route_map_cmd,
-       "show ip bgp dampening flap-statistics route-map WORD",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
 
-DEFUN (show_ip_bgp_ipv4_route_map, 
+DEFUN (show_ip_bgp_ipv4_route_map,
        show_ip_bgp_ipv4_route_map_cmd,
        "show ip bgp ipv4 (unicast|multicast) route-map WORD",
        SHOW_STR
@@ -9630,7 +9694,17 @@ DEFUN (show_ip_bgp_ipv4_route_map,
                             bgp_show_type_route_map);
 }
 
-DEFUN (show_bgp_route_map, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 route-map WORD",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the route-map\n"
+ *     "A route-map to match on\n"
+ *
+ */
+DEFUN (show_bgp_route_map,
        show_bgp_route_map_cmd,
        "show bgp route-map WORD",
        SHOW_STR
@@ -9642,14 +9716,6 @@ DEFUN (show_bgp_route_map,
                             bgp_show_type_route_map);
 }
 
-ALIAS (show_bgp_route_map, 
-       show_bgp_ipv6_route_map_cmd,
-       "show bgp ipv6 route-map WORD",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the route-map\n"
-       "A route-map to match on\n")
 
 DEFUN (show_ip_bgp_cidr_only,
        show_ip_bgp_cidr_only_cmd,
@@ -9663,6 +9729,17 @@ DEFUN (show_ip_bgp_cidr_only,
                     bgp_show_type_cidr_only, NULL, 0);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening flap-statistics cidr-only",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display flap statistics of routes\n"
+ *     "Display only routes with non-natural netmasks\n"
+ *
+ */
 DEFUN (show_ip_bgp_flap_cidr_only,
        show_ip_bgp_flap_cidr_only_cmd,
        "show ip bgp flap-statistics cidr-only",
@@ -9676,15 +9753,6 @@ DEFUN (show_ip_bgp_flap_cidr_only,
                   bgp_show_type_flap_cidr_only, NULL, 0);
 }
 
-ALIAS (show_ip_bgp_flap_cidr_only,
-       show_ip_bgp_damp_flap_cidr_only_cmd,
-       "show ip bgp dampening flap-statistics cidr-only",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Display only routes with non-natural netmasks\n")
 
 DEFUN (show_ip_bgp_ipv4_cidr_only,
        show_ip_bgp_ipv4_cidr_only_cmd,
@@ -9737,6 +9805,15 @@ DEFUN (show_ip_bgp_ipv4_community_all,
 }
 
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 community",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the communities\n"
+ *
+ */
 DEFUN (show_bgp_community_all,
        show_bgp_community_all_cmd,
        "show bgp community",
@@ -9748,13 +9825,6 @@ DEFUN (show_bgp_community_all,
                   bgp_show_type_community_all, NULL, 0);
 }
 
-ALIAS (show_bgp_community_all,
-       show_bgp_ipv6_community_all_cmd,
-       "show bgp ipv6 community",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the communities\n")
 
 /* old command */
 DEFUN (show_ipv6_bgp_community_all,
@@ -9848,6 +9918,63 @@ bgp_show_community (struct vty *vty, const char *view_name, int argc,
                    bgp_show_type_community), com, 0);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ */
 DEFUN (show_ip_bgp_community,
        show_ip_bgp_community_cmd,
        "show ip bgp community (AA:NN|local-AS|no-advertise|no-export)",
@@ -9863,66 +9990,75 @@ DEFUN (show_ip_bgp_community,
   return bgp_show_community (vty, NULL, argc, argv, 0, AFI_IP, SAFI_UNICAST);
 }
 
-ALIAS (show_ip_bgp_community,
-       show_ip_bgp_community2_cmd,
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
        
-ALIAS (show_ip_bgp_community,
-       show_ip_bgp_community3_cmd,
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
        
-ALIAS (show_ip_bgp_community,
-       show_ip_bgp_community4_cmd,
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ */
 DEFUN (show_ip_bgp_ipv4_community,
        show_ip_bgp_ipv4_community_cmd,
        "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export)",
@@ -9944,114 +10080,117 @@ DEFUN (show_ip_bgp_ipv4_community,
   return bgp_show_community (vty, NULL, argc, argv, 0, AFI_IP, SAFI_UNICAST);
 }
 
-ALIAS (show_ip_bgp_ipv4_community,
-       show_ip_bgp_ipv4_community2_cmd,
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+       
+       
+
+DEFUN (show_bgp_instance_afi_safi_community_all,
+       show_bgp_instance_afi_safi_community_all_cmd,
+       "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community",
        SHOW_STR
-       IP_STR
        BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
        "Address family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-       
-ALIAS (show_ip_bgp_ipv4_community,
-       show_ip_bgp_ipv4_community3_cmd,
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-       
-ALIAS (show_ip_bgp_ipv4_community,
-       show_ip_bgp_ipv4_community4_cmd,
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-DEFUN (show_bgp_instance_afi_safi_community_all,
-       show_bgp_instance_afi_safi_community_all_cmd,
-       "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n")
-{
-  int afi;
-  int safi;
-  struct bgp *bgp;
-
-  /* BGP structure lookup. */
-  bgp = bgp_lookup_by_name (argv[3]->arg);
-  if (bgp == NULL)
-    {
-      vty_out (vty, "Can't find BGP instance %s%s", argv[3]->arg, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  afi = (strncmp (argv[4]->arg, "ipv6", 4) == 0) ? AFI_IP6 : AFI_IP;
-  safi = (strncmp (argv[5]->arg, "m", 1) == 0) ? SAFI_MULTICAST : SAFI_UNICAST;
-  return bgp_show (vty, bgp, afi, safi, bgp_show_type_community_all, NULL, 0);
-}
-
-DEFUN (show_bgp_instance_afi_safi_community,
-       show_bgp_instance_afi_safi_community_cmd,
-       "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Address family\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
+       "Display routes matching the communities\n")
+{
+  int afi;
+  int safi;
+  struct bgp *bgp;
+
+  /* BGP structure lookup. */
+  bgp = bgp_lookup_by_name (argv[3]->arg);
+  if (bgp == NULL)
+    {
+      vty_out (vty, "Can't find BGP instance %s%s", argv[3]->arg, VTY_NEWLINE);
+      return CMD_WARNING;
+    }
+
+  afi = (strncmp (argv[4]->arg, "ipv6", 4) == 0) ? AFI_IP6 : AFI_IP;
+  safi = (strncmp (argv[5]->arg, "m", 1) == 0) ? SAFI_MULTICAST : SAFI_UNICAST;
+  return bgp_show (vty, bgp, afi, safi, bgp_show_type_community_all, NULL, 0);
+}
+
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Address family\n"
+ *     "Address family modifier\n"
+ *     "Address family modifier\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Address family\n"
+ *     "Address family modifier\n"
+ *     "Address family modifier\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Address family\n"
+ *     "Address family modifier\n"
+ *     "Address family modifier\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ */
+DEFUN (show_bgp_instance_afi_safi_community,
+       show_bgp_instance_afi_safi_community_cmd,
+       "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export)",
+       SHOW_STR
+       BGP_STR
+       BGP_INSTANCE_HELP_STR
+       "Address family\n"
+       "Address family\n"
+       "Address family modifier\n"
+       "Address family modifier\n"
        "Display routes matching the communities\n"
        COMMUNITY_AANN_STR
        "Do not send outside local AS (well-known community)\n"
@@ -10066,78 +10205,69 @@ DEFUN (show_bgp_instance_afi_safi_community,
   return bgp_show_community (vty, argv[3]->arg, argc, argv, 0, afi, safi);
 }
 
-ALIAS (show_bgp_instance_afi_safi_community,
-       show_bgp_instance_afi_safi_community2_cmd,
-       "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Address family\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
-ALIAS (show_bgp_instance_afi_safi_community,
-       show_bgp_instance_afi_safi_community3_cmd,
-       "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Address family\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
-ALIAS (show_bgp_instance_afi_safi_community,
-       show_bgp_instance_afi_safi_community4_cmd,
-       "show bgp " BGP_INSTANCE_CMD " (ipv4|ipv6) (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Address family\n"
-       "Address family modifier\n"
-       "Address family modifier\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ */
 DEFUN (show_ip_bgp_community_exact,
        show_ip_bgp_community_exact_cmd,
        "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) exact-match",
@@ -10154,69 +10284,78 @@ DEFUN (show_ip_bgp_community_exact,
   return bgp_show_community (vty, NULL, argc, argv, 1, AFI_IP, SAFI_UNICAST);
 }
 
-ALIAS (show_ip_bgp_community_exact,
-       show_ip_bgp_community2_exact_cmd,
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
-ALIAS (show_ip_bgp_community_exact,
-       show_ip_bgp_community3_exact_cmd,
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
-ALIAS (show_ip_bgp_community_exact,
-       show_ip_bgp_community4_exact_cmd,
-       "show ip bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ */
 DEFUN (show_ip_bgp_ipv4_community_exact,
        show_ip_bgp_ipv4_community_exact_cmd,
        "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) exact-match",
@@ -10239,230 +10378,214 @@ DEFUN (show_ip_bgp_ipv4_community_exact,
   return bgp_show_community (vty, NULL, argc, argv, 1, AFI_IP, SAFI_UNICAST);
 }
 
-ALIAS (show_ip_bgp_ipv4_community_exact,
-       show_ip_bgp_ipv4_community2_exact_cmd,
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+
+       
+
+#ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ */
+DEFUN (show_bgp_community,
+       show_bgp_community_cmd,
+       "show bgp community (AA:NN|local-AS|no-advertise|no-export)",
        SHOW_STR
-       IP_STR
        BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
        "Display routes matching the communities\n"
        COMMUNITY_AANN_STR
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-ALIAS (show_ip_bgp_ipv4_community_exact,
-       show_ip_bgp_ipv4_community3_exact_cmd,
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-       
-ALIAS (show_ip_bgp_ipv4_community_exact,
-       show_ip_bgp_ipv4_community4_exact_cmd,
-       "show ip bgp ipv4 (unicast|multicast) community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-#ifdef HAVE_IPV6
-DEFUN (show_bgp_community,
-       show_bgp_community_cmd,
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-{
-  return bgp_show_community (vty, NULL, argc, argv, 0, AFI_IP6, SAFI_UNICAST);
-}
-
-ALIAS (show_bgp_community,
-       show_bgp_ipv6_community_cmd,
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-ALIAS (show_bgp_community,
-       show_bgp_community2_cmd,
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-ALIAS (show_bgp_community,
-       show_bgp_ipv6_community2_cmd,
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-       
-ALIAS (show_bgp_community,
-       show_bgp_community3_cmd,
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-ALIAS (show_bgp_community,
-       show_bgp_ipv6_community3_cmd,
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-ALIAS (show_bgp_community,
-       show_bgp_community4_cmd,
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-ALIAS (show_bgp_community,
-       show_bgp_ipv6_community4_cmd,
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
-
-/* old command */
-DEFUN (show_ipv6_bgp_community,
-       show_ipv6_bgp_community_cmd,
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Display routes matching the communities\n"
+       "Do not export to next AS (well-known community)\n")
+{
+  return bgp_show_community (vty, NULL, argc, argv, 0, AFI_IP6, SAFI_UNICAST);
+}
+
+
+
+       
+
+
+
+
+/* old command */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ */
+DEFUN (show_ipv6_bgp_community,
+       show_ipv6_bgp_community_cmd,
+       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export)",
+       SHOW_STR
+       IPV6_STR
+       BGP_STR
+       "Display routes matching the communities\n"
        COMMUNITY_AANN_STR
        "Do not send outside local AS (well-known community)\n"
        "Do not advertise to any peer (well-known community)\n"
@@ -10473,68 +10596,136 @@ DEFUN (show_ipv6_bgp_community,
 }
 
 /* old command */
-ALIAS (show_ipv6_bgp_community,
-       show_ipv6_bgp_community2_cmd,
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
 /* old command */
-ALIAS (show_ipv6_bgp_community,
-       show_ipv6_bgp_community3_cmd,
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
 /* old command */
-ALIAS (show_ipv6_bgp_community,
-       show_ipv6_bgp_community4_cmd,
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ */
 DEFUN (show_bgp_community_exact,
        show_bgp_community_exact_cmd,
        "show bgp community (AA:NN|local-AS|no-advertise|no-export) exact-match",
@@ -10550,143 +10741,74 @@ DEFUN (show_bgp_community_exact,
   return bgp_show_community (vty, NULL, argc, argv, 1, AFI_IP6, SAFI_UNICAST);
 }
 
-ALIAS (show_bgp_community_exact,
-       show_bgp_ipv6_community_exact_cmd,
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
-ALIAS (show_bgp_community_exact,
-       show_bgp_community2_exact_cmd,
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
-ALIAS (show_bgp_community_exact,
-       show_bgp_ipv6_community2_exact_cmd,
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
-ALIAS (show_bgp_community_exact,
-       show_bgp_community3_exact_cmd,
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
-ALIAS (show_bgp_community_exact,
-       show_bgp_ipv6_community3_exact_cmd,
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
-ALIAS (show_bgp_community_exact,
-       show_bgp_community4_exact_cmd,
-       "show bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
  
-ALIAS (show_bgp_community_exact,
-       show_bgp_ipv6_community4_exact_cmd,
-       "show bgp ipv6 community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
 /* old command */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ */
 DEFUN (show_ipv6_bgp_community_exact,
        show_ipv6_bgp_community_exact_cmd,
        "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) exact-match",
@@ -10699,78 +10821,75 @@ DEFUN (show_ipv6_bgp_community_exact,
        "Do not advertise to any peer (well-known community)\n"
        "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
-{
-  bgp_show_ipv6_bgp_deprecate_warning(vty);
-  return bgp_show_community (vty, NULL, argc, argv, 1, AFI_IP6, SAFI_UNICAST);
-}
-
-/* old command */
-ALIAS (show_ipv6_bgp_community_exact,
-       show_ipv6_bgp_community2_exact_cmd,
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-/* old command */
-ALIAS (show_ipv6_bgp_community_exact,
-       show_ipv6_bgp_community3_exact_cmd,
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
-
-/* old command */
-ALIAS (show_ipv6_bgp_community_exact,
-       show_ipv6_bgp_community4_exact_cmd,
-       "show ipv6 bgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
+{
+  bgp_show_ipv6_bgp_deprecate_warning(vty);
+  return bgp_show_community (vty, NULL, argc, argv, 1, AFI_IP6, SAFI_UNICAST);
+}
+
+/* old command */
+
+/* old command */
+
+/* old command */
  
 /* old command */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     MBGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     MBGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ * "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     MBGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *
+ */
 DEFUN (show_ipv6_mbgp_community,
        show_ipv6_mbgp_community_cmd,
        "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export)",
@@ -10788,69 +10907,72 @@ DEFUN (show_ipv6_mbgp_community,
 }
 
 /* old command */
-ALIAS (show_ipv6_mbgp_community,
-       show_ipv6_mbgp_community2_cmd,
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IPV6_STR
-       MBGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
 /* old command */
-ALIAS (show_ipv6_mbgp_community,
-       show_ipv6_mbgp_community3_cmd,
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IPV6_STR
-       MBGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
 /* old command */
-ALIAS (show_ipv6_mbgp_community,
-       show_ipv6_mbgp_community4_cmd,
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export)",
-       SHOW_STR
-       IPV6_STR
-       MBGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n")
 
 /* old command */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     MBGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     MBGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ * "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     MBGP_STR
+ *     "Display routes matching the communities\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     COMMUNITY_AANN_STR
+ *     "Do not send outside local AS (well-known community)\n"
+ *     "Do not advertise to any peer (well-known community)\n"
+ *     "Do not export to next AS (well-known community)\n"
+ *     "Exact match of the communities"
+ *
+ */
 DEFUN (show_ipv6_mbgp_community_exact,
        show_ipv6_mbgp_community_exact_cmd,
        "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) exact-match",
@@ -10869,70 +10991,10 @@ DEFUN (show_ipv6_mbgp_community_exact,
 }
 
 /* old command */
-ALIAS (show_ipv6_mbgp_community_exact,
-       show_ipv6_mbgp_community2_exact_cmd,
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IPV6_STR
-       MBGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
 /* old command */
-ALIAS (show_ipv6_mbgp_community_exact,
-       show_ipv6_mbgp_community3_exact_cmd,
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IPV6_STR
-       MBGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 
 /* old command */
-ALIAS (show_ipv6_mbgp_community_exact,
-       show_ipv6_mbgp_community4_exact_cmd,
-       "show ipv6 mbgp community (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) (AA:NN|local-AS|no-advertise|no-export) exact-match",
-       SHOW_STR
-       IPV6_STR
-       MBGP_STR
-       "Display routes matching the communities\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       COMMUNITY_AANN_STR
-       "Do not send outside local AS (well-known community)\n"
-       "Do not advertise to any peer (well-known community)\n"
-       "Do not export to next AS (well-known community)\n"
-       "Exact match of the communities")
 #endif /* HAVE_IPV6 */
 
 static int
@@ -11043,6 +11105,17 @@ DEFUN (show_ip_bgp_ipv4_community_list_exact,
 }
 
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 community-list (<1-500>|WORD)",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the community-list\n"
+ *     "community-list number\n"
+ *     "community-list name\n"
+ *
+ */
 DEFUN (show_bgp_community_list,
        show_bgp_community_list_cmd,
        "show bgp community-list (<1-500>|WORD)",
@@ -11055,15 +11128,6 @@ DEFUN (show_bgp_community_list,
   return bgp_show_community_list (vty, NULL, argv[3]->arg, 0, AFI_IP6, SAFI_UNICAST);
 }
 
-ALIAS (show_bgp_community_list,
-       show_bgp_ipv6_community_list_cmd,
-       "show bgp ipv6 community-list (<1-500>|WORD)",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the community-list\n"
-       "community-list number\n"
-       "community-list name\n")
 
 /* old command */
 DEFUN (show_ipv6_bgp_community_list,
@@ -11093,6 +11157,18 @@ DEFUN (show_ipv6_mbgp_community_list,
   return bgp_show_community_list (vty, NULL, argv[4]->arg, 0, AFI_IP6, SAFI_MULTICAST);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 community-list (<1-500>|WORD) exact-match",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Display routes matching the community-list\n"
+ *     "community-list number\n"
+ *     "community-list name\n"
+ *     "Exact match of the communities\n"
+ *
+ */
 DEFUN (show_bgp_community_list_exact,
        show_bgp_community_list_exact_cmd,
        "show bgp community-list (<1-500>|WORD) exact-match",
@@ -11106,16 +11182,6 @@ DEFUN (show_bgp_community_list_exact,
   return bgp_show_community_list (vty, NULL, argv[3]->arg, 1, AFI_IP6, SAFI_UNICAST);
 }
 
-ALIAS (show_bgp_community_list_exact,
-       show_bgp_ipv6_community_list_exact_cmd,
-       "show bgp ipv6 community-list (<1-500>|WORD) exact-match",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Display routes matching the community-list\n"
-       "community-list number\n"
-       "community-list name\n"
-       "Exact match of the communities\n")
 
 /* old command */
 DEFUN (show_ipv6_bgp_community_list_exact,
@@ -11204,6 +11270,18 @@ DEFUN (show_ip_bgp_instance_prefix_longer,
                                 bgp_show_type_prefix_longer);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening flap-statistics A.B.C.D/M longer-prefixes",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display flap statistics of routes\n"
+ *     "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
+ *     "Display route and more specific routes\n"
+ *
+ */
 DEFUN (show_ip_bgp_flap_prefix_longer,
        show_ip_bgp_flap_prefix_longer_cmd,
        "show ip bgp flap-statistics A.B.C.D/M longer-prefixes",
@@ -11218,16 +11296,6 @@ DEFUN (show_ip_bgp_flap_prefix_longer,
                                 bgp_show_type_flap_prefix_longer);
 }
 
-ALIAS (show_ip_bgp_flap_prefix_longer,
-       show_ip_bgp_damp_flap_prefix_longer_cmd,
-       "show ip bgp dampening flap-statistics A.B.C.D/M longer-prefixes",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
-       "Display route and more specific routes\n")
 
 DEFUN (show_ip_bgp_ipv4_prefix_longer,
        show_ip_bgp_ipv4_prefix_longer_cmd,
@@ -11249,6 +11317,17 @@ DEFUN (show_ip_bgp_ipv4_prefix_longer,
                                 bgp_show_type_prefix_longer);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening flap-statistics A.B.C.D",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display flap statistics of routes\n"
+ *     "Network in the BGP routing table to display\n"
+ *
+ */
 DEFUN (show_ip_bgp_flap_address,
        show_ip_bgp_flap_address_cmd,
        "show ip bgp flap-statistics A.B.C.D",
@@ -11262,16 +11341,18 @@ DEFUN (show_ip_bgp_flap_address,
                                 bgp_show_type_flap_address);
 }
 
-ALIAS (show_ip_bgp_flap_address,
-       show_ip_bgp_damp_flap_address_cmd,
-       "show ip bgp dampening flap-statistics A.B.C.D",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "Network in the BGP routing table to display\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening flap-statistics A.B.C.D/M",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display flap statistics of routes\n"
+ *     "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
+ *
+ */
 DEFUN (show_ip_bgp_flap_prefix,
        show_ip_bgp_flap_prefix_cmd,
        "show ip bgp flap-statistics A.B.C.D/M",
@@ -11285,17 +11366,18 @@ DEFUN (show_ip_bgp_flap_prefix,
                                 bgp_show_type_flap_prefix);
 }
 
-ALIAS (show_ip_bgp_flap_prefix,
-       show_ip_bgp_damp_flap_prefix_cmd,
-       "show ip bgp dampening flap-statistics A.B.C.D/M",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n"
-       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
 
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 X:X::X:X/M longer-prefixes",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "IPv6 prefix <network>/<length>\n"
+ *     "Display route and more specific routes\n"
+ *
+ */
 DEFUN (show_bgp_prefix_longer,
        show_bgp_prefix_longer_cmd,
        "show bgp X:X::X:X/M longer-prefixes",
@@ -11308,14 +11390,6 @@ DEFUN (show_bgp_prefix_longer,
                                 bgp_show_type_prefix_longer);
 }
 
-ALIAS (show_bgp_prefix_longer,
-       show_bgp_ipv6_prefix_longer_cmd,
-       "show bgp ipv6 X:X::X:X/M longer-prefixes",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "IPv6 prefix <network>/<length>\n"
-       "Display route and more specific routes\n")
 
 /* old command */
 DEFUN (show_ipv6_bgp_prefix_longer,
@@ -12358,6 +12432,21 @@ peer_adj_routes (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the routes advertised to a BGP neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_instance_neighbor_advertised_route,
        show_ip_bgp_instance_neighbor_advertised_route_cmd,
        "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
@@ -12385,6 +12474,20 @@ DEFUN (show_ip_bgp_instance_neighbor_advertised_route,
   return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 0, NULL, uj);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the routes advertised to a BGP neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_neighbor_advertised_route,
        show_ip_bgp_neighbor_advertised_route_cmd,
        "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
@@ -12415,32 +12518,25 @@ DEFUN (show_ip_bgp_neighbor_advertised_route,
   return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 0, rmap_name, uj);
 }
 
-ALIAS (show_ip_bgp_neighbor_advertised_route,
-       show_ip_bgp_neighbor_advertised_route_rmap_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the routes advertised to a BGP neighbor\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_instance_neighbor_advertised_route,
-       show_ip_bgp_instance_neighbor_advertised_route_rmap_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the routes advertised to a BGP neighbor\n"
-       "JavaScript Object Notation\n")
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the routes advertised to a BGP neighbor\n"
+ *     "Route-map to control what is displayed\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route,
        show_ip_bgp_ipv4_neighbor_advertised_route_cmd,
        "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
@@ -12474,24 +12570,23 @@ DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route,
     return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 0, rmap_name, uj);
 }
 
-ALIAS (show_ip_bgp_ipv4_neighbor_advertised_route,
-       show_ip_bgp_ipv4_neighbor_advertised_route_rmap_cmd,
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes route-map WORD {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the routes advertised to a BGP neighbor\n"
-       "Route-map to control what is displayed\n"
-       "JavaScript Object Notation\n")
 
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the routes advertised to a BGP neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_instance_neighbor_advertised_route,
        show_bgp_instance_neighbor_advertised_route_cmd,
        "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
@@ -12519,20 +12614,32 @@ DEFUN (show_bgp_instance_neighbor_advertised_route,
   return peer_adj_routes (vty, peer, AFI_IP6, SAFI_UNICAST, 0, NULL, uj);
 }
 
-ALIAS (show_bgp_instance_neighbor_advertised_route,
-       show_bgp_instance_ipv6_neighbor_advertised_route_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the routes advertised to a BGP neighbor\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the routes advertised to a BGP neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the routes advertised to a BGP neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_neighbor_advertised_route,
        show_bgp_neighbor_advertised_route_cmd,
        "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
@@ -12558,35 +12665,11 @@ DEFUN (show_bgp_neighbor_advertised_route,
   if (argc == 3 || (argc == 2 && argv[5]->arg && strcmp(argv[5]->arg, "json") != 0))
     rmap_name = argv[5]->arg;
 
-  return peer_adj_routes (vty, peer, AFI_IP6, SAFI_UNICAST, 0, rmap_name, uj);
-}
-
-ALIAS (show_bgp_neighbor_advertised_route,
-       show_bgp_ipv6_neighbor_advertised_route_cmd,
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the routes advertised to a BGP neighbor\n"
-       "JavaScript Object Notation\n")
-
+  return peer_adj_routes (vty, peer, AFI_IP6, SAFI_UNICAST, 0, rmap_name, uj);
+}
+
+
 /* old command */
-ALIAS (show_bgp_neighbor_advertised_route,
-       ipv6_bgp_neighbor_advertised_route_cmd,
-       "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) advertised-routes {json}",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the routes advertised to a BGP neighbor\n"
-       "JavaScript Object Notation\n")
   
 /* old command */
 DEFUN (ipv6_mbgp_neighbor_advertised_route,
@@ -12615,6 +12698,21 @@ DEFUN (ipv6_mbgp_neighbor_advertised_route,
 }
 #endif /* HAVE_IPV6 */
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the received routes from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_instance_neighbor_received_routes,
        show_bgp_instance_neighbor_received_routes_cmd,
        "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
@@ -12638,6 +12736,21 @@ DEFUN (show_bgp_instance_neighbor_received_routes,
   return peer_adj_routes (vty, peer, AFI_IP6, SAFI_UNICAST, 1, NULL, uj);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the received routes from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_instance_neighbor_received_routes,
        show_ip_bgp_instance_neighbor_received_routes_cmd,
        "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
@@ -12662,20 +12775,21 @@ DEFUN (show_ip_bgp_instance_neighbor_received_routes,
   return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 1, NULL, uj);
 }
 
-ALIAS (show_bgp_instance_neighbor_received_routes,
-       show_bgp_instance_ipv6_neighbor_received_routes_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the received routes from neighbor\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the received routes from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_neighbor_received_routes,
        show_ip_bgp_neighbor_received_routes_cmd,
        "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
@@ -12705,33 +12819,25 @@ DEFUN (show_ip_bgp_neighbor_received_routes,
   return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 1, rmap_name, uj);
 }
 
-ALIAS (show_ip_bgp_neighbor_received_routes,
-       show_ip_bgp_neighbor_received_routes_rmap_cmd,
-       "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the received routes from neighbor\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_instance_neighbor_received_routes,
-       show_ip_bgp_instance_neighbor_received_routes_rmap_cmd,
-       "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the received routes from neighbor\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the received routes from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_ipv4_neighbor_received_routes,
        show_ip_bgp_ipv4_neighbor_received_routes_cmd,
        "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
@@ -12765,21 +12871,6 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_routes,
     return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 1, rmap_name, uj);
 }
 
-ALIAS (show_ip_bgp_ipv4_neighbor_received_routes,
-       show_ip_bgp_ipv4_neighbor_received_routes_rmap_cmd,
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) received-routes route-map WORD {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the received routes from neighbor\n"
-       "JavaScript Object Notation\n")
 
 DEFUN (show_bgp_instance_afi_safi_neighbor_adv_recd_routes,
        show_bgp_instance_afi_safi_neighbor_adv_recd_routes_cmd,
@@ -13021,6 +13112,31 @@ DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter,
   return CMD_SUCCESS;
 }
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the received routes from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the received routes from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_neighbor_received_routes,
        show_bgp_neighbor_received_routes_cmd,
        "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
@@ -13048,19 +13164,22 @@ DEFUN (show_bgp_neighbor_received_routes,
   return peer_adj_routes (vty, peer, AFI_IP6, SAFI_UNICAST, 1, rmap_name, uj);
 }
 
-ALIAS (show_bgp_neighbor_received_routes,
-       show_bgp_ipv6_neighbor_received_routes_cmd,
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the received routes from neighbor\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display information received from a BGP neighbor\n"
+ *     "Display the prefixlist filter\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_neighbor_received_prefix_filter,
        show_bgp_neighbor_received_prefix_filter_cmd,
        "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
@@ -13147,33 +13266,8 @@ DEFUN (show_bgp_neighbor_received_prefix_filter,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_bgp_neighbor_received_prefix_filter,
-       show_bgp_ipv6_neighbor_received_prefix_filter_cmd,
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display information received from a BGP neighbor\n"
-       "Display the prefixlist filter\n"
-       "JavaScript Object Notation\n")
 
 /* old command */
-ALIAS (show_bgp_neighbor_received_routes,
-       ipv6_bgp_neighbor_received_routes_cmd,
-       "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes {json}",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the received routes from neighbor\n"
-       "JavaScript Object Notation\n")
 
 /* old command */
 DEFUN (ipv6_mbgp_neighbor_received_routes,
@@ -13200,6 +13294,22 @@ DEFUN (ipv6_mbgp_neighbor_received_routes,
   return peer_adj_routes (vty, peer, AFI_IP6, SAFI_MULTICAST, 1, NULL, uj);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display information received from a BGP neighbor\n"
+ *     "Display the prefixlist filter\n"
+ *     "JavaScript Object NOtation\n"
+ *
+ */
 DEFUN (show_bgp_instance_neighbor_received_prefix_filter,
        show_bgp_instance_neighbor_received_prefix_filter_cmd,
        "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
@@ -13292,20 +13402,6 @@ DEFUN (show_bgp_instance_neighbor_received_prefix_filter,
 
   return CMD_SUCCESS;
 }
-ALIAS (show_bgp_instance_neighbor_received_prefix_filter,
-       show_bgp_instance_ipv6_neighbor_received_prefix_filter_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received prefix-filter {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display information received from a BGP neighbor\n"
-       "Display the prefixlist filter\n"
-       "JavaScript Object NOtation\n")
 #endif /* HAVE_IPV6 */
 
 static int
@@ -13459,6 +13555,21 @@ DEFUN (show_ip_bgp_ipv4_neighbor_routes,
 }
 
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display routes learned from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_instance_neighbor_routes,
        show_bgp_instance_neighbor_routes_cmd,
        "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
@@ -13483,20 +13594,43 @@ DEFUN (show_bgp_instance_neighbor_routes,
                                  bgp_show_type_neighbor, uj);
 }
 
-ALIAS (show_bgp_instance_neighbor_routes,
-       show_bgp_instance_ipv6_neighbor_routes_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display routes learned from neighbor\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the dampened routes received from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the dampened routes received from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display the dampened routes received from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_instance_neighbor_damp,
        show_bgp_instance_neighbor_damp_cmd,
        "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
@@ -13526,20 +13660,43 @@ DEFUN (show_bgp_instance_neighbor_damp,
                                  bgp_show_type_damp_neighbor, uj);
 }
 
-ALIAS (show_bgp_instance_neighbor_damp,
-       show_bgp_instance_ipv6_neighbor_damp_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the dampened routes received from neighbor\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display flap statistics of the routes learned from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display flap statistics of the routes learned from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display flap statistics of the routes learned from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_instance_neighbor_flap,
        show_bgp_instance_neighbor_flap_cmd,
        "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
@@ -13569,20 +13726,32 @@ DEFUN (show_bgp_instance_neighbor_flap,
                                  bgp_show_type_flap_neighbor, uj);
 }
 
-ALIAS (show_bgp_instance_neighbor_flap,
-       show_bgp_instance_ipv6_neighbor_flap_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display flap statistics of the routes learned from neighbor\n"
-       "JavaScript Object Notation\n")
        
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     BGP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display routes learned from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "Display routes learned from neighbor\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_bgp_neighbor_routes,
        show_bgp_neighbor_routes_cmd,
        "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
@@ -13607,32 +13776,8 @@ DEFUN (show_bgp_neighbor_routes,
 }
 
 
-ALIAS (show_bgp_neighbor_routes,
-       show_bgp_ipv6_neighbor_routes_cmd,
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display routes learned from neighbor\n"
-       "JavaScript Object Notation\n")
 
 /* old command */
-ALIAS (show_bgp_neighbor_routes,
-       ipv6_bgp_neighbor_routes_cmd,
-       "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes {json}",
-       SHOW_STR
-       IPV6_STR
-       BGP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display routes learned from neighbor\n"
-       "JavaScript Object Notation\n")
 
 /* old command */
 DEFUN (ipv6_mbgp_neighbor_routes,
@@ -13660,55 +13805,9 @@ DEFUN (ipv6_mbgp_neighbor_routes,
                                  bgp_show_type_neighbor, uj);
 }
 
-ALIAS (show_bgp_instance_neighbor_flap,
-       show_bgp_neighbor_flap_cmd,
-       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
-       SHOW_STR
-       BGP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display flap statistics of the routes learned from neighbor\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_bgp_instance_neighbor_flap,
-       show_bgp_ipv6_neighbor_flap_cmd,
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display flap statistics of the routes learned from neighbor\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_bgp_instance_neighbor_damp,
-       show_bgp_neighbor_damp_cmd,
-       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
-       SHOW_STR
-       BGP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the dampened routes received from neighbor\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_bgp_instance_neighbor_damp,
-       show_bgp_ipv6_neighbor_damp_cmd,
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "Display the dampened routes received from neighbor\n"
-       "JavaScript Object Notation\n")
 
 #endif /* HAVE_IPV6 */
 
@@ -13919,6 +14018,14 @@ DEFUN (bgp_distance,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no distance bgp",
+ *     NO_STR
+ *     "Define an administrative distance\n"
+ *     "BGP distance\n"
+ *
+ */
 DEFUN (no_bgp_distance,
        no_bgp_distance_cmd,
        "no distance bgp <1-255> <1-255> <1-255>",
@@ -13939,12 +14046,6 @@ DEFUN (no_bgp_distance,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_distance,
-       no_bgp_distance2_cmd,
-       "no distance bgp",
-       NO_STR
-       "Define an administrative distance\n"
-       "BGP distance\n")
 
 DEFUN (bgp_distance_source,
        bgp_distance_source_cmd,
@@ -13994,6 +14095,18 @@ DEFUN (no_bgp_distance_source_access_list,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "bgp dampening",
+ *     "BGP Specific commands\n"
+ *     "Enable route-flap dampening\n"
+ *
+ * "bgp dampening <1-45>",
+ *     "BGP Specific commands\n"
+ *     "Enable route-flap dampening\n"
+ *     "Half-life time for the penalty\n"
+ *
+ */
 DEFUN (bgp_damp_set,
        bgp_damp_set_cmd,
        "bgp dampening <1-45> <1-20000> <1-20000> <1-255>",
@@ -14036,19 +14149,26 @@ DEFUN (bgp_damp_set,
                          half, reuse, suppress, max);
 }
 
-ALIAS (bgp_damp_set,
-       bgp_damp_set2_cmd,
-       "bgp dampening <1-45>",
-       "BGP Specific commands\n"
-       "Enable route-flap dampening\n"
-       "Half-life time for the penalty\n")
 
-ALIAS (bgp_damp_set,
-       bgp_damp_set3_cmd,
-       "bgp dampening",
-       "BGP Specific commands\n"
-       "Enable route-flap dampening\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp dampening <1-45>",
+ *     NO_STR
+ *     "BGP Specific commands\n"
+ *     "Enable route-flap dampening\n"
+ *     "Half-life time for the penalty\n"
+ *
+ * "no bgp dampening <1-45> <1-20000> <1-20000> <1-255>",
+ *     NO_STR
+ *     "BGP Specific commands\n"
+ *     "Enable route-flap dampening\n"
+ *     "Half-life time for the penalty\n"
+ *     "Value to start reusing a route\n"
+ *     "Value to start suppressing a route\n"
+ *     "Maximum duration to suppress a stable route\n"
+ *
+ */
 DEFUN (bgp_damp_unset,
        bgp_damp_unset_cmd,
        "no bgp dampening",
@@ -14062,25 +14182,18 @@ DEFUN (bgp_damp_unset,
   return bgp_damp_disable (bgp, bgp_node_afi (vty), bgp_node_safi (vty));
 }
 
-ALIAS (bgp_damp_unset,
-       bgp_damp_unset2_cmd,
-       "no bgp dampening <1-45> <1-20000> <1-20000> <1-255>",
-       NO_STR
-       "BGP Specific commands\n"
-       "Enable route-flap dampening\n"
-       "Half-life time for the penalty\n"
-       "Value to start reusing a route\n"
-       "Value to start suppressing a route\n"
-       "Maximum duration to suppress a stable route\n")
 
-ALIAS (bgp_damp_unset,
-       bgp_damp_unset3_cmd,
-       "no bgp dampening <1-45>",
-       NO_STR
-       "BGP Specific commands\n"
-       "Enable route-flap dampening\n"
-       "Half-life time for the penalty\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening dampened-paths",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display paths suppressed due to dampening\n"
+ *
+ */
 DEFUN (show_ip_bgp_dampened_paths,
        show_ip_bgp_dampened_paths_cmd,
        "show ip bgp dampened-paths",
@@ -14093,15 +14206,17 @@ DEFUN (show_ip_bgp_dampened_paths,
                    NULL, 0);
 }
 
-ALIAS (show_ip_bgp_dampened_paths,
-       show_ip_bgp_damp_dampened_paths_cmd,
-       "show ip bgp dampening dampened-paths",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display paths suppressed due to dampening\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp dampening flap-statistics",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display detailed information about dampening\n"
+ *     "Display flap statistics of routes\n"
+ *
+ */
 DEFUN (show_ip_bgp_flap_statistics,
        show_ip_bgp_flap_statistics_cmd,
        "show ip bgp flap-statistics",
@@ -14114,14 +14229,6 @@ DEFUN (show_ip_bgp_flap_statistics,
                    bgp_show_type_flap_statistics, NULL, 0);
 }
 
-ALIAS (show_ip_bgp_flap_statistics,
-       show_ip_bgp_damp_flap_statistics_cmd,
-       "show ip bgp dampening flap-statistics",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display detailed information about dampening\n"
-       "Display flap statistics of routes\n")
 
 /* Display specified route of BGP table. */
 static int
@@ -14478,12 +14585,6 @@ bgp_route_init (void)
   install_element (BGP_NODE, &no_bgp_network_cmd);
   install_element (BGP_NODE, &no_bgp_network_mask_cmd);
   install_element (BGP_NODE, &no_bgp_network_mask_natural_cmd);
-  install_element (BGP_NODE, &no_bgp_network_route_map_cmd);
-  install_element (BGP_NODE, &no_bgp_network_mask_route_map_cmd);
-  install_element (BGP_NODE, &no_bgp_network_mask_natural_route_map_cmd);
-  install_element (BGP_NODE, &no_bgp_network_backdoor_cmd);
-  install_element (BGP_NODE, &no_bgp_network_mask_backdoor_cmd);
-  install_element (BGP_NODE, &no_bgp_network_mask_natural_backdoor_cmd);
 
   install_element (BGP_NODE, &aggregate_address_cmd);
   install_element (BGP_NODE, &aggregate_address_mask_cmd);
@@ -14493,18 +14594,8 @@ bgp_route_init (void)
   install_element (BGP_NODE, &aggregate_address_mask_as_set_cmd);
   install_element (BGP_NODE, &aggregate_address_as_set_summary_cmd);
   install_element (BGP_NODE, &aggregate_address_mask_as_set_summary_cmd);
-  install_element (BGP_NODE, &aggregate_address_summary_as_set_cmd);
-  install_element (BGP_NODE, &aggregate_address_mask_summary_as_set_cmd);
   install_element (BGP_NODE, &no_aggregate_address_cmd);
-  install_element (BGP_NODE, &no_aggregate_address_summary_only_cmd);
-  install_element (BGP_NODE, &no_aggregate_address_as_set_cmd);
-  install_element (BGP_NODE, &no_aggregate_address_as_set_summary_cmd);
-  install_element (BGP_NODE, &no_aggregate_address_summary_as_set_cmd);
   install_element (BGP_NODE, &no_aggregate_address_mask_cmd);
-  install_element (BGP_NODE, &no_aggregate_address_mask_summary_only_cmd);
-  install_element (BGP_NODE, &no_aggregate_address_mask_as_set_cmd);
-  install_element (BGP_NODE, &no_aggregate_address_mask_as_set_summary_cmd);
-  install_element (BGP_NODE, &no_aggregate_address_mask_summary_as_set_cmd);
 
   /* IPv4 unicast configuration.  */
   install_element (BGP_IPV4_NODE, &bgp_table_map_cmd);
@@ -14518,9 +14609,6 @@ bgp_route_init (void)
   install_element (BGP_IPV4_NODE, &no_bgp_network_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_network_mask_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_network_mask_natural_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_network_route_map_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_network_mask_route_map_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_network_mask_natural_route_map_cmd);
   
   install_element (BGP_IPV4_NODE, &aggregate_address_cmd);
   install_element (BGP_IPV4_NODE, &aggregate_address_mask_cmd);
@@ -14530,18 +14618,8 @@ bgp_route_init (void)
   install_element (BGP_IPV4_NODE, &aggregate_address_mask_as_set_cmd);
   install_element (BGP_IPV4_NODE, &aggregate_address_as_set_summary_cmd);
   install_element (BGP_IPV4_NODE, &aggregate_address_mask_as_set_summary_cmd);
-  install_element (BGP_IPV4_NODE, &aggregate_address_summary_as_set_cmd);
-  install_element (BGP_IPV4_NODE, &aggregate_address_mask_summary_as_set_cmd);
   install_element (BGP_IPV4_NODE, &no_aggregate_address_cmd);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_summary_only_cmd);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_as_set_cmd);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_as_set_summary_cmd);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_summary_as_set_cmd);
   install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_cmd);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_summary_only_cmd);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_as_set_cmd);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_as_set_summary_cmd);
-  install_element (BGP_IPV4_NODE, &no_aggregate_address_mask_summary_as_set_cmd);
 
   /* IPv4 multicast configuration.  */
   install_element (BGP_IPV4M_NODE, &bgp_table_map_cmd);
@@ -14555,9 +14633,6 @@ bgp_route_init (void)
   install_element (BGP_IPV4M_NODE, &no_bgp_network_cmd);
   install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_cmd);
   install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_natural_cmd);
-  install_element (BGP_IPV4M_NODE, &no_bgp_network_route_map_cmd);
-  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_route_map_cmd);
-  install_element (BGP_IPV4M_NODE, &no_bgp_network_mask_natural_route_map_cmd);
   install_element (BGP_IPV4M_NODE, &aggregate_address_cmd);
   install_element (BGP_IPV4M_NODE, &aggregate_address_mask_cmd);
   install_element (BGP_IPV4M_NODE, &aggregate_address_summary_only_cmd);
@@ -14566,39 +14641,25 @@ bgp_route_init (void)
   install_element (BGP_IPV4M_NODE, &aggregate_address_mask_as_set_cmd);
   install_element (BGP_IPV4M_NODE, &aggregate_address_as_set_summary_cmd);
   install_element (BGP_IPV4M_NODE, &aggregate_address_mask_as_set_summary_cmd);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_summary_as_set_cmd);
-  install_element (BGP_IPV4M_NODE, &aggregate_address_mask_summary_as_set_cmd);
   install_element (BGP_IPV4M_NODE, &no_aggregate_address_cmd);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_summary_only_cmd);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_as_set_cmd);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_as_set_summary_cmd);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_summary_as_set_cmd);
   install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_cmd);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_summary_only_cmd);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_as_set_cmd);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_as_set_summary_cmd);
-  install_element (BGP_IPV4M_NODE, &no_aggregate_address_mask_summary_as_set_cmd);
 
   install_element (VIEW_NODE, &show_ip_bgp_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_all_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv4_safi_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_route_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_route_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_route_pathtype_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_route_pathtype_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv4_safi_route_pathtype_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_route_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv4_safi_route_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_route_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_route_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_prefix_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_prefix_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_pathtype_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv4_safi_prefix_pathtype_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv4_safi_prefix_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_prefix_pathtype_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_prefix_pathtype_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_prefix_cmd);
@@ -14620,26 +14681,11 @@ bgp_route_init (void)
   install_element (VIEW_NODE, &show_ip_bgp_community_all_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_all_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_community_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_community2_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_community3_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_community4_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community2_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community3_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community4_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_afi_safi_community_all_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_afi_safi_community_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_afi_safi_community2_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_afi_safi_community3_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_afi_safi_community4_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_community_exact_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_community2_exact_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_community3_exact_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_community4_exact_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_exact_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community2_exact_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community3_exact_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_community4_exact_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_community_list_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_community_list_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_community_list_cmd);
@@ -14650,16 +14696,10 @@ bgp_route_init (void)
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_prefix_longer_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_neighbor_advertised_route_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_neighbor_advertised_route_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbor_advertised_route_rmap_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_instance_neighbor_advertised_route_rmap_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_advertised_route_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_advertised_route_rmap_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_neighbor_received_routes_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_neighbor_received_routes_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_neighbor_received_routes_rmap_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_instance_neighbor_received_routes_rmap_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_received_routes_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbor_received_routes_rmap_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_afi_safi_neighbor_adv_recd_routes_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_neighbor_routes_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_neighbor_routes_cmd);
@@ -14671,23 +14711,15 @@ bgp_route_init (void)
   install_element (VIEW_NODE, &show_ip_bgp_dampened_paths_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_dampening_dampd_paths_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_dampening_flap_stats_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_damp_dampened_paths_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_flap_statistics_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_damp_flap_statistics_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_flap_address_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_damp_flap_address_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_flap_cidr_only_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_damp_flap_cidr_only_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_flap_regexp_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_flap_filter_list_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_damp_flap_filter_list_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_list_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_damp_flap_prefix_list_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_flap_prefix_longer_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_damp_flap_prefix_longer_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_flap_route_map_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_damp_flap_route_map_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_neighbor_flap_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_neighbor_damp_cmd);
   
@@ -14698,14 +14730,11 @@ bgp_route_init (void)
   install_element (RESTRICTED_NODE, &show_ip_bgp_instance_route_pathtype_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_ipv4_safi_route_pathtype_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_route_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv4_safi_route_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_vpnv4_rd_route_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_prefix_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_instance_prefix_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_prefix_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_prefix_pathtype_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv4_safi_prefix_pathtype_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv4_safi_prefix_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_prefix_pathtype_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_instance_prefix_pathtype_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_vpnv4_all_prefix_cmd);
@@ -14713,47 +14742,28 @@ bgp_route_init (void)
   install_element (RESTRICTED_NODE, &show_ip_bgp_instance_route_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_instance_prefix_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_community_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_community2_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_community3_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_community4_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_community_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_community2_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_community3_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_community4_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_instance_afi_safi_community_all_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_instance_afi_safi_community_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_afi_safi_community2_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_afi_safi_community3_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_afi_safi_community4_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_community_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_community2_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_community3_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_community4_exact_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_community_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_community2_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_community3_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_community4_exact_cmd);
 
   install_element (ENABLE_NODE, &show_ip_bgp_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_all_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv4_safi_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_route_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_route_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_route_pathtype_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_route_pathtype_cmd);
   install_element (ENABLE_NODE, &show_bgp_ipv4_safi_route_pathtype_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_route_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv4_safi_route_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_route_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_route_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_prefix_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_prefix_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_pathtype_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv4_safi_prefix_pathtype_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv4_safi_prefix_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_prefix_pathtype_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_prefix_pathtype_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_prefix_cmd);
@@ -14775,26 +14785,11 @@ bgp_route_init (void)
   install_element (ENABLE_NODE, &show_ip_bgp_community_all_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_all_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_community_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_community2_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_community3_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_community4_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community2_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community3_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community4_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_afi_safi_community_all_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_afi_safi_community_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_afi_safi_community2_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_afi_safi_community3_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_afi_safi_community4_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_community_exact_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_community2_exact_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_community3_exact_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_community4_exact_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_exact_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community2_exact_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community3_exact_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community4_exact_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_community_list_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_community_list_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_list_cmd);
@@ -14805,16 +14800,10 @@ bgp_route_init (void)
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_longer_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_neighbor_advertised_route_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbor_advertised_route_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_advertised_route_rmap_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbor_advertised_route_rmap_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_advertised_route_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_advertised_route_rmap_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_neighbor_received_routes_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbor_received_routes_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_neighbor_received_routes_rmap_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbor_received_routes_rmap_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_received_routes_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_received_routes_rmap_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_afi_safi_neighbor_adv_recd_routes_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_neighbor_routes_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbor_routes_cmd);
@@ -14826,25 +14815,15 @@ bgp_route_init (void)
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_dampening_parameters_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_dampening_dampd_paths_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_dampening_flap_stats_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_dampened_paths_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_flap_statistics_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_statistics_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_flap_address_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_address_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_flap_cidr_only_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_cidr_only_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_flap_regexp_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_regexp_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_flap_filter_list_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_filter_list_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_list_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_prefix_list_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_prefix_list_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_longer_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_prefix_longer_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_flap_route_map_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_route_map_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_neighbor_flap_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_neighbor_damp_cmd);
 
@@ -14881,7 +14860,6 @@ bgp_route_init (void)
   install_element (BGP_IPV6_NODE, &ipv6_bgp_network_route_map_cmd);
   install_element (BGP_IPV6_NODE, &no_bgp_table_map_cmd);
   install_element (BGP_IPV6_NODE, &no_ipv6_bgp_network_cmd);
-  install_element (BGP_IPV6_NODE, &no_ipv6_bgp_network_route_map_cmd);
 
   install_element (BGP_IPV6_NODE, &ipv6_aggregate_address_cmd);
   install_element (BGP_IPV6_NODE, &ipv6_aggregate_address_summary_only_cmd);
@@ -14892,106 +14870,51 @@ bgp_route_init (void)
   install_element (BGP_IPV6M_NODE, &no_ipv6_bgp_network_cmd);
 
   /* Old config IPv6 BGP commands.  */
-  install_element (BGP_NODE, &old_ipv6_bgp_network_cmd);
-  install_element (BGP_NODE, &old_no_ipv6_bgp_network_cmd);
 
-  install_element (BGP_NODE, &old_ipv6_aggregate_address_cmd);
-  install_element (BGP_NODE, &old_ipv6_aggregate_address_summary_only_cmd);
-  install_element (BGP_NODE, &old_no_ipv6_aggregate_address_cmd);
-  install_element (BGP_NODE, &old_no_ipv6_aggregate_address_summary_only_cmd);
 
   install_element (VIEW_NODE, &show_bgp_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_safi_cmd);
   install_element (VIEW_NODE, &show_bgp_route_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_route_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_safi_route_cmd);
   install_element (VIEW_NODE, &show_bgp_route_pathtype_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_route_pathtype_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_safi_route_pathtype_cmd);
   install_element (VIEW_NODE, &show_bgp_prefix_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_prefix_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_safi_prefix_cmd);
   install_element (VIEW_NODE, &show_bgp_prefix_pathtype_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_prefix_pathtype_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_safi_prefix_pathtype_cmd);
   install_element (VIEW_NODE, &show_bgp_regexp_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_regexp_cmd);
   install_element (VIEW_NODE, &show_bgp_prefix_list_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_prefix_list_cmd);
   install_element (VIEW_NODE, &show_bgp_filter_list_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_filter_list_cmd);
   install_element (VIEW_NODE, &show_bgp_route_map_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_route_map_cmd);
   install_element (VIEW_NODE, &show_bgp_community_all_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_all_cmd);
   install_element (VIEW_NODE, &show_bgp_community_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_cmd);
-  install_element (VIEW_NODE, &show_bgp_community2_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community2_cmd);
-  install_element (VIEW_NODE, &show_bgp_community3_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community3_cmd);
-  install_element (VIEW_NODE, &show_bgp_community4_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community4_cmd);
   install_element (VIEW_NODE, &show_bgp_community_exact_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_exact_cmd);
-  install_element (VIEW_NODE, &show_bgp_community2_exact_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community2_exact_cmd);
-  install_element (VIEW_NODE, &show_bgp_community3_exact_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community3_exact_cmd);
-  install_element (VIEW_NODE, &show_bgp_community4_exact_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community4_exact_cmd);
   install_element (VIEW_NODE, &show_bgp_community_list_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_list_cmd);
   install_element (VIEW_NODE, &show_bgp_community_list_exact_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_community_list_exact_cmd);
   install_element (VIEW_NODE, &show_bgp_prefix_longer_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_prefix_longer_cmd);
   install_element (VIEW_NODE, &show_bgp_neighbor_advertised_route_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_advertised_route_cmd);
   install_element (VIEW_NODE, &show_bgp_neighbor_received_routes_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_received_routes_cmd);
   install_element (VIEW_NODE, &show_bgp_neighbor_routes_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_routes_cmd);
   install_element (VIEW_NODE, &show_bgp_neighbor_received_prefix_filter_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_received_prefix_filter_cmd);
-  install_element (VIEW_NODE, &show_bgp_neighbor_flap_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_flap_cmd);
-  install_element (VIEW_NODE, &show_bgp_neighbor_damp_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbor_damp_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_all_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_route_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_route_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_route_pathtype_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_route_pathtype_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_prefix_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_prefix_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_prefix_pathtype_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_prefix_pathtype_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_prefix_list_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_prefix_list_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_filter_list_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_filter_list_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_route_map_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_route_map_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_community_list_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_community_list_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_prefix_longer_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_prefix_longer_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_neighbor_advertised_route_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbor_advertised_route_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_neighbor_received_routes_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbor_received_routes_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_neighbor_routes_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbor_routes_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_neighbor_received_prefix_filter_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbor_received_prefix_filter_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_neighbor_flap_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbor_flap_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_neighbor_damp_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbor_damp_cmd);
   
   /* Restricted:
    * VIEW_NODE - (set of dangerous commands) - (commands dependent on prev) 
@@ -15000,131 +14923,62 @@ bgp_route_init (void)
   install_element (RESTRICTED_NODE, &show_bgp_ipv6_route_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_ipv6_safi_route_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_route_pathtype_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_route_pathtype_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_ipv6_safi_route_pathtype_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_prefix_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_ipv6_prefix_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_ipv6_safi_prefix_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_prefix_pathtype_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_prefix_pathtype_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_ipv6_safi_prefix_pathtype_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_community_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_community_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_community2_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_community2_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_community3_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_community3_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_community4_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_community4_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_community_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_community_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_community2_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_community2_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_community3_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_community3_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_community4_exact_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_community4_exact_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_instance_route_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_ipv6_route_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_instance_route_pathtype_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_ipv6_route_pathtype_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_instance_prefix_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_ipv6_prefix_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_instance_neighbor_received_prefix_filter_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_ipv6_neighbor_received_prefix_filter_cmd);
 
   install_element (ENABLE_NODE, &show_bgp_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_cmd);
   install_element (ENABLE_NODE, &show_bgp_ipv6_safi_cmd);
   install_element (ENABLE_NODE, &show_bgp_route_cmd);
   install_element (ENABLE_NODE, &show_bgp_ipv6_route_cmd);
   install_element (ENABLE_NODE, &show_bgp_ipv6_safi_route_cmd);
   install_element (ENABLE_NODE, &show_bgp_route_pathtype_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_route_pathtype_cmd);
   install_element (ENABLE_NODE, &show_bgp_ipv6_safi_route_pathtype_cmd);
   install_element (ENABLE_NODE, &show_bgp_prefix_cmd);
   install_element (ENABLE_NODE, &show_bgp_prefix_pathtype_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_pathtype_cmd);
   install_element (ENABLE_NODE, &show_bgp_ipv6_safi_prefix_pathtype_cmd);
   install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_cmd);
   install_element (ENABLE_NODE, &show_bgp_ipv6_safi_prefix_cmd);
   install_element (ENABLE_NODE, &show_bgp_regexp_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_regexp_cmd);
   install_element (ENABLE_NODE, &show_bgp_prefix_list_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_list_cmd);
   install_element (ENABLE_NODE, &show_bgp_filter_list_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_filter_list_cmd);
   install_element (ENABLE_NODE, &show_bgp_route_map_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_route_map_cmd);
   install_element (ENABLE_NODE, &show_bgp_community_all_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_all_cmd);
   install_element (ENABLE_NODE, &show_bgp_community_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_cmd);
-  install_element (ENABLE_NODE, &show_bgp_community2_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community2_cmd);
-  install_element (ENABLE_NODE, &show_bgp_community3_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community3_cmd);
-  install_element (ENABLE_NODE, &show_bgp_community4_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community4_cmd);
   install_element (ENABLE_NODE, &show_bgp_community_exact_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_exact_cmd);
-  install_element (ENABLE_NODE, &show_bgp_community2_exact_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community2_exact_cmd);
-  install_element (ENABLE_NODE, &show_bgp_community3_exact_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community3_exact_cmd);
-  install_element (ENABLE_NODE, &show_bgp_community4_exact_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community4_exact_cmd);
   install_element (ENABLE_NODE, &show_bgp_community_list_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_list_cmd);
   install_element (ENABLE_NODE, &show_bgp_community_list_exact_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_community_list_exact_cmd);
   install_element (ENABLE_NODE, &show_bgp_prefix_longer_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_longer_cmd);
   install_element (ENABLE_NODE, &show_bgp_neighbor_advertised_route_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_advertised_route_cmd);
   install_element (ENABLE_NODE, &show_bgp_neighbor_received_routes_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_received_routes_cmd);
   install_element (ENABLE_NODE, &show_bgp_neighbor_routes_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_routes_cmd);
   install_element (ENABLE_NODE, &show_bgp_neighbor_received_prefix_filter_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_received_prefix_filter_cmd);
-  install_element (ENABLE_NODE, &show_bgp_neighbor_flap_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_flap_cmd);
-  install_element (ENABLE_NODE, &show_bgp_neighbor_damp_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_damp_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_all_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_route_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_route_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_route_pathtype_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_route_pathtype_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_prefix_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_prefix_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_prefix_pathtype_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_prefix_pathtype_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_prefix_list_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_prefix_list_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_filter_list_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_filter_list_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_route_map_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_route_map_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_community_list_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_community_list_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_prefix_longer_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_prefix_longer_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_neighbor_advertised_route_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbor_advertised_route_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_neighbor_received_routes_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbor_received_routes_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_neighbor_routes_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbor_routes_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_neighbor_received_prefix_filter_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbor_received_prefix_filter_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_neighbor_flap_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbor_flap_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_neighbor_damp_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbor_damp_cmd);
 
   /* Statistics */
   install_element (ENABLE_NODE, &show_bgp_statistics_cmd);
@@ -15141,13 +14995,7 @@ bgp_route_init (void)
   install_element (VIEW_NODE, &show_ipv6_bgp_filter_list_cmd);
   install_element (VIEW_NODE, &show_ipv6_bgp_community_all_cmd);
   install_element (VIEW_NODE, &show_ipv6_bgp_community_cmd);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community2_cmd);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community3_cmd);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community4_cmd);
   install_element (VIEW_NODE, &show_ipv6_bgp_community_exact_cmd);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community2_exact_cmd);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community3_exact_cmd);
-  install_element (VIEW_NODE, &show_ipv6_bgp_community4_exact_cmd);
   install_element (VIEW_NODE, &show_ipv6_bgp_community_list_cmd);
   install_element (VIEW_NODE, &show_ipv6_bgp_community_list_exact_cmd);
   install_element (VIEW_NODE, &show_ipv6_bgp_prefix_longer_cmd);
@@ -15159,13 +15007,7 @@ bgp_route_init (void)
   install_element (VIEW_NODE, &show_ipv6_mbgp_filter_list_cmd);
   install_element (VIEW_NODE, &show_ipv6_mbgp_community_all_cmd);
   install_element (VIEW_NODE, &show_ipv6_mbgp_community_cmd);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community2_cmd);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community3_cmd);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community4_cmd);
   install_element (VIEW_NODE, &show_ipv6_mbgp_community_exact_cmd);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community2_exact_cmd);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community3_exact_cmd);
-  install_element (VIEW_NODE, &show_ipv6_mbgp_community4_exact_cmd);
   install_element (VIEW_NODE, &show_ipv6_mbgp_community_list_cmd);
   install_element (VIEW_NODE, &show_ipv6_mbgp_community_list_exact_cmd);
   install_element (VIEW_NODE, &show_ipv6_mbgp_prefix_longer_cmd);
@@ -15179,13 +15021,7 @@ bgp_route_init (void)
   install_element (ENABLE_NODE, &show_ipv6_bgp_filter_list_cmd);
   install_element (ENABLE_NODE, &show_ipv6_bgp_community_all_cmd);
   install_element (ENABLE_NODE, &show_ipv6_bgp_community_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community2_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community3_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community4_cmd);
   install_element (ENABLE_NODE, &show_ipv6_bgp_community_exact_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community2_exact_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community3_exact_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_bgp_community4_exact_cmd);
   install_element (ENABLE_NODE, &show_ipv6_bgp_community_list_cmd);
   install_element (ENABLE_NODE, &show_ipv6_bgp_community_list_exact_cmd);
   install_element (ENABLE_NODE, &show_ipv6_bgp_prefix_longer_cmd);
@@ -15197,63 +15033,39 @@ bgp_route_init (void)
   install_element (ENABLE_NODE, &show_ipv6_mbgp_filter_list_cmd);
   install_element (ENABLE_NODE, &show_ipv6_mbgp_community_all_cmd);
   install_element (ENABLE_NODE, &show_ipv6_mbgp_community_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community2_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community3_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community4_cmd);
   install_element (ENABLE_NODE, &show_ipv6_mbgp_community_exact_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community2_exact_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community3_exact_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_mbgp_community4_exact_cmd);
   install_element (ENABLE_NODE, &show_ipv6_mbgp_community_list_cmd);
   install_element (ENABLE_NODE, &show_ipv6_mbgp_community_list_exact_cmd);
   install_element (ENABLE_NODE, &show_ipv6_mbgp_prefix_longer_cmd);
 
   /* old command */
-  install_element (VIEW_NODE, &ipv6_bgp_neighbor_advertised_route_cmd);
-  install_element (ENABLE_NODE, &ipv6_bgp_neighbor_advertised_route_cmd);
   install_element (VIEW_NODE, &ipv6_mbgp_neighbor_advertised_route_cmd);
   install_element (ENABLE_NODE, &ipv6_mbgp_neighbor_advertised_route_cmd);
 
   /* old command */
-  install_element (VIEW_NODE, &ipv6_bgp_neighbor_received_routes_cmd);
-  install_element (ENABLE_NODE, &ipv6_bgp_neighbor_received_routes_cmd);
   install_element (VIEW_NODE, &ipv6_mbgp_neighbor_received_routes_cmd);
   install_element (ENABLE_NODE, &ipv6_mbgp_neighbor_received_routes_cmd);
 
   /* old command */
-  install_element (VIEW_NODE, &ipv6_bgp_neighbor_routes_cmd);
-  install_element (ENABLE_NODE, &ipv6_bgp_neighbor_routes_cmd);
   install_element (VIEW_NODE, &ipv6_mbgp_neighbor_routes_cmd);
   install_element (ENABLE_NODE, &ipv6_mbgp_neighbor_routes_cmd);
 #endif /* HAVE_IPV6 */
 
   install_element (BGP_NODE, &bgp_distance_cmd);
   install_element (BGP_NODE, &no_bgp_distance_cmd);
-  install_element (BGP_NODE, &no_bgp_distance2_cmd);
   install_element (BGP_NODE, &bgp_distance_source_cmd);
   install_element (BGP_NODE, &no_bgp_distance_source_cmd);
   install_element (BGP_NODE, &bgp_distance_source_access_list_cmd);
   install_element (BGP_NODE, &no_bgp_distance_source_access_list_cmd);
 
   install_element (BGP_NODE, &bgp_damp_set_cmd);
-  install_element (BGP_NODE, &bgp_damp_set2_cmd);
-  install_element (BGP_NODE, &bgp_damp_set3_cmd);
   install_element (BGP_NODE, &bgp_damp_unset_cmd);
-  install_element (BGP_NODE, &bgp_damp_unset2_cmd);
-  install_element (BGP_NODE, &bgp_damp_unset3_cmd);
   install_element (BGP_IPV4_NODE, &bgp_damp_set_cmd);
-  install_element (BGP_IPV4_NODE, &bgp_damp_set2_cmd);
-  install_element (BGP_IPV4_NODE, &bgp_damp_set3_cmd);
   install_element (BGP_IPV4_NODE, &bgp_damp_unset_cmd);
-  install_element (BGP_IPV4_NODE, &bgp_damp_unset2_cmd);
-  install_element (BGP_IPV4_NODE, &bgp_damp_unset3_cmd);
 
   /* IPv4 Multicast Mode */
   install_element (BGP_IPV4M_NODE, &bgp_damp_set_cmd);
-  install_element (BGP_IPV4M_NODE, &bgp_damp_set2_cmd);
-  install_element (BGP_IPV4M_NODE, &bgp_damp_set3_cmd);
   install_element (BGP_IPV4M_NODE, &bgp_damp_unset_cmd);
-  install_element (BGP_IPV4M_NODE, &bgp_damp_unset2_cmd);
 }
 
 void
index 286975f4af7520724471ba8c46335250559e699b..5b170f88f4fca462a91b138bfde7eb0ec948e8ec 100644 (file)
@@ -3005,7 +3005,7 @@ DEFUN (match_peer,
 }
 
 DEFUN (match_peer_local,
-        match_peer_local_cmd,
+       match_peer_local_cmd,
         "match peer local",
         MATCH_STR
         "Match peer address\n"
@@ -3015,6 +3015,22 @@ DEFUN (match_peer_local,
                              RMAP_EVENT_MATCH_DELETED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match peer local",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match peer address\n"
+ *     "Static or Redistributed routes\n"
+ *
+ * "no match peer (A.B.C.D|X:X::X:X)",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match peer address\n"
+ *     "IP address of peer\n"
+ *     "IPv6 address of peer\n"
+ *
+ */
 DEFUN (no_match_peer,
        no_match_peer_cmd,
        "no match peer",
@@ -3026,24 +3042,9 @@ DEFUN (no_match_peer,
                                RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_peer,
-       no_match_peer_val_cmd,
-       "no match peer (A.B.C.D|X:X::X:X)",
-       NO_STR
-       MATCH_STR
-       "Match peer address\n"
-       "IP address of peer\n"
-       "IPv6 address of peer\n")
 
-ALIAS (no_match_peer,
-       no_match_peer_local_cmd,
-       "no match peer local",
-       NO_STR
-       MATCH_STR
-       "Match peer address\n"
-       "Static or Redistributed routes\n")
 
-DEFUN (match_ip_address, 
+DEFUN (match_ip_address,
        match_ip_address_cmd,
        "match ip address (<1-199>|<1300-2699>|WORD)",
        MATCH_STR
@@ -3057,7 +3058,19 @@ DEFUN (match_ip_address,
                              RMAP_EVENT_FILTER_ADDED);
 }
 
-DEFUN (no_match_ip_address, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address (<1-199>|<1300-2699>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *     "IP access-list number\n"
+ *     "IP access-list number (expanded range)\n"
+ *     "IP Access-list name\n"
+ *
+ */
+DEFUN (no_match_ip_address,
        no_match_ip_address_cmd,
        "no match ip address",
        NO_STR
@@ -3069,18 +3082,8 @@ DEFUN (no_match_ip_address,
                                 RMAP_EVENT_FILTER_DELETED);
 }
 
-ALIAS (no_match_ip_address, 
-       no_match_ip_address_val_cmd,
-       "no match ip address (<1-199>|<1300-2699>|WORD)",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP Access-list name\n")
 
-DEFUN (match_ip_next_hop, 
+DEFUN (match_ip_next_hop,
        match_ip_next_hop_cmd,
        "match ip next-hop (<1-199>|<1300-2699>|WORD)",
        MATCH_STR
@@ -3094,6 +3097,18 @@ DEFUN (match_ip_next_hop,
                              RMAP_EVENT_FILTER_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip next-hop (<1-199>|<1300-2699>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match next-hop address of route\n"
+ *     "IP access-list number\n"
+ *     "IP access-list number (expanded range)\n"
+ *     "IP Access-list name\n"
+ *
+ */
 DEFUN (no_match_ip_next_hop,
        no_match_ip_next_hop_cmd,
        "no match ip next-hop",
@@ -3106,16 +3121,6 @@ DEFUN (no_match_ip_next_hop,
                                 RMAP_EVENT_FILTER_DELETED);
 }
 
-ALIAS (no_match_ip_next_hop,
-       no_match_ip_next_hop_val_cmd,
-       "no match ip next-hop (<1-199>|<1300-2699>|WORD)",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match next-hop address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP Access-list name\n")
 
 /* match probability { */
 
@@ -3130,6 +3135,15 @@ DEFUN (match_probability,
                              RMAP_EVENT_MATCH_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match probability <1-99>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match portion of routes defined by percentage value\n"
+ *     "Percentage of routes\n"
+ *
+ */
 DEFUN (no_match_probability,
        no_match_probability_cmd,
        "no match probability",
@@ -3141,17 +3155,10 @@ DEFUN (no_match_probability,
                                 RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_probability,
-       no_match_probability_val_cmd,
-       "no match probability <1-99>",
-       NO_STR
-       MATCH_STR
-       "Match portion of routes defined by percentage value\n"
-       "Percentage of routes\n")
 
 /* } */
 
-DEFUN (match_ip_route_source, 
+DEFUN (match_ip_route_source,
        match_ip_route_source_cmd,
        "match ip route-source (<1-199>|<1300-2699>|WORD)",
        MATCH_STR
@@ -3165,6 +3172,18 @@ DEFUN (match_ip_route_source,
                              RMAP_EVENT_FILTER_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip route-source (<1-199>|<1300-2699>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match advertising source address of route\n"
+ *     "IP access-list number\n"
+ *     "IP access-list number (expanded range)\n"
+ *     "IP standard access-list name\n"
+ *
+ */
 DEFUN (no_match_ip_route_source,
        no_match_ip_route_source_cmd,
        "no match ip route-source",
@@ -3177,18 +3196,8 @@ DEFUN (no_match_ip_route_source,
                                 argv[4]->arg, RMAP_EVENT_FILTER_DELETED);
 }
 
-ALIAS (no_match_ip_route_source,
-       no_match_ip_route_source_val_cmd,
-       "no match ip route-source (<1-199>|<1300-2699>|WORD)",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match advertising source address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP standard access-list name\n")
 
-DEFUN (match_ip_address_prefix_list, 
+DEFUN (match_ip_address_prefix_list,
        match_ip_address_prefix_list_cmd,
        "match ip address prefix-list WORD",
        MATCH_STR
@@ -3201,6 +3210,17 @@ DEFUN (match_ip_address_prefix_list,
                              argv[4]->arg, RMAP_EVENT_PLIST_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_address_prefix_list,
        no_match_ip_address_prefix_list_cmd,
        "no match ip address prefix-list",
@@ -3214,17 +3234,8 @@ DEFUN (no_match_ip_address_prefix_list,
                                 argv[5]->arg, RMAP_EVENT_PLIST_DELETED);
 }
 
-ALIAS (no_match_ip_address_prefix_list,
-       no_match_ip_address_prefix_list_val_cmd,
-       "no match ip address prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
-DEFUN (match_ip_next_hop_prefix_list, 
+DEFUN (match_ip_next_hop_prefix_list,
        match_ip_next_hop_prefix_list_cmd,
        "match ip next-hop prefix-list WORD",
        MATCH_STR
@@ -3237,6 +3248,17 @@ DEFUN (match_ip_next_hop_prefix_list,
                              argv[4]->arg, RMAP_EVENT_PLIST_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip next-hop prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match next-hop address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_next_hop_prefix_list,
        no_match_ip_next_hop_prefix_list_cmd,
        "no match ip next-hop prefix-list",
@@ -3250,17 +3272,8 @@ DEFUN (no_match_ip_next_hop_prefix_list,
                                 argv[5]->arg, RMAP_EVENT_PLIST_DELETED);
 }
 
-ALIAS (no_match_ip_next_hop_prefix_list,
-       no_match_ip_next_hop_prefix_list_val_cmd,
-       "no match ip next-hop prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match next-hop address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
-DEFUN (match_ip_route_source_prefix_list, 
+DEFUN (match_ip_route_source_prefix_list,
        match_ip_route_source_prefix_list_cmd,
        "match ip route-source prefix-list WORD",
        MATCH_STR
@@ -3273,6 +3286,17 @@ DEFUN (match_ip_route_source_prefix_list,
                              argv[4]->arg, RMAP_EVENT_PLIST_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip route-source prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match advertising source address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_route_source_prefix_list,
        no_match_ip_route_source_prefix_list_cmd,
        "no match ip route-source prefix-list",
@@ -3286,17 +3310,8 @@ DEFUN (no_match_ip_route_source_prefix_list,
                                 argv[5]->arg, RMAP_EVENT_PLIST_DELETED);
 }
 
-ALIAS (no_match_ip_route_source_prefix_list,
-       no_match_ip_route_source_prefix_list_val_cmd,
-       "no match ip route-source prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match advertising source address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
-DEFUN (match_metric, 
+DEFUN (match_metric,
        match_metric_cmd,
        "match metric <0-4294967295>",
        MATCH_STR
@@ -3307,6 +3322,15 @@ DEFUN (match_metric,
                              RMAP_EVENT_MATCH_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match metric <0-4294967295>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match metric of route\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_match_metric,
        no_match_metric_cmd,
        "no match metric",
@@ -3319,13 +3343,6 @@ DEFUN (no_match_metric,
                                 RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_metric,
-       no_match_metric_val_cmd,
-       "no match metric <0-4294967295>",
-       NO_STR
-       MATCH_STR
-       "Match metric of route\n"
-       "Metric value\n")
 
 DEFUN (match_local_pref,
        match_local_pref_cmd,
@@ -3338,6 +3355,15 @@ DEFUN (match_local_pref,
                              RMAP_EVENT_MATCH_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match local-preference <0-4294967295>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match local preference of route\n"
+ *     "Local preference value\n"
+ *
+ */
 DEFUN (no_match_local_pref,
        no_match_local_pref_cmd,
        "no match local-preference",
@@ -3350,15 +3376,8 @@ DEFUN (no_match_local_pref,
                                 RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_local_pref,
-       no_match_local_pref_val_cmd,
-       "no match local-preference <0-4294967295>",
-       NO_STR
-       MATCH_STR
-       "Match local preference of route\n"
-       "Local preference value\n")
 
-DEFUN (match_community, 
+DEFUN (match_community,
        match_community_cmd,
        "match community (<1-99>|<100-500>|WORD)",
        MATCH_STR
@@ -3371,7 +3390,7 @@ DEFUN (match_community,
                              RMAP_EVENT_CLIST_ADDED);
 }
 
-DEFUN (match_community_exact, 
+DEFUN (match_community_exact,
        match_community_exact_cmd,
        "match community (<1-99>|<100-500>|WORD) exact-match",
        MATCH_STR
@@ -3397,6 +3416,26 @@ DEFUN (match_community_exact,
   return ret;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match community (<1-99>|<100-500>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match BGP community list\n"
+ *     "Community-list number (standard)\n"
+ *     "Community-list number (expanded)\n"
+ *     "Community-list name\n"
+ *
+ * "no match community (<1-99>|<100-500>|WORD) exact-match",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match BGP community list\n"
+ *     "Community-list number (standard)\n"
+ *     "Community-list number (expanded)\n"
+ *     "Community-list name\n"
+ *     "Do exact matching of communities\n"
+ *
+ */
 DEFUN (no_match_community,
        no_match_community_cmd,
        "no match community",
@@ -3408,28 +3447,9 @@ DEFUN (no_match_community,
                                 RMAP_EVENT_CLIST_DELETED);
 }
 
-ALIAS (no_match_community,
-       no_match_community_val_cmd,
-       "no match community (<1-99>|<100-500>|WORD)",
-       NO_STR
-       MATCH_STR
-       "Match BGP community list\n"
-       "Community-list number (standard)\n"
-       "Community-list number (expanded)\n"
-       "Community-list name\n")
 
-ALIAS (no_match_community,
-       no_match_community_exact_cmd,
-       "no match community (<1-99>|<100-500>|WORD) exact-match",
-       NO_STR
-       MATCH_STR
-       "Match BGP community list\n"
-       "Community-list number (standard)\n"
-       "Community-list number (expanded)\n"
-       "Community-list name\n"
-       "Do exact matching of communities\n")
 
-DEFUN (match_ecommunity, 
+DEFUN (match_ecommunity,
        match_ecommunity_cmd,
        "match extcommunity (<1-99>|<100-500>|WORD)",
        MATCH_STR
@@ -3442,6 +3462,17 @@ DEFUN (match_ecommunity,
                              RMAP_EVENT_ECLIST_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match extcommunity (<1-99>|<100-500>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match BGP/VPN extended community list\n"
+ *     "Extended community-list number (standard)\n"
+ *     "Extended community-list number (expanded)\n"
+ *     "Extended community-list name\n"
+ *
+ */
 DEFUN (no_match_ecommunity,
        no_match_ecommunity_cmd,
        "no match extcommunity",
@@ -3453,15 +3484,6 @@ DEFUN (no_match_ecommunity,
                                 RMAP_EVENT_ECLIST_DELETED);
 }
 
-ALIAS (no_match_ecommunity,
-       no_match_ecommunity_val_cmd,
-       "no match extcommunity (<1-99>|<100-500>|WORD)",
-       NO_STR
-       MATCH_STR
-       "Match BGP/VPN extended community list\n"
-       "Extended community-list number (standard)\n"
-       "Extended community-list number (expanded)\n"
-       "Extended community-list name\n")
 
 DEFUN (match_aspath,
        match_aspath_cmd,
@@ -3474,6 +3496,15 @@ DEFUN (match_aspath,
                              RMAP_EVENT_ASLIST_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match as-path WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match BGP AS path list\n"
+ *     "AS path access-list name\n"
+ *
+ */
 DEFUN (no_match_aspath,
        no_match_aspath_cmd,
        "no match as-path",
@@ -3485,13 +3516,6 @@ DEFUN (no_match_aspath,
                                 RMAP_EVENT_ASLIST_DELETED);
 }
 
-ALIAS (no_match_aspath,
-       no_match_aspath_val_cmd,
-       "no match as-path WORD",
-       NO_STR
-       MATCH_STR
-       "Match BGP AS path list\n"
-       "AS path access-list name\n")
 
 DEFUN (match_origin,
        match_origin_cmd,
@@ -3515,6 +3539,17 @@ DEFUN (match_origin,
   return CMD_WARNING;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match origin (egp|igp|incomplete)",
+ *     NO_STR
+ *     MATCH_STR
+ *     "BGP origin code\n"
+ *     "remote EGP\n"
+ *     "local IGP\n"
+ *     "unknown heritage\n"
+ *
+ */
 DEFUN (no_match_origin,
        no_match_origin_cmd,
        "no match origin",
@@ -3526,15 +3561,6 @@ DEFUN (no_match_origin,
                                 RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_origin,
-       no_match_origin_val_cmd,
-       "no match origin (egp|igp|incomplete)",
-       NO_STR
-       MATCH_STR
-       "BGP origin code\n"
-       "remote EGP\n"
-       "local IGP\n"
-       "unknown heritage\n")
 
 DEFUN (match_interface,
        match_interface_cmd,
@@ -3547,6 +3573,15 @@ DEFUN (match_interface,
                              RMAP_EVENT_MATCH_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match interface WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match first hop interface of route\n"
+ *     "Interface name\n"
+ *
+ */
 DEFUN (no_match_interface,
        no_match_interface_cmd,
        "no match interface",
@@ -3558,13 +3593,6 @@ DEFUN (no_match_interface,
                                 RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_interface,
-       no_match_interface_val_cmd,
-       "no match interface WORD",
-       NO_STR
-       MATCH_STR
-       "Match first hop interface of route\n"
-       "Interface name\n")
 
 DEFUN (match_tag,
        match_tag_cmd,
@@ -3577,6 +3605,15 @@ DEFUN (match_tag,
                              RMAP_EVENT_MATCH_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match tag <1-65535>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match tag of route\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (no_match_tag,
        no_match_tag_cmd,
        "no match tag",
@@ -3588,13 +3625,6 @@ DEFUN (no_match_tag,
                                 RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_tag,
-       no_match_tag_val_cmd,
-       "no match tag <1-65535>",
-       NO_STR
-       MATCH_STR
-       "Match tag of route\n"
-       "Tag value\n")
 
 
 DEFUN (set_ip_nexthop,
@@ -3647,6 +3677,23 @@ DEFUN (set_ip_nexthop_unchanged,
   return bgp_route_set_add (vty, vty->index, "ip next-hop", "unchanged");
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set ip next-hop peer-address",
+ *     NO_STR
+ *     SET_STR
+ *     IP_STR
+ *     "Next hop address\n"
+ *     "Use peer address (for BGP only)\n"
+ *
+ * "no set ip next-hop A.B.C.D",
+ *     NO_STR
+ *     SET_STR
+ *     IP_STR
+ *     "Next hop address\n"
+ *     "IP address of next hop\n"
+ *
+ */
 DEFUN (no_set_ip_nexthop,
        no_set_ip_nexthop_cmd,
        "no set ip next-hop",
@@ -3657,24 +3704,23 @@ DEFUN (no_set_ip_nexthop,
   return bgp_route_set_delete (vty, vty->index, "ip next-hop", argv[4]->arg);
 }
 
-ALIAS (no_set_ip_nexthop,
-       no_set_ip_nexthop_val_cmd,
-       "no set ip next-hop A.B.C.D",
-       NO_STR
-       SET_STR
-       IP_STR
-       "Next hop address\n"
-       "IP address of next hop\n")
 
-ALIAS (no_set_ip_nexthop,
-       no_set_ip_nexthop_peer_cmd,
-       "no set ip next-hop peer-address",
-       NO_STR
-       SET_STR
-       IP_STR
-       "Next hop address\n"
-       "Use peer address (for BGP only)\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "set metric (rtt|+rtt|-rtt)",
+ *     SET_STR
+ *     "Metric value for destination routing protocol\n"
+ *     "Assign round trip time\n"
+ *     "Add round trip time\n"
+ *     "Subtract round trip time\n"
+ *
+ * "set metric <+/-metric>",
+ *     SET_STR
+ *     "Metric value for destination routing protocol\n"
+ *     "Add or subtract metric\n"
+ *
+ */
 DEFUN (set_metric,
        set_metric_cmd,
        "set metric <0-4294967295>",
@@ -3685,22 +3731,17 @@ DEFUN (set_metric,
   return bgp_route_set_add (vty, vty->index, "metric", argv[2]->arg);
 }
 
-ALIAS (set_metric,
-       set_metric_addsub_cmd,
-       "set metric <+/-metric>",
-       SET_STR
-       "Metric value for destination routing protocol\n"
-       "Add or subtract metric\n")
 
-ALIAS (set_metric,
-       set_metric_rtt_cmd,
-       "set metric (rtt|+rtt|-rtt)",
-       SET_STR
-       "Metric value for destination routing protocol\n"
-       "Assign round trip time\n"
-       "Add round trip time\n"
-       "Subtract round trip time\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set metric <0-4294967295>",
+ *     NO_STR
+ *     SET_STR
+ *     "Metric value for destination routing protocol\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_set_metric,
        no_set_metric_cmd,
        "no set metric",
@@ -3711,13 +3752,6 @@ DEFUN (no_set_metric,
   return bgp_route_set_delete (vty, vty->index, "metric", argv[3]->arg);
 }
 
-ALIAS (no_set_metric,
-       no_set_metric_val_cmd,
-       "no set metric <0-4294967295>",
-       NO_STR
-       SET_STR
-       "Metric value for destination routing protocol\n"
-       "Metric value\n")
 
 DEFUN (set_local_pref,
        set_local_pref_cmd,
@@ -3729,6 +3763,15 @@ DEFUN (set_local_pref,
   return bgp_route_set_add (vty, vty->index, "local-preference", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set local-preference <0-4294967295>",
+ *     NO_STR
+ *     SET_STR
+ *     "BGP local preference path attribute\n"
+ *     "Preference value\n"
+ *
+ */
 DEFUN (no_set_local_pref,
        no_set_local_pref_cmd,
        "no set local-preference",
@@ -3739,13 +3782,6 @@ DEFUN (no_set_local_pref,
   return bgp_route_set_delete (vty, vty->index, "local-preference", argv[3]->arg);
 }
 
-ALIAS (no_set_local_pref,
-       no_set_local_pref_val_cmd,
-       "no set local-preference <0-4294967295>",
-       NO_STR
-       SET_STR
-       "BGP local preference path attribute\n"
-       "Preference value\n")
 
 DEFUN (set_weight,
        set_weight_cmd,
@@ -3757,6 +3793,15 @@ DEFUN (set_weight,
   return bgp_route_set_add (vty, vty->index, "weight", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set weight <0-4294967295>",
+ *     NO_STR
+ *     SET_STR
+ *     "BGP weight for routing table\n"
+ *     "Weight value\n"
+ *
+ */
 DEFUN (no_set_weight,
        no_set_weight_cmd,
        "no set weight",
@@ -3767,14 +3812,17 @@ DEFUN (no_set_weight,
   return bgp_route_set_delete (vty, vty->index, "weight", argv[3]->arg);
 }
 
-ALIAS (no_set_weight,
-       no_set_weight_val_cmd,
-       "no set weight <0-4294967295>",
-       NO_STR
-       SET_STR
-       "BGP weight for routing table\n"
-       "Weight value\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "set as-path prepend (last-as) <1-10>",
+ *     SET_STR
+ *     "Transform BGP AS_PATH attribute\n"
+ *     "Prepend to the as-path\n"
+ *     "Use the peer's AS-number\n"
+ *     "Number of times to insert"
+ *
+ */
 DEFUN (set_aspath_prepend,
        set_aspath_prepend_cmd,
        "set as-path prepend ." CMD_AS_RANGE,
@@ -3793,15 +3841,17 @@ DEFUN (set_aspath_prepend,
   return ret;
 }
 
-ALIAS (set_aspath_prepend,
-       set_aspath_prepend_lastas_cmd,
-       "set as-path prepend (last-as) <1-10>",
-       SET_STR
-       "Transform BGP AS_PATH attribute\n"
-       "Prepend to the as-path\n"
-       "Use the peer's AS-number\n"
-       "Number of times to insert")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set as-path prepend ." CMD_AS_RANGE,
+ *     NO_STR
+ *     SET_STR
+ *     "Transform BGP AS_PATH attribute\n"
+ *     "Prepend to the as-path\n"
+ *     "AS number\n"
+ *
+ */
 DEFUN (no_set_aspath_prepend,
        no_set_aspath_prepend_cmd,
        "no set as-path prepend",
@@ -3819,14 +3869,6 @@ DEFUN (no_set_aspath_prepend,
   return ret;
 }
 
-ALIAS (no_set_aspath_prepend,
-       no_set_aspath_prepend_val_cmd,
-       "no set as-path prepend ." CMD_AS_RANGE,
-       NO_STR
-       SET_STR
-       "Transform BGP AS_PATH attribute\n"
-       "Prepend to the as-path\n"
-       "AS number\n")
 
 DEFUN (set_aspath_exclude,
        set_aspath_exclude_cmd,
@@ -3845,6 +3887,16 @@ DEFUN (set_aspath_exclude,
   return ret;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set as-path exclude ." CMD_AS_RANGE,
+ *     NO_STR
+ *     SET_STR
+ *     "Transform BGP AS_PATH attribute\n"
+ *     "Exclude from the as-path\n"
+ *     "AS number\n"
+ *
+ */
 DEFUN (no_set_aspath_exclude,
        no_set_aspath_exclude_cmd,
        "no set as-path exclude",
@@ -3862,14 +3914,6 @@ DEFUN (no_set_aspath_exclude,
   return ret;
 }
 
-ALIAS (no_set_aspath_exclude,
-       no_set_aspath_exclude_val_cmd,
-       "no set as-path exclude ." CMD_AS_RANGE,
-       NO_STR
-       SET_STR
-       "Transform BGP AS_PATH attribute\n"
-       "Exclude from the as-path\n"
-       "AS number\n")
 
 DEFUN (set_community,
        set_community_cmd,
@@ -3974,6 +4018,21 @@ DEFUN (set_community_none,
   return bgp_route_set_add (vty, vty->index, "community", "none");
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set community none",
+ *     NO_STR
+ *     SET_STR
+ *     "BGP community attribute\n"
+ *     "No community attribute\n"
+ *
+ * "no set community .AA:NN",
+ *     NO_STR
+ *     SET_STR
+ *     "BGP community attribute\n"
+ *     COMMUNITY_VAL_STR
+ *
+ */
 DEFUN (no_set_community,
        no_set_community_cmd,
        "no set community",
@@ -3984,21 +4043,7 @@ DEFUN (no_set_community,
   return bgp_route_set_delete (vty, vty->index, "community", NULL);
 }
 
-ALIAS (no_set_community,
-       no_set_community_val_cmd,
-       "no set community .AA:NN",
-       NO_STR
-       SET_STR
-       "BGP community attribute\n"
-       COMMUNITY_VAL_STR)
 
-ALIAS (no_set_community,
-       no_set_community_none_cmd,
-       "no set community none",
-       NO_STR
-       SET_STR
-       "BGP community attribute\n"
-       "No community attribute\n")
 
 DEFUN (set_community_delete,
        set_community_delete_cmd,
@@ -4022,6 +4067,18 @@ DEFUN (set_community_delete,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set comm-list (<1-99>|<100-500>|WORD) delete",
+ *     NO_STR
+ *     SET_STR
+ *     "set BGP community list (for deletion)\n"
+ *     "Community-list number (standard)\n"
+ *     "Community-list number (expanded)\n"
+ *     "Community-list name\n"
+ *     "Delete matching communities\n"
+ *
+ */
 DEFUN (no_set_community_delete,
        no_set_community_delete_cmd,
        "no set comm-list",
@@ -4032,16 +4089,6 @@ DEFUN (no_set_community_delete,
   return bgp_route_set_delete (vty, vty->index, "comm-list", NULL);
 }
 
-ALIAS (no_set_community_delete,
-       no_set_community_delete_val_cmd,
-       "no set comm-list (<1-99>|<100-500>|WORD) delete",
-       NO_STR
-       SET_STR
-       "set BGP community list (for deletion)\n"
-       "Community-list number (standard)\n"
-       "Community-list number (expanded)\n"
-       "Community-list name\n"
-       "Delete matching communities\n")
 
 DEFUN (set_ecommunity_rt,
        set_ecommunity_rt_cmd,
@@ -4061,6 +4108,16 @@ DEFUN (set_ecommunity_rt,
   return ret;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set extcommunity rt .ASN:nn_or_IP-address:nn",
+ *     NO_STR
+ *     SET_STR
+ *     "BGP extended community attribute\n"
+ *     "Route Target extended community\n"
+ *     "VPN extended community\n"
+ *
+ */
 DEFUN (no_set_ecommunity_rt,
        no_set_ecommunity_rt_cmd,
        "no set extcommunity rt",
@@ -4072,14 +4129,6 @@ DEFUN (no_set_ecommunity_rt,
   return bgp_route_set_delete (vty, vty->index, "extcommunity rt", NULL);
 }
 
-ALIAS (no_set_ecommunity_rt,
-       no_set_ecommunity_rt_val_cmd,
-       "no set extcommunity rt .ASN:nn_or_IP-address:nn",
-       NO_STR
-       SET_STR
-       "BGP extended community attribute\n"
-       "Route Target extended community\n"
-       "VPN extended community\n")
 
 DEFUN (set_ecommunity_soo,
        set_ecommunity_soo_cmd,
@@ -4098,6 +4147,16 @@ DEFUN (set_ecommunity_soo,
   return ret;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set extcommunity soo .ASN:nn_or_IP-address:nn",
+ *     NO_STR
+ *     SET_STR
+ *     "BGP extended community attribute\n"
+ *     "Site-of-Origin extended community\n"
+ *     "VPN extended community\n"
+ *
+ */
 DEFUN (no_set_ecommunity_soo,
        no_set_ecommunity_soo_cmd,
        "no set extcommunity soo",
@@ -4109,14 +4168,6 @@ DEFUN (no_set_ecommunity_soo,
   return bgp_route_set_delete (vty, vty->index, "extcommunity soo", NULL);
 }
 
-ALIAS (no_set_ecommunity_soo,
-       no_set_ecommunity_soo_val_cmd,
-       "no set extcommunity soo .ASN:nn_or_IP-address:nn",
-       NO_STR
-       SET_STR
-       "BGP extended community attribute\n"
-       "Site-of-Origin extended community\n"
-       "VPN extended community\n")
 
 DEFUN (set_origin,
        set_origin_cmd,
@@ -4137,6 +4188,17 @@ DEFUN (set_origin,
   return CMD_WARNING;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set origin (egp|igp|incomplete)",
+ *     NO_STR
+ *     SET_STR
+ *     "BGP origin code\n"
+ *     "remote EGP\n"
+ *     "local IGP\n"
+ *     "unknown heritage\n"
+ *
+ */
 DEFUN (no_set_origin,
        no_set_origin_cmd,
        "no set origin",
@@ -4147,15 +4209,6 @@ DEFUN (no_set_origin,
   return bgp_route_set_delete (vty, vty->index, "origin", NULL);
 }
 
-ALIAS (no_set_origin,
-       no_set_origin_val_cmd,
-       "no set origin (egp|igp|incomplete)",
-       NO_STR
-       SET_STR
-       "BGP origin code\n"
-       "remote EGP\n"
-       "local IGP\n"
-       "unknown heritage\n")
 
 DEFUN (set_atomic_aggregate,
        set_atomic_aggregate_cmd,
@@ -4208,6 +4261,17 @@ DEFUN (set_aggregator_as,
   return ret;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set aggregator as " CMD_AS_RANGE " A.B.C.D",
+ *     NO_STR
+ *     SET_STR
+ *     "BGP aggregator attribute\n"
+ *     "AS number of aggregator\n"
+ *     "AS number\n"
+ *     "IP address of aggregator\n"
+ *
+ */
 DEFUN (no_set_aggregator_as,
        no_set_aggregator_as_cmd,
        "no set aggregator as",
@@ -4242,15 +4306,6 @@ DEFUN (no_set_aggregator_as,
   return ret;
 }
 
-ALIAS (no_set_aggregator_as,
-       no_set_aggregator_as_val_cmd,
-       "no set aggregator as " CMD_AS_RANGE " A.B.C.D",
-       NO_STR
-       SET_STR
-       "BGP aggregator attribute\n"
-       "AS number of aggregator\n"
-       "AS number\n"
-       "IP address of aggregator\n")
 
 DEFUN (set_tag,
        set_tag_cmd,
@@ -4262,6 +4317,15 @@ DEFUN (set_tag,
   return bgp_route_set_add (vty, vty->index, "tag", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set tag <1-65535>",
+ *     NO_STR
+ *     SET_STR
+ *     "Tag value for routing protocol\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (no_set_tag,
        no_set_tag_cmd,
        "no set tag",
@@ -4272,17 +4336,10 @@ DEFUN (no_set_tag,
   return bgp_route_set_delete (vty, vty->index, "tag", argv[3]->arg);
 }
 
-ALIAS (no_set_tag,
-       no_set_tag_val_cmd,
-       "no set tag <1-65535>",
-       NO_STR
-       SET_STR
-       "Tag value for routing protocol\n"
-       "Tag value\n")
 
 
 #ifdef HAVE_IPV6
-DEFUN (match_ipv6_address, 
+DEFUN (match_ipv6_address,
        match_ipv6_address_cmd,
        "match ipv6 address WORD",
        MATCH_STR
@@ -4294,7 +4351,7 @@ DEFUN (match_ipv6_address,
                              RMAP_EVENT_FILTER_ADDED);
 }
 
-DEFUN (no_match_ipv6_address, 
+DEFUN (no_match_ipv6_address,
        no_match_ipv6_address_cmd,
        "no match ipv6 address WORD",
        NO_STR
@@ -4307,7 +4364,7 @@ DEFUN (no_match_ipv6_address,
                                 RMAP_EVENT_FILTER_DELETED);
 }
 
-DEFUN (match_ipv6_next_hop, 
+DEFUN (match_ipv6_next_hop,
        match_ipv6_next_hop_cmd,
        "match ipv6 next-hop X:X::X:X",
        MATCH_STR
@@ -4332,7 +4389,7 @@ DEFUN (no_match_ipv6_next_hop,
                                 RMAP_EVENT_MATCH_DELETED);
 }
 
-DEFUN (match_ipv6_address_prefix_list, 
+DEFUN (match_ipv6_address_prefix_list,
        match_ipv6_address_prefix_list_cmd,
        "match ipv6 address prefix-list WORD",
        MATCH_STR
@@ -4435,6 +4492,17 @@ DEFUN (set_ipv6_nexthop_global,
   return bgp_route_set_add (vty, vty->index, "ipv6 next-hop global", argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set ipv6 next-hop global X:X::X:X",
+ *     NO_STR
+ *     SET_STR
+ *     IPV6_STR
+ *     "IPv6 next-hop address\n"
+ *     "IPv6 global address\n"
+ *     "IPv6 address of next hop\n"
+ *
+ */
 DEFUN (no_set_ipv6_nexthop_global,
        no_set_ipv6_nexthop_global_cmd,
        "no set ipv6 next-hop global",
@@ -4447,15 +4515,6 @@ DEFUN (no_set_ipv6_nexthop_global,
   return bgp_route_set_delete (vty, vty->index, "ipv6 next-hop global", argv[5]->arg);
 }
 
-ALIAS (no_set_ipv6_nexthop_global,
-       no_set_ipv6_nexthop_global_val_cmd,
-       "no set ipv6 next-hop global X:X::X:X",
-       NO_STR
-       SET_STR
-       IPV6_STR
-       "IPv6 next-hop address\n"
-       "IPv6 global address\n"
-       "IPv6 address of next hop\n")
 
 DEFUN (set_ipv6_nexthop_local,
        set_ipv6_nexthop_local_cmd,
@@ -4484,6 +4543,17 @@ DEFUN (set_ipv6_nexthop_local,
   return bgp_route_set_add (vty, vty->index, "ipv6 next-hop local", argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set ipv6 next-hop local X:X::X:X",
+ *     NO_STR
+ *     SET_STR
+ *     IPV6_STR
+ *     "IPv6 next-hop address\n"
+ *     "IPv6 local address\n"
+ *     "IPv6 address of next hop\n"
+ *
+ */
 DEFUN (no_set_ipv6_nexthop_local,
        no_set_ipv6_nexthop_local_cmd,
        "no set ipv6 next-hop local",
@@ -4496,15 +4566,6 @@ DEFUN (no_set_ipv6_nexthop_local,
   return bgp_route_set_delete (vty, vty->index, "ipv6 next-hop local", argv[5]->arg);
 }
 
-ALIAS (no_set_ipv6_nexthop_local,
-       no_set_ipv6_nexthop_local_val_cmd,
-       "no set ipv6 next-hop local X:X::X:X",
-       NO_STR
-       SET_STR
-       IPV6_STR
-       "IPv6 next-hop address\n"
-       "IPv6 local address\n"
-       "IPv6 address of next hop\n")
 #endif /* HAVE_IPV6 */
 
 DEFUN (set_vpnv4_nexthop,
@@ -4518,6 +4579,16 @@ DEFUN (set_vpnv4_nexthop,
   return bgp_route_set_add (vty, vty->index, "vpnv4 next-hop", argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set vpnv4 next-hop A.B.C.D",
+ *     NO_STR
+ *     SET_STR
+ *     "VPNv4 information\n"
+ *     "VPNv4 next-hop address\n"
+ *     "IP address of next hop\n"
+ *
+ */
 DEFUN (no_set_vpnv4_nexthop,
        no_set_vpnv4_nexthop_cmd,
        "no set vpnv4 next-hop",
@@ -4529,14 +4600,6 @@ DEFUN (no_set_vpnv4_nexthop,
   return bgp_route_set_delete (vty, vty->index, "vpnv4 next-hop", argv[4]->arg);
 }
 
-ALIAS (no_set_vpnv4_nexthop,
-       no_set_vpnv4_nexthop_val_cmd,
-       "no set vpnv4 next-hop A.B.C.D",
-       NO_STR
-       SET_STR
-       "VPNv4 information\n"
-       "VPNv4 next-hop address\n"
-       "IP address of next hop\n")
 
 DEFUN (set_originator_id,
        set_originator_id_cmd,
@@ -4548,6 +4611,15 @@ DEFUN (set_originator_id,
   return bgp_route_set_add (vty, vty->index, "originator-id", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set originator-id A.B.C.D",
+ *     NO_STR
+ *     SET_STR
+ *     "BGP originator ID attribute\n"
+ *     "IP address of originator\n"
+ *
+ */
 DEFUN (no_set_originator_id,
        no_set_originator_id_cmd,
        "no set originator-id",
@@ -4558,13 +4630,6 @@ DEFUN (no_set_originator_id,
   return bgp_route_set_delete (vty, vty->index, "originator-id", argv[3]->arg);
 }
 
-ALIAS (no_set_originator_id,
-       no_set_originator_id_val_cmd,
-       "no set originator-id A.B.C.D",
-       NO_STR
-       SET_STR
-       "BGP originator ID attribute\n"
-       "IP address of originator\n")
 
 /* Initialization of route map. */
 void
@@ -4614,112 +4679,74 @@ bgp_route_map_init (void)
   install_element (RMAP_NODE, &match_peer_cmd);
   install_element (RMAP_NODE, &match_peer_local_cmd);
   install_element (RMAP_NODE, &no_match_peer_cmd);
-  install_element (RMAP_NODE, &no_match_peer_val_cmd);
-  install_element (RMAP_NODE, &no_match_peer_local_cmd);
   install_element (RMAP_NODE, &match_ip_address_cmd);
   install_element (RMAP_NODE, &no_match_ip_address_cmd);
-  install_element (RMAP_NODE, &no_match_ip_address_val_cmd);
   install_element (RMAP_NODE, &match_ip_next_hop_cmd);
   install_element (RMAP_NODE, &no_match_ip_next_hop_cmd);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_val_cmd);
   install_element (RMAP_NODE, &match_ip_route_source_cmd);
   install_element (RMAP_NODE, &no_match_ip_route_source_cmd);
-  install_element (RMAP_NODE, &no_match_ip_route_source_val_cmd);
   install_element (RMAP_NODE, &match_ip_address_prefix_list_cmd);
   install_element (RMAP_NODE, &no_match_ip_address_prefix_list_cmd);
-  install_element (RMAP_NODE, &no_match_ip_address_prefix_list_val_cmd);
   install_element (RMAP_NODE, &match_ip_next_hop_prefix_list_cmd);
   install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_cmd);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_val_cmd);
   install_element (RMAP_NODE, &match_ip_route_source_prefix_list_cmd);
   install_element (RMAP_NODE, &no_match_ip_route_source_prefix_list_cmd);
-  install_element (RMAP_NODE, &no_match_ip_route_source_prefix_list_val_cmd);
 
   install_element (RMAP_NODE, &match_aspath_cmd);
   install_element (RMAP_NODE, &no_match_aspath_cmd);
-  install_element (RMAP_NODE, &no_match_aspath_val_cmd);
   install_element (RMAP_NODE, &match_metric_cmd);
   install_element (RMAP_NODE, &no_match_metric_cmd);
-  install_element (RMAP_NODE, &no_match_metric_val_cmd);
   install_element (RMAP_NODE, &match_local_pref_cmd);
   install_element (RMAP_NODE, &no_match_local_pref_cmd);
-  install_element (RMAP_NODE, &no_match_local_pref_val_cmd);
   install_element (RMAP_NODE, &match_community_cmd);
   install_element (RMAP_NODE, &match_community_exact_cmd);
   install_element (RMAP_NODE, &no_match_community_cmd);
-  install_element (RMAP_NODE, &no_match_community_val_cmd);
-  install_element (RMAP_NODE, &no_match_community_exact_cmd);
   install_element (RMAP_NODE, &match_ecommunity_cmd);
   install_element (RMAP_NODE, &no_match_ecommunity_cmd);
-  install_element (RMAP_NODE, &no_match_ecommunity_val_cmd);
   install_element (RMAP_NODE, &match_origin_cmd);
   install_element (RMAP_NODE, &no_match_origin_cmd);
-  install_element (RMAP_NODE, &no_match_origin_val_cmd);
   install_element (RMAP_NODE, &match_probability_cmd);
   install_element (RMAP_NODE, &no_match_probability_cmd);
-  install_element (RMAP_NODE, &no_match_probability_val_cmd);
   install_element (RMAP_NODE, &match_interface_cmd);
   install_element (RMAP_NODE, &no_match_interface_cmd);
-  install_element (RMAP_NODE, &no_match_interface_val_cmd);
   install_element (RMAP_NODE, &match_tag_cmd);
   install_element (RMAP_NODE, &no_match_tag_cmd);
-  install_element (RMAP_NODE, &no_match_tag_val_cmd);
 
   install_element (RMAP_NODE, &set_ip_nexthop_cmd);
   install_element (RMAP_NODE, &set_ip_nexthop_peer_cmd);
   install_element (RMAP_NODE, &set_ip_nexthop_unchanged_cmd);
   install_element (RMAP_NODE, &no_set_ip_nexthop_cmd);
-  install_element (RMAP_NODE, &no_set_ip_nexthop_val_cmd);
-  install_element (RMAP_NODE, &no_set_ip_nexthop_peer_cmd);
   install_element (RMAP_NODE, &set_local_pref_cmd);
   install_element (RMAP_NODE, &no_set_local_pref_cmd);
-  install_element (RMAP_NODE, &no_set_local_pref_val_cmd);
   install_element (RMAP_NODE, &set_weight_cmd);
   install_element (RMAP_NODE, &no_set_weight_cmd);
-  install_element (RMAP_NODE, &no_set_weight_val_cmd);
   install_element (RMAP_NODE, &set_metric_cmd);
-  install_element (RMAP_NODE, &set_metric_addsub_cmd);
-  install_element (RMAP_NODE, &set_metric_rtt_cmd);
   install_element (RMAP_NODE, &no_set_metric_cmd);
-  install_element (RMAP_NODE, &no_set_metric_val_cmd);
   install_element (RMAP_NODE, &set_aspath_prepend_cmd);
-  install_element (RMAP_NODE, &set_aspath_prepend_lastas_cmd);
   install_element (RMAP_NODE, &set_aspath_exclude_cmd);
   install_element (RMAP_NODE, &no_set_aspath_prepend_cmd);
-  install_element (RMAP_NODE, &no_set_aspath_prepend_val_cmd);
   install_element (RMAP_NODE, &no_set_aspath_exclude_cmd);
-  install_element (RMAP_NODE, &no_set_aspath_exclude_val_cmd);
   install_element (RMAP_NODE, &set_origin_cmd);
   install_element (RMAP_NODE, &no_set_origin_cmd);
-  install_element (RMAP_NODE, &no_set_origin_val_cmd);
   install_element (RMAP_NODE, &set_atomic_aggregate_cmd);
   install_element (RMAP_NODE, &no_set_atomic_aggregate_cmd);
   install_element (RMAP_NODE, &set_aggregator_as_cmd);
   install_element (RMAP_NODE, &no_set_aggregator_as_cmd);
-  install_element (RMAP_NODE, &no_set_aggregator_as_val_cmd);
   install_element (RMAP_NODE, &set_community_cmd);
   install_element (RMAP_NODE, &set_community_none_cmd);
   install_element (RMAP_NODE, &no_set_community_cmd);
-  install_element (RMAP_NODE, &no_set_community_val_cmd);
-  install_element (RMAP_NODE, &no_set_community_none_cmd);
   install_element (RMAP_NODE, &set_community_delete_cmd);
   install_element (RMAP_NODE, &no_set_community_delete_cmd);
-  install_element (RMAP_NODE, &no_set_community_delete_val_cmd);
   install_element (RMAP_NODE, &set_ecommunity_rt_cmd);
   install_element (RMAP_NODE, &no_set_ecommunity_rt_cmd);
-  install_element (RMAP_NODE, &no_set_ecommunity_rt_val_cmd);
   install_element (RMAP_NODE, &set_ecommunity_soo_cmd);
   install_element (RMAP_NODE, &no_set_ecommunity_soo_cmd);
-  install_element (RMAP_NODE, &no_set_ecommunity_soo_val_cmd);
   install_element (RMAP_NODE, &set_vpnv4_nexthop_cmd);
   install_element (RMAP_NODE, &no_set_vpnv4_nexthop_cmd);
-  install_element (RMAP_NODE, &no_set_vpnv4_nexthop_val_cmd);
   install_element (RMAP_NODE, &set_originator_id_cmd);
   install_element (RMAP_NODE, &no_set_originator_id_cmd);
-  install_element (RMAP_NODE, &no_set_originator_id_val_cmd);
   install_element (RMAP_NODE, &set_tag_cmd);
   install_element (RMAP_NODE, &no_set_tag_cmd);
-  install_element (RMAP_NODE, &no_set_tag_val_cmd);
 
 #ifdef HAVE_IPV6
   route_map_install_match (&route_match_ipv6_address_cmd);
@@ -4738,12 +4765,10 @@ bgp_route_map_init (void)
   install_element (RMAP_NODE, &no_match_ipv6_address_prefix_list_cmd);
   install_element (RMAP_NODE, &set_ipv6_nexthop_global_cmd);
   install_element (RMAP_NODE, &no_set_ipv6_nexthop_global_cmd);
-  install_element (RMAP_NODE, &no_set_ipv6_nexthop_global_val_cmd);
   install_element (RMAP_NODE, &set_ipv6_nexthop_prefer_global_cmd);
   install_element (RMAP_NODE, &no_set_ipv6_nexthop_prefer_global_cmd);
   install_element (RMAP_NODE, &set_ipv6_nexthop_local_cmd);
   install_element (RMAP_NODE, &no_set_ipv6_nexthop_local_cmd);
-  install_element (RMAP_NODE, &no_set_ipv6_nexthop_local_val_cmd);
   install_element (RMAP_NODE, &set_ipv6_nexthop_peer_cmd);
   install_element (RMAP_NODE, &no_set_ipv6_nexthop_peer_cmd);
 #endif /* HAVE_IPV6 */
index 32506c4e24aa68112a3b452ee1745dab27f1bac8..60e8d36c98def6e17ce9ca9f9b5fcd454aa40bfc 100644 (file)
@@ -622,6 +622,16 @@ DEFUN (bgp_config_type,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp config-type (cisco|zebra)",
+ *     NO_STR
+ *     BGP_STR
+ *     "Configuration type\n"
+ *     "cisco\n"
+ *     "zebra\n"
+ *
+ */
 DEFUN (no_bgp_config_type,
        no_bgp_config_type_cmd,
        "no bgp config-type",
@@ -633,14 +643,6 @@ DEFUN (no_bgp_config_type,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_config_type,
-       no_bgp_config_type_val_cmd,
-       "no bgp config-type (cisco|zebra)",
-       NO_STR
-       BGP_STR
-       "Configuration type\n"
-       "cisco\n"
-       "zebra\n")
 
 DEFUN (no_synchronization,
        no_synchronization_cmd,
@@ -661,8 +663,22 @@ DEFUN (no_auto_summary,
 }
 
 /* "router bgp" commands. */
-DEFUN (router_bgp, 
-       router_bgp_cmd, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "router bgp",
+ *     ROUTER_STR
+ *     BGP_STR
+ *
+ * "router bgp " CMD_AS_RANGE " (view|vrf) WORD",
+ *     ROUTER_STR
+ *     BGP_STR
+ *     AS_STR
+ *     "BGP view\nBGP VRF\n"
+ *     "View/VRF name\n"
+ *
+ */
+DEFUN (router_bgp,
+       router_bgp_cmd,
        "router bgp " CMD_AS_RANGE,
        ROUTER_STR
        BGP_STR
@@ -734,22 +750,25 @@ DEFUN (router_bgp,
   return CMD_SUCCESS;
 }
 
-ALIAS (router_bgp,
-       router_bgp_instance_cmd,
-       "router bgp " CMD_AS_RANGE " (view|vrf) WORD",
-       ROUTER_STR
-       BGP_STR
-       AS_STR
-       "BGP view\nBGP VRF\n"
-       "View/VRF name\n")
 
-ALIAS (router_bgp,
-       router_bgp_noasn_cmd,
-       "router bgp",
-       ROUTER_STR
-       BGP_STR)
 
 /* "no router bgp" commands. */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no router bgp",
+ *     NO_STR
+ *     ROUTER_STR
+ *     BGP_STR
+ *
+ * "no router bgp " CMD_AS_RANGE " (view|vrf) WORD",
+ *     NO_STR
+ *     ROUTER_STR
+ *     BGP_STR
+ *     AS_STR
+ *     "BGP view\nBGP VRF\n"
+ *     "View/VRF name\n"
+ *
+ */
 DEFUN (no_router_bgp,
        no_router_bgp_cmd,
        "no router bgp " CMD_AS_RANGE,
@@ -802,22 +821,7 @@ DEFUN (no_router_bgp,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_router_bgp,
-       no_router_bgp_instance_cmd,
-       "no router bgp " CMD_AS_RANGE " (view|vrf) WORD",
-       NO_STR
-       ROUTER_STR
-       BGP_STR
-       AS_STR
-       "BGP view\nBGP VRF\n"
-       "View/VRF name\n")
 
-ALIAS (no_router_bgp,
-       no_router_bgp_noasn_cmd,
-       "no router bgp",
-       NO_STR
-       ROUTER_STR
-       BGP_STR)
 
 /* BGP router-id.  */
 
@@ -846,6 +850,15 @@ DEFUN (bgp_router_id,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp router-id A.B.C.D",
+ *     NO_STR
+ *     BGP_STR
+ *     "Override configured router identifier\n"
+ *     "Manually configured router identifier\n"
+ *
+ */
 DEFUN (no_bgp_router_id,
        no_bgp_router_id_cmd,
        "no bgp router-id",
@@ -881,16 +894,17 @@ DEFUN (no_bgp_router_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_router_id,
-       no_bgp_router_id_val_cmd,
-       "no bgp router-id A.B.C.D",
-       NO_STR
-       BGP_STR
-       "Override configured router identifier\n"
-       "Manually configured router identifier\n")
 
 /* BGP Cluster ID.  */
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "bgp cluster-id <1-4294967295>",
+ *     BGP_STR
+ *     "Configure Route-Reflector Cluster-id\n"
+ *     "Route-Reflector Cluster-id as 32 bit quantity\n"
+ *
+ */
 DEFUN (bgp_cluster_id,
        bgp_cluster_id_cmd,
        "bgp cluster-id A.B.C.D",
@@ -917,13 +931,22 @@ DEFUN (bgp_cluster_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (bgp_cluster_id,
-       bgp_cluster_id32_cmd,
-       "bgp cluster-id <1-4294967295>",
-       BGP_STR
-       "Configure Route-Reflector Cluster-id\n"
-       "Route-Reflector Cluster-id as 32 bit quantity\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp cluster-id A.B.C.D",
+ *     NO_STR
+ *     BGP_STR
+ *     "Configure Route-Reflector Cluster-id\n"
+ *     "Route-Reflector Cluster-id in IP address format\n"
+ *
+ * "no bgp cluster-id <1-4294967295>",
+ *     NO_STR
+ *     BGP_STR
+ *     "Configure Route-Reflector Cluster-id\n"
+ *     "Route-Reflector Cluster-id as 32 bit quantity\n"
+ *
+ */
 DEFUN (no_bgp_cluster_id,
        no_bgp_cluster_id_cmd,
        "no bgp cluster-id",
@@ -953,21 +976,7 @@ DEFUN (no_bgp_cluster_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_cluster_id,
-       no_bgp_cluster_id_ip_cmd,
-       "no bgp cluster-id A.B.C.D",
-       NO_STR
-       BGP_STR
-       "Configure Route-Reflector Cluster-id\n"
-       "Route-Reflector Cluster-id in IP address format\n")
 
-ALIAS (no_bgp_cluster_id,
-       no_bgp_cluster_id_decimal_cmd,
-       "no bgp cluster-id <1-4294967295>",
-       NO_STR
-       BGP_STR
-       "Configure Route-Reflector Cluster-id\n"
-       "Route-Reflector Cluster-id as 32 bit quantity\n")
 
 DEFUN (bgp_confederation_identifier,
        bgp_confederation_identifier_cmd,
@@ -989,6 +998,16 @@ DEFUN (bgp_confederation_identifier,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp confederation identifier " CMD_AS_RANGE,
+ *     NO_STR
+ *     "BGP specific commands\n"
+ *     "AS confederation parameters\n"
+ *     "AS number\n"
+ *     "Set routing domain confederation AS\n"
+ *
+ */
 DEFUN (no_bgp_confederation_identifier,
        no_bgp_confederation_identifier_cmd,
        "no bgp confederation identifier",
@@ -1006,14 +1025,6 @@ DEFUN (no_bgp_confederation_identifier,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_confederation_identifier,
-       no_bgp_confederation_identifier_arg_cmd,
-       "no bgp confederation identifier " CMD_AS_RANGE,
-       NO_STR
-       "BGP specific commands\n"
-       "AS confederation parameters\n"
-       "AS number\n"
-       "Set routing domain confederation AS\n")
 
 DEFUN (bgp_confederation_peers,
        bgp_confederation_peers_cmd,
@@ -1152,6 +1163,16 @@ DEFUN (bgp_maxmed_admin_medv,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp max-med administrative <0-4294967294>",
+ *     NO_STR
+ *     BGP_STR
+ *     "Advertise routes with max-med\n"
+ *     "Administratively applied, for an indefinite period\n"
+ *     "Max MED value to be used\n"
+ *
+ */
 DEFUN (no_bgp_maxmed_admin,
        no_bgp_maxmed_admin_cmd,
        "no bgp max-med administrative",
@@ -1172,14 +1193,6 @@ DEFUN (no_bgp_maxmed_admin,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_maxmed_admin,
-       no_bgp_maxmed_admin_medv_cmd,
-       "no bgp max-med administrative <0-4294967294>",
-       NO_STR
-       BGP_STR
-       "Advertise routes with max-med\n"
-       "Administratively applied, for an indefinite period\n"
-       "Max MED value to be used\n")
 
 
 DEFUN (bgp_maxmed_onstartup,
@@ -1235,6 +1248,24 @@ DEFUN (bgp_maxmed_onstartup_medv,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp max-med on-startup <5-86400> <0-4294967294>",
+ *     NO_STR
+ *     BGP_STR
+ *     "Advertise routes with max-med\n"
+ *     "Effective on a startup\n"
+ *     "Time (seconds) period for max-med\n"
+ *     "Max MED value to be used\n"
+ *
+ * "no bgp max-med on-startup <5-86400>",
+ *     NO_STR
+ *     BGP_STR
+ *     "Advertise routes with max-med\n"
+ *     "Effective on a startup\n"
+ *     "Time (seconds) period for max-med\n"
+ *
+ */
 DEFUN (no_bgp_maxmed_onstartup,
        no_bgp_maxmed_onstartup_cmd,
        "no bgp max-med on-startup",
@@ -1262,24 +1293,7 @@ DEFUN (no_bgp_maxmed_onstartup,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_maxmed_onstartup,
-       no_bgp_maxmed_onstartup_period_cmd,
-       "no bgp max-med on-startup <5-86400>",
-       NO_STR
-       BGP_STR
-       "Advertise routes with max-med\n"
-       "Effective on a startup\n"
-       "Time (seconds) period for max-med\n")
 
-ALIAS (no_bgp_maxmed_onstartup,
-       no_bgp_maxmed_onstartup_period_medv_cmd,
-       "no bgp max-med on-startup <5-86400> <0-4294967294>",
-       NO_STR
-       BGP_STR
-       "Advertise routes with max-med\n"
-       "Effective on a startup\n"
-       "Time (seconds) period for max-med\n"
-       "Max MED value to be used\n")
 
 static int
 bgp_update_delay_config_vty (struct vty *vty, const char *delay,
@@ -1367,6 +1381,15 @@ DEFUN (bgp_update_delay_establish_wait,
 }
 
 /* Update-delay deconfiguration */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no update-delay <0-3600> <1-3600>",
+ *     "Force initial delay for best-path and updates\n"
+ *     "Seconds\n"
+ *     "Wait for peers to be established\n"
+ *     "Seconds\n"
+ *
+ */
 DEFUN (no_bgp_update_delay,
        no_bgp_update_delay_cmd,
        "no update-delay <0-3600>",
@@ -1376,13 +1399,6 @@ DEFUN (no_bgp_update_delay,
   return bgp_update_delay_deconfig_vty(vty);
 }
 
-ALIAS (no_bgp_update_delay,
-       no_bgp_update_delay_establish_wait_cmd,
-       "no update-delay <0-3600> <1-3600>",
-       "Force initial delay for best-path and updates\n"
-       "Seconds\n"
-       "Wait for peers to be established\n"
-       "Seconds\n")
 
 static int
 bgp_wpkt_quanta_config_vty (struct vty *vty, const char *num, char set)
@@ -1508,6 +1524,14 @@ DEFUN (bgp_maxpaths_ibgp_cluster,
                                 BGP_FLAG_IBGP_MULTIPATH_SAME_CLUSTERLEN, 1);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no maximum-paths " CMD_RANGE_STR(1, MULTIPATH_NUM),
+ *     NO_STR
+ *     "Forward packets over multiple paths\n"
+ *     "Number of paths\n"
+ *
+ */
 DEFUN (no_bgp_maxpaths,
        no_bgp_maxpaths_cmd,
        "no maximum-paths",
@@ -1518,13 +1542,23 @@ DEFUN (no_bgp_maxpaths,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_EBGP, NULL, 0, 0);
 }
 
-ALIAS (no_bgp_maxpaths,
-       no_bgp_maxpaths_arg_cmd,
-       "no maximum-paths " CMD_RANGE_STR(1, MULTIPATH_NUM),
-       NO_STR
-       "Forward packets over multiple paths\n"
-       "Number of paths\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM) " equal-cluster-length",
+ *     NO_STR
+ *     "Forward packets over multiple paths\n"
+ *     "iBGP-multipath\n"
+ *     "Number of paths\n"
+ *     "Match the cluster length\n"
+ *
+ * "no maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM),
+ *     NO_STR
+ *     "Forward packets over multiple paths\n"
+ *     "iBGP-multipath\n"
+ *     "Number of paths\n"
+ *
+ */
 DEFUN (no_bgp_maxpaths_ibgp,
        no_bgp_maxpaths_ibgp_cmd,
        "no maximum-paths ibgp",
@@ -1536,22 +1570,7 @@ DEFUN (no_bgp_maxpaths_ibgp,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_IBGP, NULL, 0, 0);
 }
 
-ALIAS (no_bgp_maxpaths_ibgp,
-       no_bgp_maxpaths_ibgp_arg_cmd,
-       "no maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM),
-       NO_STR
-       "Forward packets over multiple paths\n"
-       "iBGP-multipath\n"
-       "Number of paths\n")
 
-ALIAS (no_bgp_maxpaths_ibgp,
-       no_bgp_maxpaths_ibgp_cluster_cmd,
-       "no maximum-paths ibgp " CMD_RANGE_STR(1, MULTIPATH_NUM) " 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,
@@ -1610,6 +1629,16 @@ DEFUN (bgp_timers,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no timers bgp <0-65535> <0-65535>",
+ *     NO_STR
+ *     "Adjust routing timers\n"
+ *     "BGP timers\n"
+ *     "Keepalive interval\n"
+ *     "Holdtime\n"
+ *
+ */
 DEFUN (no_bgp_timers,
        no_bgp_timers_cmd,
        "no timers bgp",
@@ -1625,14 +1654,6 @@ DEFUN (no_bgp_timers,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_timers,
-       no_bgp_timers_arg_cmd,
-       "no timers bgp <0-65535> <0-65535>",
-       NO_STR
-       "Adjust routing timers\n"
-       "BGP timers\n"
-       "Keepalive interval\n"
-       "Holdtime\n")
 
 DEFUN (bgp_client_to_client_reflection,
        bgp_client_to_client_reflection_cmd,
@@ -1837,6 +1858,16 @@ DEFUN (bgp_graceful_restart_restart_time,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp graceful-restart stalepath-time <1-3600>",
+ *     NO_STR
+ *     "BGP specific commands\n"
+ *     "Graceful restart capability parameters\n"
+ *     "Set the max time to hold onto restarting peer's stale paths\n"
+ *     "Delay value (seconds)\n"
+ *
+ */
 DEFUN (no_bgp_graceful_restart_stalepath_time,
        no_bgp_graceful_restart_stalepath_time_cmd,
        "no bgp graceful-restart stalepath-time",
@@ -1855,6 +1886,16 @@ DEFUN (no_bgp_graceful_restart_stalepath_time,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp graceful-restart restart-time <1-3600>",
+ *     NO_STR
+ *     "BGP specific commands\n"
+ *     "Graceful restart capability parameters\n"
+ *     "Set the time to wait to delete stale routes before a BGP open message is received\n"
+ *     "Delay value (seconds)\n"
+ *
+ */
 DEFUN (no_bgp_graceful_restart_restart_time,
        no_bgp_graceful_restart_restart_time_cmd,
        "no bgp graceful-restart restart-time",
@@ -1873,23 +1914,7 @@ DEFUN (no_bgp_graceful_restart_restart_time,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_graceful_restart_stalepath_time,
-       no_bgp_graceful_restart_stalepath_time_val_cmd,
-       "no bgp graceful-restart stalepath-time <1-3600>",
-       NO_STR
-       "BGP specific commands\n"
-       "Graceful restart capability parameters\n"
-       "Set the max time to hold onto restarting peer's stale paths\n"
-       "Delay value (seconds)\n")
 
-ALIAS (no_bgp_graceful_restart_restart_time,
-       no_bgp_graceful_restart_restart_time_val_cmd,
-       "no bgp graceful-restart restart-time <1-3600>",
-       NO_STR
-       "BGP specific commands\n"
-       "Graceful restart capability parameters\n"
-       "Set the time to wait to delete stale routes before a BGP open message is received\n"
-       "Delay value (seconds)\n")
 
 /* "bgp fast-external-failover" configuration. */
 DEFUN (bgp_fast_external_failover,
@@ -2158,6 +2183,16 @@ DEFUN (bgp_bestpath_med,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "bgp bestpath med missing-as-worst confed",
+ *     "BGP specific commands\n"
+ *     "Change the default bestpath selection\n"
+ *     "MED attribute\n"
+ *     "Treat missing MED as the least preferred one\n"
+ *     "Compare MED among confederation paths\n"
+ *
+ */
 DEFUN (bgp_bestpath_med2,
        bgp_bestpath_med2_cmd,
        "bgp bestpath med confed missing-as-worst",
@@ -2177,14 +2212,6 @@ DEFUN (bgp_bestpath_med2,
   return CMD_SUCCESS;
 }
 
-ALIAS (bgp_bestpath_med2,
-       bgp_bestpath_med3_cmd,
-       "bgp bestpath med missing-as-worst confed",
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "MED attribute\n"
-       "Treat missing MED as the least preferred one\n"
-       "Compare MED among confederation paths\n")
 
 DEFUN (no_bgp_bestpath_med,
        no_bgp_bestpath_med_cmd,
@@ -2210,6 +2237,17 @@ DEFUN (no_bgp_bestpath_med,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp bestpath med missing-as-worst confed",
+ *     NO_STR
+ *     "BGP specific commands\n"
+ *     "Change the default bestpath selection\n"
+ *     "MED attribute\n"
+ *     "Treat missing MED as the least preferred one\n"
+ *     "Compare MED among confederation paths\n"
+ *
+ */
 DEFUN (no_bgp_bestpath_med2,
        no_bgp_bestpath_med2_cmd,
        "no bgp bestpath med confed missing-as-worst",
@@ -2230,15 +2268,6 @@ DEFUN (no_bgp_bestpath_med2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_bestpath_med2,
-       no_bgp_bestpath_med3_cmd,
-       "no bgp bestpath med missing-as-worst confed",
-       NO_STR
-       "BGP specific commands\n"
-       "Change the default bestpath selection\n"
-       "MED attribute\n"
-       "Treat missing MED as the least preferred one\n"
-       "Compare MED among confederation paths\n")
 
 /* "no bgp default ipv4-unicast". */
 DEFUN (no_bgp_default_ipv4_unicast,
@@ -2369,6 +2398,16 @@ DEFUN (bgp_default_local_preference,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp default local-preference <0-4294967295>",
+ *     NO_STR
+ *     "BGP specific commands\n"
+ *     "Configure BGP defaults\n"
+ *     "local preference (higher=more preferred)\n"
+ *     "Configure default local preference value\n"
+ *
+ */
 DEFUN (no_bgp_default_local_preference,
        no_bgp_default_local_preference_cmd,
        "no bgp default local-preference",
@@ -2386,14 +2425,6 @@ DEFUN (no_bgp_default_local_preference,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_default_local_preference,
-       no_bgp_default_local_preference_val_cmd,
-       "no bgp default local-preference <0-4294967295>",
-       NO_STR
-       "BGP specific commands\n"
-       "Configure BGP defaults\n"
-       "local preference (higher=more preferred)\n"
-       "Configure default local preference value\n")
 
 DEFUN (bgp_default_subgroup_pkt_queue_max,
        bgp_default_subgroup_pkt_queue_max_cmd,
@@ -2415,6 +2446,16 @@ DEFUN (bgp_default_subgroup_pkt_queue_max,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp default subgroup-pkt-queue-max <20-100>",
+ *     NO_STR
+ *     "BGP specific commands\n"
+ *     "Configure BGP defaults\n"
+ *     "subgroup-pkt-queue-max\n"
+ *     "Configure subgroup packet queue max\n"
+ *
+ */
 DEFUN (no_bgp_default_subgroup_pkt_queue_max,
        no_bgp_default_subgroup_pkt_queue_max_cmd,
        "no bgp default subgroup-pkt-queue-max",
@@ -2430,14 +2471,6 @@ DEFUN (no_bgp_default_subgroup_pkt_queue_max,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_default_subgroup_pkt_queue_max,
-       no_bgp_default_subgroup_pkt_queue_max_val_cmd,
-       "no bgp default subgroup-pkt-queue-max <20-100>",
-       NO_STR
-       "BGP specific commands\n"
-       "Configure BGP defaults\n"
-       "subgroup-pkt-queue-max\n"
-       "Configure subgroup packet queue max\n")
 
 DEFUN (bgp_rr_allow_outbound_policy,
        bgp_rr_allow_outbound_policy_cmd,
@@ -2504,6 +2537,16 @@ DEFUN (bgp_listen_limit,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp listen limit " DYNAMIC_NEIGHBOR_LIMIT_RANGE,
+ *     NO_STR
+ *     "BGP specific commands\n"
+ *     "Configure BGP defaults\n"
+ *     "maximum number of BGP Dynamic Neighbors that can be created\n"
+ *     "Configure Dynamic Neighbors listen limit value\n"
+ *
+ */
 DEFUN (no_bgp_listen_limit,
        no_bgp_listen_limit_cmd,
        "no bgp listen limit",
@@ -2519,14 +2562,6 @@ DEFUN (no_bgp_listen_limit,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_listen_limit,
-       no_bgp_listen_limit_val_cmd,
-       "no bgp listen limit " DYNAMIC_NEIGHBOR_LIMIT_RANGE,
-       NO_STR
-       "BGP specific commands\n"
-       "Configure BGP defaults\n"
-       "maximum number of BGP Dynamic Neighbors that can be created\n"
-       "Configure Dynamic Neighbors listen limit value\n")
 
 /*
  * Check if this listen range is already configured. Check for exact
@@ -2928,6 +2963,16 @@ peer_conf_interface_get (struct vty *vty, const char *conf_if, afi_t afi,
   return bgp_vty_return (vty, ret);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "neighbor WORD interface peer-group WORD",
+ *     NEIGHBOR_STR
+ *     "Interface name or neighbor tag\n"
+ *     "Enable BGP on interface\n"
+ *     "Member of the peer-group\n"
+ *     "peer-group name\n"
+ *
+ */
 DEFUN (neighbor_interface_config,
        neighbor_interface_config_cmd,
        "neighbor WORD interface",
@@ -2943,15 +2988,18 @@ DEFUN (neighbor_interface_config,
                                     NULL, NULL);
 }
 
-ALIAS (neighbor_interface_config,
-       neighbor_interface_config_peergroup_cmd,
-       "neighbor WORD interface peer-group WORD",
-       NEIGHBOR_STR
-       "Interface name or neighbor tag\n"
-       "Enable BGP on interface\n"
-       "Member of the peer-group\n"
-       "peer-group name\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "neighbor WORD interface v6only peer-group WORD",
+ *     NEIGHBOR_STR
+ *     "Interface name or neighbor tag\n"
+ *     "Enable BGP on interface\n"
+ *     "Enable BGP with v6 link-local only\n"
+ *     "Member of the peer-group\n"
+ *     "peer-group name\n"
+ *
+ */
 DEFUN (neighbor_interface_config_v6only,
        neighbor_interface_config_v6only_cmd,
        "neighbor WORD interface v6only",
@@ -2964,15 +3012,6 @@ DEFUN (neighbor_interface_config_v6only,
                                   argv[5]->arg, NULL);
 }
 
-ALIAS (neighbor_interface_config_v6only,
-       neighbor_interface_config_v6only_peergroup_cmd,
-       "neighbor WORD interface v6only peer-group WORD",
-       NEIGHBOR_STR
-       "Interface name or neighbor tag\n"
-       "Enable BGP on interface\n"
-       "Enable BGP with v6 link-local only\n"
-       "Member of the peer-group\n"
-       "peer-group name\n")
 
 DEFUN (neighbor_interface_config_remote_as,
        neighbor_interface_config_remote_as_cmd,
@@ -3024,6 +3063,16 @@ DEFUN (neighbor_peer_group,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD "remote-as (" CMD_AS_RANGE "|internal|external)",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR
+ *     "Specify a BGP neighbor\n"
+ *     AS_STR
+ *
+ */
 DEFUN (no_neighbor,
        no_neighbor_cmd,
        NO_NEIGHBOR_CMD2,
@@ -3082,15 +3131,49 @@ DEFUN (no_neighbor,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_neighbor,
-       no_neighbor_remote_as_cmd,
-       NO_NEIGHBOR_CMD "remote-as (" CMD_AS_RANGE "|internal|external)",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR
-       "Specify a BGP neighbor\n"
-       AS_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no neighbor WORD interface remote-as (" CMD_AS_RANGE "|internal|external)",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     "Interface name\n"
+ *     "Configure BGP on interface\n"
+ *     AS_STR
+ *
+ * "no neighbor WORD interface v6only peer-group WORD",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     "Interface name\n"
+ *     "Configure BGP on interface\n"
+ *     "Enable BGP with v6 link-local only\n"
+ *     "Member of the peer-group\n"
+ *     "peer-group name\n"
+ *
+ * "no neighbor WORD interface v6only remote-as (" CMD_AS_RANGE "|internal|external)",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     "Interface name\n"
+ *     "Configure BGP on interface\n"
+ *     "Enable BGP with v6 link-local only\n"
+ *     AS_STR
+ *
+ * "no neighbor WORD interface v6only",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     "Interface name\n"
+ *     "Configure BGP on interface\n"
+ *     "Enable BGP with v6 link-local only\n"
+ *
+ * "no neighbor WORD interface peer-group WORD",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     "Interface name\n"
+ *     "Configure BGP on interface\n"
+ *     "Member of the peer-group\n"
+ *     "peer-group name\n"
+ *
+ */
 DEFUN (no_neighbor_interface_config,
        no_neighbor_interface_config_cmd,
        "no neighbor WORD interface",
@@ -3118,54 +3201,10 @@ DEFUN (no_neighbor_interface_config,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_neighbor_interface_config,
-       no_neighbor_interface_config_peergroup_cmd,
-       "no neighbor WORD interface peer-group WORD",
-       NO_STR
-       NEIGHBOR_STR
-       "Interface name\n"
-       "Configure BGP on interface\n"
-       "Member of the peer-group\n"
-       "peer-group name\n")
 
-ALIAS (no_neighbor_interface_config,
-       no_neighbor_interface_config_v6only_cmd,
-       "no neighbor WORD interface v6only",
-       NO_STR
-       NEIGHBOR_STR
-       "Interface name\n"
-       "Configure BGP on interface\n"
-       "Enable BGP with v6 link-local only\n")
 
-ALIAS (no_neighbor_interface_config,
-       no_neighbor_interface_config_v6only_peergroup_cmd,
-       "no neighbor WORD interface v6only peer-group WORD",
-       NO_STR
-       NEIGHBOR_STR
-       "Interface name\n"
-       "Configure BGP on interface\n"
-       "Enable BGP with v6 link-local only\n"
-       "Member of the peer-group\n"
-       "peer-group name\n")
 
-ALIAS (no_neighbor_interface_config,
-       no_neighbor_interface_config_remote_as_cmd,
-       "no neighbor WORD interface remote-as (" CMD_AS_RANGE "|internal|external)",
-       NO_STR
-       NEIGHBOR_STR
-       "Interface name\n"
-       "Configure BGP on interface\n"
-       AS_STR)
 
-ALIAS (no_neighbor_interface_config,
-       no_neighbor_interface_config_v6only_remote_as_cmd,
-       "no neighbor WORD interface v6only remote-as (" CMD_AS_RANGE "|internal|external)",
-       NO_STR
-       NEIGHBOR_STR
-       "Interface name\n"
-       "Configure BGP on interface\n"
-       "Enable BGP with v6 link-local only\n"
-       AS_STR)
 
 DEFUN (no_neighbor_peer_group,
        no_neighbor_peer_group_cmd,
@@ -3280,6 +3319,33 @@ DEFUN (neighbor_local_as_no_prepend_replace_as,
 }
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE,
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Specify a local-as number\n"
+ *     "AS number used as local AS\n"
+ *
+ * NO_NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE " no-prepend",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Specify a local-as number\n"
+ *     "AS number used as local AS\n"
+ *     "Do not prepend local-as to updates from ebgp peers\n"
+ *
+ * NO_NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE " no-prepend replace-as",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Specify a local-as number\n"
+ *     "AS number used as local AS\n"
+ *     "Do not prepend local-as to updates from ebgp peers\n"
+ *     "Do not prepend local-as to updates from ibgp peers\n"
+ *
+ */
 DEFUN (no_neighbor_local_as,
        no_neighbor_local_as_cmd,
        NO_NEIGHBOR_CMD2 "local-as",
@@ -3299,35 +3365,8 @@ DEFUN (no_neighbor_local_as,
   return bgp_vty_return (vty, ret);
 }
 
-ALIAS (no_neighbor_local_as,
-       no_neighbor_local_as_val_cmd,
-       NO_NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE,
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Specify a local-as number\n"
-       "AS number used as local AS\n")
 
-ALIAS (no_neighbor_local_as,
-       no_neighbor_local_as_val2_cmd,
-       NO_NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE " no-prepend",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Specify a local-as number\n"
-       "AS number used as local AS\n"
-       "Do not prepend local-as to updates from ebgp peers\n")
 
-ALIAS (no_neighbor_local_as,
-       no_neighbor_local_as_val3_cmd,
-       NO_NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE " no-prepend replace-as",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Specify a local-as number\n"
-       "AS number used as local AS\n"
-       "Do not prepend local-as to updates from ebgp peers\n"
-       "Do not prepend local-as to updates from ibgp peers\n")
 
 DEFUN (neighbor_solo,
        neighbor_solo_cmd,
@@ -3385,6 +3424,16 @@ DEFUN (neighbor_password,
   return bgp_vty_return (vty, ret);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "password LINE",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Set a password\n"
+ *     "The password\n"
+ *
+ */
 DEFUN (no_neighbor_password,
        no_neighbor_password_cmd,
        NO_NEIGHBOR_CMD2 "password",
@@ -3404,14 +3453,6 @@ DEFUN (no_neighbor_password,
   return bgp_vty_return (vty, ret);
 }
 
-ALIAS (no_neighbor_password,
-       no_neighbor_password_val_cmd,
-       NO_NEIGHBOR_CMD2 "password LINE",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Set a password\n"
-       "The password\n")
 
 DEFUN (neighbor_activate,
        neighbor_activate_cmd,
@@ -4183,6 +4224,57 @@ DEFUN (no_neighbor_nexthop_local_unchanged,
                                 PEER_FLAG_NEXTHOP_LOCAL_UNCHANGED );
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NEIGHBOR_CMD2 "attribute-unchanged med next-hop as-path",
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "Med attribute\n"
+ *     "Nexthop attribute\n"
+ *     "As-path attribute\n"
+ *
+ * NEIGHBOR_CMD2 "attribute-unchanged med as-path next-hop",
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "Med attribute\n"
+ *     "As-path attribute\n"
+ *     "Nexthop attribute\n"
+ *
+ * NEIGHBOR_CMD2 "attribute-unchanged as-path next-hop med",
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "As-path attribute\n"
+ *     "Nexthop attribute\n"
+ *     "Med attribute\n"
+ *
+ * NEIGHBOR_CMD2 "attribute-unchanged next-hop as-path med",
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "Nexthop attribute\n"
+ *     "As-path attribute\n"
+ *     "Med attribute\n"
+ *
+ * NEIGHBOR_CMD2 "attribute-unchanged as-path med next-hop",
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "As-path attribute\n"
+ *     "Med attribute\n"
+ *     "Nexthop attribute\n"
+ *
+ * NEIGHBOR_CMD2 "attribute-unchanged next-hop med as-path",
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "Nexthop attribute\n"
+ *     "Med attribute\n"
+ *     "As-path attribute\n"
+ *
+ */
 DEFUN (neighbor_attr_unchanged,
        neighbor_attr_unchanged_cmd,
        NEIGHBOR_CMD2 "attribute-unchanged",
@@ -4284,66 +4376,69 @@ DEFUN (neighbor_attr_unchanged4,
                               bgp_node_safi (vty), flags);
 }
 
-ALIAS (neighbor_attr_unchanged,
-       neighbor_attr_unchanged5_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged as-path next-hop med",
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n"
-       "Med attribute\n")
 
-ALIAS (neighbor_attr_unchanged,
-       neighbor_attr_unchanged6_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged as-path med next-hop",
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Med attribute\n"
-       "Nexthop attribute\n")
 
-ALIAS (neighbor_attr_unchanged,
-       neighbor_attr_unchanged7_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged next-hop med as-path",
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
-       "Med attribute\n"
-       "As-path attribute\n")
 
-ALIAS (neighbor_attr_unchanged,
-       neighbor_attr_unchanged8_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged next-hop as-path med",
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
-       "As-path attribute\n"
-       "Med attribute\n")
 
-ALIAS (neighbor_attr_unchanged,
-       neighbor_attr_unchanged9_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged med next-hop as-path",
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "Nexthop attribute\n"
-       "As-path attribute\n")
 
-ALIAS (neighbor_attr_unchanged,
-       neighbor_attr_unchanged10_cmd,
-       NEIGHBOR_CMD2 "attribute-unchanged med as-path next-hop",
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "attribute-unchanged next-hop med as-path",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "Nexthop attribute\n"
+ *     "Med attribute\n"
+ *     "As-path attribute\n"
+ *
+ * NO_NEIGHBOR_CMD2 "attribute-unchanged as-path med next-hop",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "As-path attribute\n"
+ *     "Med attribute\n"
+ *     "Nexthop attribute\n"
+ *
+ * NO_NEIGHBOR_CMD2 "attribute-unchanged med as-path next-hop",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "Med attribute\n"
+ *     "As-path attribute\n"
+ *     "Nexthop attribute\n"
+ *
+ * NO_NEIGHBOR_CMD2 "attribute-unchanged next-hop as-path med",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "Nexthop attribute\n"
+ *     "As-path attribute\n"
+ *     "Med attribute\n"
+ *
+ * NO_NEIGHBOR_CMD2 "attribute-unchanged as-path next-hop med",
+ *     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"
+ *
+ * NO_NEIGHBOR_CMD2 "attribute-unchanged med next-hop as-path",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP attribute is propagated unchanged to this neighbor\n"
+ *     "Med attribute\n"
+ *     "Nexthop attribute\n"
+ *     "As-path attribute\n"
+ *
+ */
 DEFUN (no_neighbor_attr_unchanged,
        no_neighbor_attr_unchanged_cmd,
        NO_NEIGHBOR_CMD2 "attribute-unchanged",
@@ -4449,71 +4544,11 @@ DEFUN (no_neighbor_attr_unchanged4,
                               bgp_node_safi (vty), flags);
 }
 
-ALIAS (no_neighbor_attr_unchanged,
-       no_neighbor_attr_unchanged5_cmd,
-       NO_NEIGHBOR_CMD2 "attribute-unchanged as-path next-hop med",
-       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")
 
-ALIAS (no_neighbor_attr_unchanged,
-       no_neighbor_attr_unchanged6_cmd,
-       NO_NEIGHBOR_CMD2 "attribute-unchanged as-path med next-hop",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "As-path attribute\n"
-       "Med attribute\n"
-       "Nexthop attribute\n")
 
-ALIAS (no_neighbor_attr_unchanged,
-       no_neighbor_attr_unchanged7_cmd,
-       NO_NEIGHBOR_CMD2 "attribute-unchanged next-hop med as-path",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
-       "Med attribute\n"
-       "As-path attribute\n")
 
-ALIAS (no_neighbor_attr_unchanged,
-       no_neighbor_attr_unchanged8_cmd,
-       NO_NEIGHBOR_CMD2 "attribute-unchanged next-hop as-path med",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Nexthop attribute\n"
-       "As-path attribute\n"
-       "Med attribute\n")
 
-ALIAS (no_neighbor_attr_unchanged,
-       no_neighbor_attr_unchanged9_cmd,
-       NO_NEIGHBOR_CMD2 "attribute-unchanged med next-hop as-path",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "Nexthop attribute\n"
-       "As-path attribute\n")
 
-ALIAS (no_neighbor_attr_unchanged,
-       no_neighbor_attr_unchanged10_cmd,
-       NO_NEIGHBOR_CMD2 "attribute-unchanged med as-path next-hop",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP attribute is propagated unchanged to this neighbor\n"
-       "Med attribute\n"
-       "As-path attribute\n"
-       "Nexthop attribute\n")
 
 /* EBGP multihop configuration. */
 static int
@@ -4572,6 +4607,16 @@ DEFUN (neighbor_ebgp_multihop_ttl,
   return peer_ebgp_multihop_set_vty (vty, argv[1]->arg, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "ebgp-multihop " CMD_RANGE_STR(1, MAXTTL),
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Allow EBGP neighbors not on directly connected networks\n"
+ *     "maximum hop count\n"
+ *
+ */
 DEFUN (no_neighbor_ebgp_multihop,
        no_neighbor_ebgp_multihop_cmd,
        NO_NEIGHBOR_CMD2 "ebgp-multihop",
@@ -4583,16 +4628,16 @@ DEFUN (no_neighbor_ebgp_multihop,
   return peer_ebgp_multihop_unset_vty (vty, argv[2]->arg);
 }
 
-ALIAS (no_neighbor_ebgp_multihop,
-       no_neighbor_ebgp_multihop_ttl_cmd,
-       NO_NEIGHBOR_CMD2 "ebgp-multihop " CMD_RANGE_STR(1, MAXTTL),
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Allow EBGP neighbors not on directly connected networks\n"
-       "maximum hop count\n")
 
 /* disable-connected-check */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NEIGHBOR_CMD2 "enforce-multihop",
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Enforce EBGP neighbors perform multihop\n"
+ *
+ */
 DEFUN (neighbor_disable_connected_check,
        neighbor_disable_connected_check_cmd,
        NEIGHBOR_CMD2 "disable-connected-check",
@@ -4603,6 +4648,15 @@ DEFUN (neighbor_disable_connected_check,
   return peer_flag_set_vty (vty, argv[1]->arg, PEER_FLAG_DISABLE_CONNECTED_CHECK);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "enforce-multihop",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Enforce EBGP neighbors perform multihop\n"
+ *
+ */
 DEFUN (no_neighbor_disable_connected_check,
        no_neighbor_disable_connected_check_cmd,
        NO_NEIGHBOR_CMD2 "disable-connected-check",
@@ -4615,21 +4669,8 @@ DEFUN (no_neighbor_disable_connected_check,
 }
 
 /* Enforce multihop.  */
-ALIAS (neighbor_disable_connected_check,
-       neighbor_enforce_multihop_cmd,
-       NEIGHBOR_CMD2 "enforce-multihop",
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Enforce EBGP neighbors perform multihop\n")
 
 /* Enforce multihop.  */
-ALIAS (no_neighbor_disable_connected_check,
-       no_neighbor_enforce_multihop_cmd,
-       NO_NEIGHBOR_CMD2 "enforce-multihop",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Enforce EBGP neighbors perform multihop\n")
 
 DEFUN (neighbor_description,
        neighbor_description_cmd,
@@ -4658,6 +4699,16 @@ DEFUN (neighbor_description,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "description .LINE",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Neighbor specific description\n"
+ *     "Up to 80 characters describing this neighbor\n"
+ *
+ */
 DEFUN (no_neighbor_description,
        no_neighbor_description_cmd,
        NO_NEIGHBOR_CMD2 "description",
@@ -4677,14 +4728,6 @@ DEFUN (no_neighbor_description,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_neighbor_description,
-       no_neighbor_description_val_cmd,
-       NO_NEIGHBOR_CMD2 "description .LINE",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Neighbor specific description\n"
-       "Up to 80 characters describing this neighbor\n")
 
 /* Neighbor update-source. */
 static int
@@ -4792,6 +4835,17 @@ DEFUN (neighbor_default_originate_rmap,
                                         bgp_node_safi (vty), argv[4]->arg, 1);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "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"
+ *
+ */
 DEFUN (no_neighbor_default_originate,
        no_neighbor_default_originate_cmd,
        NO_NEIGHBOR_CMD2 "default-originate",
@@ -4804,15 +4858,6 @@ DEFUN (no_neighbor_default_originate,
                                         bgp_node_safi (vty), NULL, 0);
 }
 
-ALIAS (no_neighbor_default_originate,
-       no_neighbor_default_originate_rmap_cmd,
-       NO_NEIGHBOR_CMD2 "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
@@ -4854,6 +4899,16 @@ DEFUN (neighbor_port,
   return peer_port_vty (vty, argv[1]->arg, AFI_IP, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD "port <0-65535>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR
+ *     "Neighbor's BGP port\n"
+ *     "TCP port number\n"
+ *
+ */
 DEFUN (no_neighbor_port,
        no_neighbor_port_cmd,
        NO_NEIGHBOR_CMD "port",
@@ -4865,14 +4920,6 @@ DEFUN (no_neighbor_port,
   return peer_port_vty (vty, argv[2]->arg, AFI_IP, NULL);
 }
 
-ALIAS (no_neighbor_port,
-       no_neighbor_port_val_cmd,
-       NO_NEIGHBOR_CMD "port <0-65535>",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR
-       "Neighbor's BGP port\n"
-       "TCP port number\n")
 
 /* neighbor weight. */
 static int
@@ -4918,6 +4965,16 @@ DEFUN (neighbor_weight,
   return peer_weight_set_vty (vty, argv[1]->arg, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "weight <0-65535>",
+ *     NO_STR
+ *     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_CMD2 "weight",
@@ -4929,14 +4986,6 @@ DEFUN (no_neighbor_weight,
   return peer_weight_unset_vty (vty, argv[2]->arg);
 }
 
-ALIAS (no_neighbor_weight,
-       no_neighbor_weight_val_cmd,
-       NO_NEIGHBOR_CMD2 "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,
@@ -5029,6 +5078,17 @@ DEFUN (neighbor_timers,
   return peer_timers_set_vty (vty, argv[1]->arg, argv[3]->arg, argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "timers <0-65535> <0-65535>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP per neighbor timers\n"
+ *     "Keepalive interval\n"
+ *     "Holdtime\n"
+ *
+ */
 DEFUN (no_neighbor_timers,
        no_neighbor_timers_cmd,
        NO_NEIGHBOR_CMD2 "timers",
@@ -5040,15 +5100,6 @@ DEFUN (no_neighbor_timers,
   return peer_timers_unset_vty (vty, argv[2]->arg);
 }
 
-ALIAS (no_neighbor_timers,
-       no_neighbor_timers_val_cmd,
-       NO_NEIGHBOR_CMD2 "timers <0-65535> <0-65535>",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP per neighbor timers\n"
-       "Keepalive interval\n"
-       "Holdtime\n")
 
 static int
 peer_timers_connect_set_vty (struct vty *vty, const char *ip_str, 
@@ -5096,6 +5147,17 @@ DEFUN (neighbor_timers_connect,
   return peer_timers_connect_set_vty (vty, argv[1]->arg, argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "timers connect <1-65535>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "BGP per neighbor timers\n"
+ *     "BGP connect timer\n"
+ *     "Connect timer\n"
+ *
+ */
 DEFUN (no_neighbor_timers_connect,
        no_neighbor_timers_connect_cmd,
        NO_NEIGHBOR_CMD2 "timers connect",
@@ -5108,15 +5170,6 @@ DEFUN (no_neighbor_timers_connect,
   return peer_timers_connect_unset_vty (vty, argv[2]->arg);
 }
 
-ALIAS (no_neighbor_timers_connect,
-       no_neighbor_timers_connect_val_cmd,
-       NO_NEIGHBOR_CMD2 "timers connect <1-65535>",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "BGP per neighbor timers\n"
-       "BGP connect timer\n"
-       "Connect timer\n")
 
 static int
 peer_advertise_interval_vty (struct vty *vty, const char *ip_str, 
@@ -5152,6 +5205,16 @@ DEFUN (neighbor_advertise_interval,
   return peer_advertise_interval_vty (vty, argv[1]->arg, argv[3]->arg, 1);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "advertisement-interval <0-600>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Minimum interval between sending BGP routing updates\n"
+ *     "time in seconds\n"
+ *
+ */
 DEFUN (no_neighbor_advertise_interval,
        no_neighbor_advertise_interval_cmd,
        NO_NEIGHBOR_CMD2 "advertisement-interval",
@@ -5163,14 +5226,6 @@ DEFUN (no_neighbor_advertise_interval,
   return peer_advertise_interval_vty (vty, argv[2]->arg, NULL, 0);
 }
 
-ALIAS (no_neighbor_advertise_interval,
-       no_neighbor_advertise_interval_val_cmd,
-       NO_NEIGHBOR_CMD2 "advertisement-interval <0-600>",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Minimum interval between sending BGP routing updates\n"
-       "time in seconds\n")
 
 /* Time to wait before processing route-map updates */
 DEFUN (bgp_set_route_map_delay_timer,
@@ -5202,6 +5257,15 @@ DEFUN (bgp_set_route_map_delay_timer,
     return CMD_WARNING;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bgp route-map delay-timer <0-600>",
+ *     NO_STR
+ *     "Default BGP route-map delay timer\n"
+ *     "Reset to default time to wait for processing route-map changes\n"
+ *     "0 disables the timer, no route updates happen when route-maps change\n"
+ *
+ */
 DEFUN (no_bgp_set_route_map_delay_timer,
        no_bgp_set_route_map_delay_timer_cmd,
        "no bgp route-map delay-timer",
@@ -5215,13 +5279,6 @@ DEFUN (no_bgp_set_route_map_delay_timer,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bgp_set_route_map_delay_timer,
-       no_bgp_set_route_map_delay_timer_val_cmd,
-       "no bgp route-map delay-timer <0-600>",
-       NO_STR
-       "Default BGP route-map delay timer\n"
-       "Reset to default time to wait for processing route-map changes\n"
-       "0 disables the timer, no route updates happen when route-maps change\n")
 
 /* neighbor interface */
 static int
@@ -5773,6 +5830,60 @@ DEFUN (neighbor_maximum_prefix_threshold_restart,
                                      bgp_node_safi (vty), argv[3]->arg, argv[4]->arg, 0, argv[6]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Maximum number of prefix accept from this peer\n"
+ *     "maximum no. of prefix limit\n"
+ *
+ * NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> <1-100> restart <1-65535>",
+ *     NO_STR
+ *     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"
+ *     "Restart bgp connection after limit is exceeded\n"
+ *     "Restart interval in minutes"
+ *
+ * NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> warning-only",
+ *     NO_STR
+ *     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"
+ *
+ * NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> restart <1-65535>",
+ *     NO_STR
+ *     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"
+ *
+ * NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> <1-100> warning-only",
+ *     NO_STR
+ *     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"
+ *
+ * NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> <1-100>",
+ *     NO_STR
+ *     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 (no_neighbor_maximum_prefix,
        no_neighbor_maximum_prefix_cmd,
        NO_NEIGHBOR_CMD2 "maximum-prefix",
@@ -5785,70 +5896,22 @@ DEFUN (no_neighbor_maximum_prefix,
                                        bgp_node_safi (vty));
 }
  
-ALIAS (no_neighbor_maximum_prefix,
-       no_neighbor_maximum_prefix_val_cmd,
-       NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295>",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Maximum number of prefix accept from this peer\n"
-       "maximum no. of prefix limit\n")
 
-ALIAS (no_neighbor_maximum_prefix,
-       no_neighbor_maximum_prefix_threshold_cmd,
-       NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> <1-100>",
-       NO_STR
-       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")
 
-ALIAS (no_neighbor_maximum_prefix,
-       no_neighbor_maximum_prefix_warning_cmd,
-       NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> warning-only",
-       NO_STR
-       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")
 
-ALIAS (no_neighbor_maximum_prefix,
-       no_neighbor_maximum_prefix_threshold_warning_cmd,
-       NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> <1-100> warning-only",
-       NO_STR
-       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")
 
-ALIAS (no_neighbor_maximum_prefix,
-       no_neighbor_maximum_prefix_restart_cmd,
-       NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> restart <1-65535>",
-       NO_STR
-       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")
 
-ALIAS (no_neighbor_maximum_prefix,
-       no_neighbor_maximum_prefix_threshold_restart_cmd,
-       NO_NEIGHBOR_CMD2 "maximum-prefix <1-4294967295> <1-100> restart <1-65535>",
-       NO_STR
-       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"
-       "Restart bgp connection after limit is exceeded\n"
-       "Restart interval in minutes")
 
 /* "neighbor allowas-in" */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NEIGHBOR_CMD2 "allowas-in <1-10>",
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "Accept as-path with my AS present in it\n"
+ *     "Number of occurances of AS number\n"
+ *
+ */
 DEFUN (neighbor_allowas_in,
        neighbor_allowas_in_cmd,
        NEIGHBOR_CMD2 "allowas-in",
@@ -5875,14 +5938,17 @@ DEFUN (neighbor_allowas_in,
   return bgp_vty_return (vty, ret);
 }
 
-ALIAS (neighbor_allowas_in,
-       neighbor_allowas_in_arg_cmd,
-       NEIGHBOR_CMD2 "allowas-in <1-10>",
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "Accept as-path with my AS present in it\n"
-       "Number of occurances of AS number\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * NO_NEIGHBOR_CMD2 "allowas-in <1-10>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     NEIGHBOR_ADDR_STR2
+ *     "allow local ASN appears in aspath attribute\n"
+ *     "Number of occurances of AS number\n"
+ *
+ */
 DEFUN (no_neighbor_allowas_in,
        no_neighbor_allowas_in_cmd,
        NO_NEIGHBOR_CMD2 "allowas-in",
@@ -5903,14 +5969,6 @@ DEFUN (no_neighbor_allowas_in,
   return bgp_vty_return (vty, ret);
 }
 
-ALIAS (no_neighbor_allowas_in,
-       no_neighbor_allowas_in_val_cmd,
-       NO_NEIGHBOR_CMD2 "allowas-in <1-10>",
-       NO_STR
-       NEIGHBOR_STR
-       NEIGHBOR_ADDR_STR2
-       "allow local ASN appears in aspath attribute\n"
-       "Number of occurances of AS number\n")
 
 DEFUN (neighbor_ttl_security,
        neighbor_ttl_security_cmd,
@@ -6074,6 +6132,14 @@ DEFUN (address_family_ipv6_safi,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "address-family vpnv4 unicast",
+ *     "Enter Address Family command mode\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *
+ */
 DEFUN (address_family_vpnv4,
        address_family_vpnv4_cmd,
        "address-family vpnv4",
@@ -6084,13 +6150,15 @@ DEFUN (address_family_vpnv4,
   return CMD_SUCCESS;
 }
 
-ALIAS (address_family_vpnv4,
-       address_family_vpnv4_unicast_cmd,
-       "address-family vpnv4 unicast",
-       "Enter Address Family command mode\n"
-       "Address family\n"
-       "Address Family Modifier\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "address-family vpnv6 unicast",
+ *     "Enter Address Family command mode\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *
+ */
 DEFUN (address_family_vpnv6,
        address_family_vpnv6_cmd,
        "address-family vpnv6",
@@ -6101,13 +6169,14 @@ DEFUN (address_family_vpnv6,
   return CMD_SUCCESS;
 }
 
-ALIAS (address_family_vpnv6,
-       address_family_vpnv6_unicast_cmd,
-       "address-family vpnv6 unicast",
-       "Enter Address Family command mode\n"
-       "Address family\n"
-       "Address Family Modifier\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "address-family encapv4",
+ *     "Enter Address Family command mode\n"
+ *     "Address family\n"
+ *
+ */
 DEFUN (address_family_encap,
        address_family_encap_cmd,
        "address-family encap",
@@ -6118,11 +6187,6 @@ DEFUN (address_family_encap,
   return CMD_SUCCESS;
 }
 
-ALIAS (address_family_encap,
-       address_family_encapv4_cmd,
-       "address-family encapv4",
-       "Enter Address Family command mode\n"
-       "Address family\n")
 
 DEFUN (address_family_encapv6,
        address_family_encapv6_cmd,
@@ -6232,6 +6296,40 @@ bgp_clear_prefix (struct vty *vty, const char *view_name, const char *ip_str,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp *",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " ipv6 *",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Clear all peers\n"
+ *
+ * "clear ip bgp " BGP_INSTANCE_CMD " *",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *
+ * "clear bgp ipv6 *",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all peers\n"
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " *",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *
+ */
 DEFUN (clear_ip_bgp_all,
        clear_ip_bgp_all_cmd,
        "clear ip bgp *",
@@ -6243,49 +6341,57 @@ DEFUN (clear_ip_bgp_all,
   return bgp_clear_vty (vty, argv[4]->arg, 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 *",
-       CLEAR_STR
-       BGP_STR
-       "Clear all peers\n")
 
-ALIAS (clear_ip_bgp_all,
-       clear_bgp_instance_all_cmd,
-       "clear bgp " BGP_INSTANCE_CMD " *",
-       CLEAR_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Clear all peers\n")
 
-ALIAS (clear_ip_bgp_all,
-       clear_bgp_ipv6_all_cmd,
-       "clear bgp ipv6 *",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear all peers\n")
 
-ALIAS (clear_ip_bgp_all,
-       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")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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"
+ *
+ * "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD)",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "BGP neighbor address to clear\n"
+ *     "BGP IPv6 neighbor to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *
+ * "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"
+ *
+ * "clear bgp (A.B.C.D|X:X::X:X|WORD)",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "BGP IPv6 neighbor to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *
+ * "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"
+ *
+ */
 DEFUN (clear_ip_bgp_peer,
-       clear_ip_bgp_peer_cmd, 
+       clear_ip_bgp_peer_cmd,
        "clear ip bgp (A.B.C.D|X:X::X:X|WORD)",
        CLEAR_STR
        IP_STR
@@ -6300,59 +6406,52 @@ DEFUN (clear_ip_bgp_peer,
   return bgp_clear_vty (vty, NULL, 0, 0, clear_peer, BGP_CLEAR_SOFT_NONE, argv[3]->arg);
 }
 
-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)",
-       CLEAR_STR
-       BGP_STR
-       "BGP neighbor address to clear\n"
-       "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)",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "BGP neighbor address to clear\n"
-       "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")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp peer-group WORD",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *
+ * "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"
+ *
+ * "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"
+ *
+ * "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"
+ *
+ * "clear bgp ipv6 peer-group WORD",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *
+ */
 DEFUN (clear_ip_bgp_peer_group,
-       clear_ip_bgp_peer_group_cmd, 
+       clear_ip_bgp_peer_group_cmd,
        "clear ip bgp peer-group WORD",
        CLEAR_STR
        IP_STR
@@ -6366,52 +6465,45 @@ DEFUN (clear_ip_bgp_peer_group,
   return bgp_clear_vty (vty, NULL, 0, 0, clear_group, BGP_CLEAR_SOFT_NONE, argv[4]->arg);
 }
 
-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",
-       CLEAR_STR
-       BGP_STR
-       "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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp " BGP_INSTANCE_CMD " ipv6 external",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Clear all external peers\n"
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " external",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all external peers\n"
+ *
+ * "clear bgp external",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear all external peers\n"
+ *
+ * "clear bgp ipv6 external",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all external peers\n"
+ *
+ * "clear ip bgp " BGP_INSTANCE_CMD " external",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all external peers\n"
+ *
+ */
 DEFUN (clear_ip_bgp_external,
        clear_ip_bgp_external_cmd,
        "clear ip bgp external",
@@ -6426,47 +6518,35 @@ DEFUN (clear_ip_bgp_external,
   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",
-       CLEAR_STR
-       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",
-       CLEAR_STR
-       BGP_STR
-       "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")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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"
+ *
+ * "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"
+ *
+ * "clear bgp prefix A.B.C.D/M",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear bestpath and re-advertise\n"
+ *     "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
+ *
+ */
 DEFUN (clear_ip_bgp_prefix,
        clear_ip_bgp_prefix_cmd,
        "clear ip bgp prefix A.B.C.D/M",
@@ -6482,33 +6562,43 @@ DEFUN (clear_ip_bgp_prefix,
   return bgp_clear_prefix (vty, NULL, argv[4]->arg, 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",
-       CLEAR_STR
-       BGP_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_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")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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"
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " " CMD_AS_RANGE,
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear peers with the AS number\n"
+ *
+ * "clear bgp ipv6 " CMD_AS_RANGE,
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear peers with the AS number\n"
+ *
+ * "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"
+ *
+ * "clear bgp " CMD_AS_RANGE,
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear peers with the AS number\n"
+ *
+ */
 DEFUN (clear_ip_bgp_as,
        clear_ip_bgp_as_cmd,
        "clear ip bgp " CMD_AS_RANGE,
@@ -6523,48 +6613,39 @@ DEFUN (clear_ip_bgp_as,
   return bgp_clear_vty (vty, NULL, 0, 0, clear_as, BGP_CLEAR_SOFT_NONE, argv[3]->arg);
 }       
 
-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,
-       CLEAR_STR
-       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,
-       CLEAR_STR
-       BGP_STR
-       "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 */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " BGP_INSTANCE_CMD " * out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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
+ *
+ * "clear ip bgp * out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ */
 DEFUN (clear_ip_bgp_all_soft_out,
        clear_ip_bgp_all_soft_out_cmd,
        "clear ip bgp * soft out",
@@ -6583,36 +6664,22 @@ 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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all peers\n"
-       BGP_SOFT_OUT_STR)
 
-ALIAS (clear_ip_bgp_all_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_OUT_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp * ipv4 (unicast|multicast) out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ */
 DEFUN (clear_ip_bgp_all_ipv4_soft_out,
        clear_ip_bgp_all_ipv4_soft_out_cmd,
        "clear ip bgp * ipv4 (unicast|multicast) soft out",
@@ -6634,6 +6701,20 @@ DEFUN (clear_ip_bgp_all_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) 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
+ *
+ */
 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",
@@ -6655,31 +6736,20 @@ DEFUN (clear_ip_bgp_instance_all_ipv4_soft_out,
                         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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       BGP_SOFT_OUT_STR)
 
-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
-       BGP_INSTANCE_HELP_STR
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       BGP_SOFT_OUT_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp * vpnv4 unicast out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ */
 DEFUN (clear_ip_bgp_all_vpnv4_soft_out,
        clear_ip_bgp_all_vpnv4_soft_out_cmd,
        "clear ip bgp * vpnv4 unicast soft out",
@@ -6696,17 +6766,19 @@ DEFUN (clear_ip_bgp_all_vpnv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, NULL);
 }
 
-ALIAS (clear_ip_bgp_all_vpnv4_soft_out,
-       clear_ip_bgp_all_vpnv4_out_cmd,
-       "clear ip bgp * vpnv4 unicast out",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       BGP_SOFT_OUT_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp * encap unicast out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *     "Soft reconfig outbound update\n"
+ *
+ */
 DEFUN (clear_ip_bgp_all_encap_soft_out,
        clear_ip_bgp_all_encap_soft_out_cmd,
        "clear ip bgp * encap unicast soft out",
@@ -6723,17 +6795,63 @@ DEFUN (clear_ip_bgp_all_encap_soft_out,
                        BGP_CLEAR_SOFT_OUT, NULL);
 }
 
-ALIAS (clear_ip_bgp_all_encap_soft_out,
-       clear_ip_bgp_all_encap_out_cmd,
-       "clear ip bgp * encap unicast out",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig outbound update\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "clear bgp ipv6 * soft out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all peers\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_OUT_STR
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " * soft out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_OUT_STR
+ *
+ * "clear bgp ipv6 * out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all peers\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "clear bgp * out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " * out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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_all_soft_out,
        clear_bgp_all_soft_out_cmd,
        "clear bgp * soft out",
@@ -6751,72 +6869,12 @@ DEFUN (clear_bgp_all_soft_out,
                        BGP_CLEAR_SOFT_OUT, NULL);
 }
 
-ALIAS (clear_bgp_all_soft_out,
-       clear_bgp_instance_all_soft_out_cmd,
-       "clear bgp " BGP_INSTANCE_CMD " * soft out",
-       CLEAR_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Clear all peers\n"
-       BGP_SOFT_STR
-       BGP_SOFT_OUT_STR)
 
-ALIAS (clear_bgp_all_soft_out,
-       clear_bgp_all_out_cmd,
-       "clear bgp * out",
-       CLEAR_STR
-       BGP_STR
-       "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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear all peers\n"
-       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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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,
@@ -6851,6 +6909,36 @@ DEFUN (clear_bgp_instance_ipv6_safi_prefix,
     return bgp_clear_prefix (vty, argv[3]->arg, argv[7]->arg, AFI_IP6, SAFI_UNICAST, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "clear ip bgp (A.B.C.D|WORD) out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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_soft_out,
        clear_ip_bgp_peer_soft_out_cmd,
        "clear ip bgp (A.B.C.D|WORD) soft out",
@@ -6870,39 +6958,23 @@ DEFUN (clear_ip_bgp_peer_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[3]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "BGP neighbor address to clear\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\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",
@@ -6925,6 +6997,21 @@ DEFUN (clear_ip_bgp_peer_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ */
 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",
@@ -6948,34 +7035,22 @@ DEFUN (clear_ip_bgp_instance_peer_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[5]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "BGP neighbor address to clear\n"
-       "BGP neighbor on interface to clear\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "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 */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp (A.B.C.D|WORD) vpnv4 unicast out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ */
 DEFUN (clear_ip_bgp_peer_vpnv4_soft_out,
        clear_ip_bgp_peer_vpnv4_soft_out_cmd,
        "clear ip bgp (A.B.C.D|WORD) vpnv4 unicast soft out",
@@ -6993,18 +7068,19 @@ DEFUN (clear_ip_bgp_peer_vpnv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[3]->arg);
 }
 
-ALIAS (clear_ip_bgp_peer_vpnv4_soft_out,
-       clear_ip_bgp_peer_vpnv4_out_cmd,
-       "clear ip bgp (A.B.C.D|WORD) vpnv4 unicast out",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "BGP neighbor address to clear\n"
-       "BGP neighbor on interface to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       BGP_SOFT_OUT_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp A.B.C.D encap unicast out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *     "Soft reconfig outbound update\n"
+ *
+ */
 DEFUN (clear_ip_bgp_peer_encap_soft_out,
        clear_ip_bgp_peer_encap_soft_out_cmd,
        "clear ip bgp A.B.C.D encap unicast soft out",
@@ -7021,17 +7097,77 @@ DEFUN (clear_ip_bgp_peer_encap_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[3]->arg);
 }
 
-ALIAS (clear_ip_bgp_peer_encap_soft_out,
-       clear_ip_bgp_peer_encap_out_cmd,
-       "clear ip bgp A.B.C.D encap unicast out",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig outbound update\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) out",
+ *     CLEAR_STR
+ *     BGP_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
+ *
+ * "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
+ *
+ * "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) soft out",
+ *     CLEAR_STR
+ *     BGP_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
+ *
+ * "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
+ *
+ * "clear bgp (A.B.C.D|X:X::X:X|WORD) out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "BGP IPv6 neighbor to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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
+ *
+ */
 DEFUN (clear_bgp_peer_soft_out,
        clear_bgp_peer_soft_out_cmd,
        "clear bgp (A.B.C.D|X:X::X:X|WORD) soft out",
@@ -7051,139 +7187,79 @@ DEFUN (clear_bgp_peer_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[2]->arg);
 }
 
-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",
+
+
+
+
+
+
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp peer-group WORD out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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
+ *
+ * "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_soft_out,
+       clear_ip_bgp_peer_group_soft_out_cmd,
+       "clear ip bgp peer-group WORD soft out",
        CLEAR_STR
+       IP_STR
        BGP_STR
-       "Address family\n"
-       "BGP neighbor address to clear\n"
-       "BGP IPv6 neighbor to clear\n"
-       "BGP neighbor on interface to clear\n"
+       "Clear all members of peer-group\n"
+       "BGP peer-group name\n"
        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",
-       CLEAR_STR
-       BGP_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_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",
-       CLEAR_STR
-       BGP_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)
-
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       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]);
+{
+  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[4]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all members of peer-group\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp peer-group WORD ipv4 (unicast|multicast) out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_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_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",
@@ -7206,6 +7282,21 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_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",
@@ -7229,33 +7320,71 @@ DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[6]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_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)
 
-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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "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
+ *
+ * "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
+ *
+ * "clear bgp ipv6 peer-group WORD soft out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_OUT_STR
+ *
+ * "clear bgp peer-group WORD out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "clear bgp ipv6 peer-group WORD out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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
+ *
+ */
 DEFUN (clear_bgp_peer_group_soft_out,
        clear_bgp_peer_group_soft_out_cmd,
        "clear bgp peer-group WORD soft out",
@@ -7274,82 +7403,42 @@ DEFUN (clear_bgp_peer_group_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[3]->arg);
 }
 
-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",
-       CLEAR_STR
-       BGP_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_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",
-       CLEAR_STR
-       BGP_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_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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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_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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "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
+ *
+ * "clear ip bgp external out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all external peers\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_cmd,
        "clear ip bgp external soft out",
        CLEAR_STR
        IP_STR
@@ -7366,36 +7455,22 @@ DEFUN (clear_ip_bgp_external_soft_out,
                        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_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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp external ipv4 (unicast|multicast) out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all external peers\n"
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ */
 DEFUN (clear_ip_bgp_external_ipv4_soft_out,
        clear_ip_bgp_external_ipv4_soft_out_cmd,
        "clear ip bgp external ipv4 (unicast|multicast) soft out",
@@ -7417,6 +7492,20 @@ DEFUN (clear_ip_bgp_external_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_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",
@@ -7439,31 +7528,64 @@ DEFUN (clear_ip_bgp_instance_external_ipv4_soft_out,
                        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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all external peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 external WORD out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " external out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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
+ *
+ * "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
+ *
+ * "clear bgp ipv6 external soft out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_OUT_STR
+ *
+ * "clear bgp external out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ */
 DEFUN (clear_bgp_external_soft_out,
        clear_bgp_external_soft_out_cmd,
        "clear bgp external soft out",
@@ -7481,73 +7603,40 @@ DEFUN (clear_bgp_external_soft_out,
                        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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear all external peers\n"
-       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",
-       CLEAR_STR
-       BGP_STR
-       "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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "clear ip bgp " CMD_AS_RANGE " out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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_soft_out,
        clear_ip_bgp_as_soft_out_cmd,
        "clear ip bgp " CMD_AS_RANGE " soft out",
@@ -7566,36 +7655,22 @@ DEFUN (clear_ip_bgp_as_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[3]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_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_ipv4_soft_out,
        clear_ip_bgp_as_ipv4_soft_out_cmd,
        "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) soft out",
@@ -7617,6 +7692,20 @@ DEFUN (clear_ip_bgp_as_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_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",
@@ -7639,31 +7728,20 @@ DEFUN (clear_ip_bgp_instance_as_ipv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[5]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear peers with the AS number\n"
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ */
 DEFUN (clear_ip_bgp_as_vpnv4_soft_out,
        clear_ip_bgp_as_vpnv4_soft_out_cmd,
        "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast soft out",
@@ -7680,17 +7758,19 @@ DEFUN (clear_ip_bgp_as_vpnv4_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[3]->arg);
 }
 
-ALIAS (clear_ip_bgp_as_vpnv4_soft_out,
-       clear_ip_bgp_as_vpnv4_out_cmd,
-       "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast out",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       BGP_SOFT_OUT_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " CMD_AS_RANGE " encap unicast out",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear peers with the AS number\n"
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Soft reconfig outbound update\n"
+ *
+ */
 DEFUN (clear_ip_bgp_as_encap_soft_out,
        clear_ip_bgp_as_encap_soft_out_cmd,
        "clear ip bgp " CMD_AS_RANGE " encap unicast soft out",
@@ -7707,17 +7787,63 @@ DEFUN (clear_ip_bgp_as_encap_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[3]->arg);
 }
 
-ALIAS (clear_ip_bgp_as_encap_soft_out,
-       clear_ip_bgp_as_encap_out_cmd,
-       "clear ip bgp " CMD_AS_RANGE " encap unicast out",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Soft reconfig outbound update\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 " CMD_AS_RANGE " soft out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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
+ *
+ * "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
+ *
+ * "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
+ *
+ * "clear bgp " CMD_AS_RANGE " out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "clear bgp ipv6 " CMD_AS_RANGE " out",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_OUT_STR
+ *
+ * "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
+ *
+ */
 DEFUN (clear_bgp_as_soft_out,
        clear_bgp_as_soft_out_cmd,
        "clear bgp " CMD_AS_RANGE " soft out",
@@ -7735,74 +7861,41 @@ DEFUN (clear_bgp_as_soft_out,
                        BGP_CLEAR_SOFT_OUT, argv[2]->arg);
 }
 
-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",
-       CLEAR_STR
-       BGP_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_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",
-       CLEAR_STR
-       BGP_STR
-       "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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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 */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "clear ip bgp " BGP_INSTANCE_CMD " * soft in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_IN_STR
+ *
+ * "clear ip bgp * in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_IN_STR
+ *
+ */
 DEFUN (clear_ip_bgp_all_soft_in,
        clear_ip_bgp_all_soft_in_cmd,
        "clear ip bgp * soft in",
@@ -7821,35 +7914,8 @@ DEFUN (clear_ip_bgp_all_soft_in,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
-ALIAS (clear_ip_bgp_all_soft_in,
-       clear_ip_bgp_instance_all_soft_in_cmd,
-       "clear ip bgp " BGP_INSTANCE_CMD " * soft in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Clear all peers\n"
-       BGP_SOFT_STR
-       BGP_SOFT_IN_STR)
 
-ALIAS (clear_ip_bgp_all_soft_in,
-       clear_ip_bgp_all_in_cmd,
-       "clear ip bgp * in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "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,
@@ -7869,6 +7935,19 @@ DEFUN (clear_ip_bgp_all_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_all_ipv4_soft_in,
        clear_ip_bgp_all_ipv4_soft_in_cmd,
        "clear ip bgp * ipv4 (unicast|multicast) soft in",
@@ -7890,6 +7969,20 @@ DEFUN (clear_ip_bgp_all_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_soft_in,
        clear_ip_bgp_instance_all_ipv4_soft_in_cmd,
        "clear ip bgp " BGP_INSTANCE_CMD " * ipv4 (unicast|multicast) soft in",
@@ -7912,30 +8005,7 @@ DEFUN (clear_ip_bgp_instance_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)
 
-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_all_ipv4_in_prefix_filter,
        clear_ip_bgp_all_ipv4_in_prefix_filter_cmd,
@@ -7958,6 +8028,18 @@ DEFUN (clear_ip_bgp_all_ipv4_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp * vpnv4 unicast in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *     BGP_SOFT_IN_STR
+ *
+ */
 DEFUN (clear_ip_bgp_all_vpnv4_soft_in,
        clear_ip_bgp_all_vpnv4_soft_in_cmd,
        "clear ip bgp * vpnv4 unicast soft in",
@@ -7974,17 +8056,19 @@ DEFUN (clear_ip_bgp_all_vpnv4_soft_in,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
-ALIAS (clear_ip_bgp_all_vpnv4_soft_in,
-       clear_ip_bgp_all_vpnv4_in_cmd,
-       "clear ip bgp * vpnv4 unicast in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       BGP_SOFT_IN_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp * encap unicast in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *     "Soft reconfig inbound update\n"
+ *
+ */
 DEFUN (clear_ip_bgp_all_encap_soft_in,
        clear_ip_bgp_all_encap_soft_in_cmd,
        "clear ip bgp * encap unicast soft in",
@@ -8001,17 +8085,63 @@ DEFUN (clear_ip_bgp_all_encap_soft_in,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
-ALIAS (clear_ip_bgp_all_encap_soft_in,
-       clear_ip_bgp_all_encap_in_cmd,
-       "clear ip bgp * encap unicast in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all peers\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig inbound update\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 * soft in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all peers\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "clear bgp * in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " * in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "clear bgp ipv6 * in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all peers\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " * soft in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_IN_STR
+ *
+ */
 DEFUN (clear_bgp_all_soft_in,
        clear_bgp_all_soft_in_cmd,
        "clear bgp * soft in",
@@ -8029,73 +8159,24 @@ DEFUN (clear_bgp_all_soft_in,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
-ALIAS (clear_bgp_all_soft_in,
-       clear_bgp_instance_all_soft_in_cmd,
-       "clear bgp " BGP_INSTANCE_CMD " * soft in",
-       CLEAR_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Clear all peers\n"
-       BGP_SOFT_STR
-       BGP_SOFT_IN_STR)
 
-ALIAS (clear_bgp_all_soft_in,
-       clear_bgp_ipv6_all_soft_in_cmd,
-       "clear bgp ipv6 * soft in",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear all peers\n"
-       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",
-       CLEAR_STR
-       BGP_STR
-       "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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 * in prefix-filter",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all peers\n"
+ *     BGP_SOFT_IN_STR
+ *     "Push out prefix-list ORF and do inbound soft reconfig\n"
+ *
+ */
 DEFUN (clear_bgp_all_in_prefix_filter,
        clear_bgp_all_in_prefix_filter_cmd,
        "clear bgp * in prefix-filter",
@@ -8109,16 +8190,37 @@ DEFUN (clear_bgp_all_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
 }
 
-ALIAS (clear_bgp_all_in_prefix_filter,
-       clear_bgp_ipv6_all_in_prefix_filter_cmd,
-       "clear bgp ipv6 * in prefix-filter",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear all peers\n"
-       BGP_SOFT_IN_STR
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "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
+ *
+ * "clear ip bgp (A.B.C.D|WORD) in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *     BGP_SOFT_IN_STR
+ *
+ */
 DEFUN (clear_ip_bgp_peer_soft_in,
        clear_ip_bgp_peer_soft_in_cmd,
        "clear ip bgp (A.B.C.D|WORD) soft in",
@@ -8138,38 +8240,8 @@ DEFUN (clear_ip_bgp_peer_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[3]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "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,
@@ -8186,6 +8258,20 @@ DEFUN (clear_ip_bgp_peer_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     BGP_SOFT_IN_STR
+ *
+ */
 DEFUN (clear_ip_bgp_peer_ipv4_soft_in,
        clear_ip_bgp_peer_ipv4_soft_in_cmd,
        "clear ip bgp (A.B.C.D|WORD) ipv4 (unicast|multicast) soft in",
@@ -8208,6 +8294,21 @@ DEFUN (clear_ip_bgp_peer_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_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",
@@ -8231,32 +8332,7 @@ DEFUN (clear_ip_bgp_instance_peer_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[5]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "BGP neighbor address to clear\n"
-       "BGP neighbor on interface to clear\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "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,
@@ -8280,6 +8356,19 @@ DEFUN (clear_ip_bgp_peer_ipv4_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp (A.B.C.D|WORD) vpnv4 unicast in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *     BGP_SOFT_IN_STR
+ *
+ */
 DEFUN (clear_ip_bgp_peer_vpnv4_soft_in,
        clear_ip_bgp_peer_vpnv4_soft_in_cmd,
        "clear ip bgp (A.B.C.D|WORD) vpnv4 unicast soft in",
@@ -8290,152 +8379,152 @@ DEFUN (clear_ip_bgp_peer_vpnv4_soft_in,
        "BGP neighbor on interface to clear\n"
        "Address family\n"
        "Address Family Modifier\n"
-       BGP_SOFT_STR
-       BGP_SOFT_IN_STR)
-{
-  return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_peer,
-                       BGP_CLEAR_SOFT_IN, argv[3]->arg);
-}
-
-ALIAS (clear_ip_bgp_peer_vpnv4_soft_in,
-       clear_ip_bgp_peer_vpnv4_in_cmd,
-       "clear ip bgp (A.B.C.D|WORD) vpnv4 unicast in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "BGP neighbor address to clear\n"
-       "BGP neighbor on interface to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       BGP_SOFT_IN_STR)
-
-DEFUN (clear_ip_bgp_peer_encap_soft_in,
-       clear_ip_bgp_peer_encap_soft_in_cmd,
-       "clear ip bgp A.B.C.D encap unicast soft in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig\n"
-       "Soft reconfig inbound update\n")
-{
-  return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_peer,
-                       BGP_CLEAR_SOFT_IN, argv[3]->arg);
-}
-
-ALIAS (clear_ip_bgp_peer_encap_soft_in,
-       clear_ip_bgp_peer_encap_in_cmd,
-       "clear ip bgp A.B.C.D encap unicast in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "BGP neighbor address to clear\n"
-       "Address family\n"
-       "Address Family Modifier\n"
-       "Soft reconfig inbound update\n")
-
-DEFUN (clear_bgp_peer_soft_in,
-       clear_bgp_peer_soft_in_cmd,
-       "clear bgp (A.B.C.D|X:X::X:X|WORD) soft in",
-       CLEAR_STR
-       BGP_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)
-{
-  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[2]->arg);
-}
-
-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",
-       CLEAR_STR
-       BGP_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_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",
-       CLEAR_STR
-       BGP_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_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_STR
        BGP_SOFT_IN_STR)
+{
+  return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_MPLS_VPN, clear_peer,
+                       BGP_CLEAR_SOFT_IN, argv[3]->arg);
+}
+
 
-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",
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp A.B.C.D encap unicast in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "Address family\n"
+ *     "Address Family Modifier\n"
+ *     "Soft reconfig inbound update\n"
+ *
+ */
+DEFUN (clear_ip_bgp_peer_encap_soft_in,
+       clear_ip_bgp_peer_encap_soft_in_cmd,
+       "clear ip bgp A.B.C.D encap unicast soft in",
        CLEAR_STR
+       IP_STR
        BGP_STR
-       "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)
+       "Address family\n"
+       "Address Family Modifier\n"
+       "Soft reconfig\n"
+       "Soft reconfig inbound update\n")
+{
+  return bgp_clear_vty (vty, NULL, AFI_IP, SAFI_ENCAP, clear_peer,
+                       BGP_CLEAR_SOFT_IN, argv[3]->arg);
+}
 
-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",
+
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) in",
+ *     CLEAR_STR
+ *     BGP_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
+ *
+ * "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
+ *
+ * "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) soft in",
+ *     CLEAR_STR
+ *     BGP_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
+ *
+ * "clear bgp (A.B.C.D|X:X::X:X|WORD) in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "BGP neighbor address to clear\n"
+ *     "BGP IPv6 neighbor to clear\n"
+ *     "BGP neighbor on interface to clear\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "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
+ *
+ * "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
+ *
+ */
+DEFUN (clear_bgp_peer_soft_in,
+       clear_bgp_peer_soft_in_cmd,
+       "clear bgp (A.B.C.D|X:X::X:X|WORD) soft in",
        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)
+{
+  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[2]->arg);
+}
+
+
+
+
+
+
+
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) in prefix-filter",
+ *     CLEAR_STR
+ *     BGP_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
+ *     "Push out the existing ORF prefix-list\n"
+ *
+ */
 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",
@@ -8451,18 +8540,37 @@ DEFUN (clear_bgp_peer_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[2]->arg);
 }
 
-ALIAS (clear_bgp_peer_in_prefix_filter,
-       clear_bgp_ipv6_peer_in_prefix_filter_cmd,
-       "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) in prefix-filter",
-       CLEAR_STR
-       BGP_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
-       "Push out the existing ORF prefix-list\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "clear ip bgp peer-group WORD in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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_soft_in,
        clear_ip_bgp_peer_group_soft_in_cmd,
        "clear ip bgp peer-group WORD soft in",
@@ -8482,38 +8590,8 @@ DEFUN (clear_ip_bgp_peer_group_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[4]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all members of peer-group\n"
-       "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,
@@ -8530,6 +8608,20 @@ DEFUN (clear_ip_bgp_peer_group_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp peer-group WORD ipv4 (unicast|multicast) in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_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_soft_in,
        clear_ip_bgp_peer_group_ipv4_soft_in_cmd,
        "clear ip bgp peer-group WORD ipv4 (unicast|multicast) soft in",
@@ -8552,6 +8644,21 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_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",
@@ -8575,32 +8682,7 @@ DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[6]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_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)
 
-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,
@@ -8624,6 +8706,69 @@ DEFUN (clear_ip_bgp_peer_group_ipv4_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 peer-group WORD in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "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
+ *
+ * "clear bgp peer-group WORD in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "clear bgp ipv6 peer-group WORD soft in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_IN_STR
+ *
+ * "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_soft_in,
        clear_bgp_peer_group_soft_in_cmd,
        "clear bgp peer-group WORD soft in",
@@ -8642,80 +8787,25 @@ DEFUN (clear_bgp_peer_group_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[3]->arg);
 }
 
-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",
-       CLEAR_STR
-       BGP_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_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",
-       CLEAR_STR
-       BGP_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_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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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_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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 peer-group WORD in prefix-filter",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_IN_STR
+ *     "Push out prefix-list ORF and do inbound soft reconfig\n"
+ *
+ */
 DEFUN (clear_bgp_peer_group_in_prefix_filter,
        clear_bgp_peer_group_in_prefix_filter_cmd,
        "clear bgp peer-group WORD in prefix-filter",
@@ -8730,17 +8820,34 @@ DEFUN (clear_bgp_peer_group_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[3]->arg);
 }
 
-ALIAS (clear_bgp_peer_group_in_prefix_filter,
-       clear_bgp_ipv6_peer_group_in_prefix_filter_cmd,
-       "clear bgp ipv6 peer-group WORD in prefix-filter",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear all members of peer-group\n"
-       "BGP peer-group name\n"
-       BGP_SOFT_IN_STR
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp external in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "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
+ *
+ */
 DEFUN (clear_ip_bgp_external_soft_in,
        clear_ip_bgp_external_soft_in_cmd,
        "clear ip bgp external soft in",
@@ -8759,35 +8866,8 @@ DEFUN (clear_ip_bgp_external_soft_in,
                        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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "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,
@@ -8803,6 +8883,19 @@ DEFUN (clear_ip_bgp_external_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp external ipv4 (unicast|multicast) in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_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_soft_in,
        clear_ip_bgp_external_ipv4_soft_in_cmd,
        "clear ip bgp external ipv4 (unicast|multicast) soft in",
@@ -8824,6 +8917,20 @@ DEFUN (clear_ip_bgp_external_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_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",
@@ -8846,30 +8953,7 @@ DEFUN (clear_ip_bgp_instance_external_ipv4_soft_in,
                        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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear all external peers\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "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,
@@ -8892,6 +8976,62 @@ DEFUN (clear_ip_bgp_external_ipv4_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp " BGP_INSTANCE_CMD " external in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "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
+ *
+ * "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
+ *
+ * "clear bgp ipv6 external soft in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_IN_STR
+ *
+ * "clear bgp ipv6 external WORD in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "clear bgp external in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_IN_STR
+ *
+ */
 DEFUN (clear_bgp_external_soft_in,
        clear_bgp_external_soft_in_cmd,
        "clear bgp external soft in",
@@ -8909,73 +9049,24 @@ DEFUN (clear_bgp_external_soft_in,
                        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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear all external peers\n"
-       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",
-       CLEAR_STR
-       BGP_STR
-       "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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 external in prefix-filter",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_IN_STR
+ *     "Push out prefix-list ORF and do inbound soft reconfig\n"
+ *
+ */
 DEFUN (clear_bgp_external_in_prefix_filter,
        clear_bgp_external_in_prefix_filter_cmd,
        "clear bgp external in prefix-filter",
@@ -8984,21 +9075,39 @@ DEFUN (clear_bgp_external_in_prefix_filter,
        "Clear all external peers\n"
        BGP_SOFT_IN_STR
        "Push out prefix-list ORF and do inbound soft reconfig\n")
-{
-  return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_external,
-                       BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
-}
-
-ALIAS (clear_bgp_external_in_prefix_filter,
-       clear_bgp_ipv6_external_in_prefix_filter_cmd,
-       "clear bgp ipv6 external in prefix-filter",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear all external peers\n"
-       BGP_SOFT_IN_STR
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
+{
+  return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_external,
+                       BGP_CLEAR_SOFT_IN_ORF_PREFIX, NULL);
+}
 
+
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " CMD_AS_RANGE " in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "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
+ *
+ */
 DEFUN (clear_ip_bgp_as_soft_in,
        clear_ip_bgp_as_soft_in_cmd,
        "clear ip bgp " CMD_AS_RANGE " soft in",
@@ -9017,35 +9126,8 @@ DEFUN (clear_ip_bgp_as_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[3]->arg);
 }
 
-ALIAS (clear_ip_bgp_as_soft_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)
 
 DEFUN (clear_ip_bgp_as_in_prefix_filter,
        clear_ip_bgp_as_in_prefix_filter_cmd,
@@ -9061,6 +9143,19 @@ DEFUN (clear_ip_bgp_as_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_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_soft_in,
        clear_ip_bgp_as_ipv4_soft_in_cmd,
        "clear ip bgp " CMD_AS_RANGE " ipv4 (unicast|multicast) soft in",
@@ -9082,6 +9177,20 @@ DEFUN (clear_ip_bgp_as_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_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",
@@ -9104,30 +9213,7 @@ DEFUN (clear_ip_bgp_instance_as_ipv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[5]->arg);
 }
 
-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",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "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,
@@ -9150,6 +9236,18 @@ DEFUN (clear_ip_bgp_as_ipv4_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear peers with the AS number\n"
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     BGP_SOFT_IN_STR
+ *
+ */
 DEFUN (clear_ip_bgp_as_vpnv4_soft_in,
        clear_ip_bgp_as_vpnv4_soft_in_cmd,
        "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast soft in",
@@ -9166,17 +9264,19 @@ DEFUN (clear_ip_bgp_as_vpnv4_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[3]->arg);
 }
 
-ALIAS (clear_ip_bgp_as_vpnv4_soft_in,
-       clear_ip_bgp_as_vpnv4_in_cmd,
-       "clear ip bgp " CMD_AS_RANGE " vpnv4 unicast in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       BGP_SOFT_IN_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " CMD_AS_RANGE " encap unicast in",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Clear peers with the AS number\n"
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Soft reconfig inbound update\n"
+ *
+ */
 DEFUN (clear_ip_bgp_as_encap_soft_in,
        clear_ip_bgp_as_encap_soft_in_cmd,
        "clear ip bgp " CMD_AS_RANGE " encap unicast soft in",
@@ -9193,17 +9293,63 @@ DEFUN (clear_ip_bgp_as_encap_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[3]->arg);
 }
 
-ALIAS (clear_ip_bgp_as_encap_soft_in,
-       clear_ip_bgp_as_encap_in_cmd,
-       "clear ip bgp " CMD_AS_RANGE " encap unicast in",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       "Clear peers with the AS number\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Soft reconfig inbound update\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 " CMD_AS_RANGE " in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "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
+ *
+ * "clear bgp ipv6 " CMD_AS_RANGE " soft in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_STR
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ * "clear bgp " CMD_AS_RANGE " in",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_IN_STR
+ *
+ * "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
+ *
+ */
 DEFUN (clear_bgp_as_soft_in,
        clear_bgp_as_soft_in_cmd,
        "clear bgp " CMD_AS_RANGE " soft in",
@@ -9221,73 +9367,24 @@ DEFUN (clear_bgp_as_soft_in,
                        BGP_CLEAR_SOFT_IN, argv[2]->arg);
 }
 
-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",
-       CLEAR_STR
-       BGP_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_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",
-       CLEAR_STR
-       BGP_STR
-       "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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 " CMD_AS_RANGE " in prefix-filter",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_IN_STR
+ *     "Push out prefix-list ORF and do inbound soft reconfig\n"
+ *
+ */
 DEFUN (clear_bgp_as_in_prefix_filter,
        clear_bgp_as_in_prefix_filter_cmd,
        "clear bgp " CMD_AS_RANGE " in prefix-filter",
@@ -9301,17 +9398,19 @@ DEFUN (clear_bgp_as_in_prefix_filter,
                        BGP_CLEAR_SOFT_IN_ORF_PREFIX, argv[2]->arg);
 }
 
-ALIAS (clear_bgp_as_in_prefix_filter,
-       clear_bgp_ipv6_as_in_prefix_filter_cmd,
-       "clear bgp ipv6 " CMD_AS_RANGE " in prefix-filter",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear peers with the AS number\n"
-       BGP_SOFT_IN_STR
-       "Push out prefix-list ORF and do inbound soft reconfig\n")
 
 /* Both soft-reconfiguration */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear ip bgp " BGP_INSTANCE_CMD " * soft",
+ *     CLEAR_STR
+ *     IP_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_STR
+ *
+ */
 DEFUN (clear_ip_bgp_all_soft,
        clear_ip_bgp_all_soft_cmd,
        "clear ip bgp * soft",
@@ -9329,15 +9428,6 @@ DEFUN (clear_ip_bgp_all_soft,
                        BGP_CLEAR_SOFT_BOTH, NULL);
 }
 
-ALIAS (clear_ip_bgp_all_soft,
-       clear_ip_bgp_instance_all_soft_cmd,
-       "clear ip bgp " BGP_INSTANCE_CMD " * soft",
-       CLEAR_STR
-       IP_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Clear all peers\n"
-       BGP_SOFT_STR)
 
 
 DEFUN (clear_ip_bgp_all_ipv4_soft,
@@ -9411,6 +9501,31 @@ DEFUN (clear_ip_bgp_all_encap_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[0]);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 * soft",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all peers\n"
+ *     BGP_SOFT_STR
+ *
+ * "clear bgp " BGP_INSTANCE_CMD " * soft",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all peers\n"
+ *     BGP_SOFT_STR
+ *
+ * "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_bgp_all_soft,
        clear_bgp_all_soft_cmd,
        "clear bgp * soft",
@@ -9427,34 +9542,21 @@ DEFUN (clear_bgp_all_soft,
                        BGP_CLEAR_SOFT_BOTH, NULL);
 }
 
-ALIAS (clear_bgp_all_soft,
-       clear_bgp_instance_all_soft_cmd,
-       "clear bgp " BGP_INSTANCE_CMD " * soft",
-       CLEAR_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Clear all peers\n"
-       BGP_SOFT_STR)
 
-ALIAS (clear_bgp_all_soft,
-       clear_bgp_ipv6_all_soft_cmd,
-       "clear bgp ipv6 * soft",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_soft,
        clear_ip_bgp_peer_soft_cmd,
        "clear ip bgp (A.B.C.D|WORD) soft",
@@ -9473,16 +9575,6 @@ DEFUN (clear_ip_bgp_peer_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[3]->arg);
 }
 
-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,
@@ -9558,6 +9650,37 @@ DEFUN (clear_ip_bgp_peer_encap_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) soft",
+ *     CLEAR_STR
+ *     BGP_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
+ *
+ * "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
+ *
+ * "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
+ *
+ */
 DEFUN (clear_bgp_peer_soft,
        clear_bgp_peer_soft_cmd,
        "clear bgp (A.B.C.D|X:X::X:X|WORD) soft",
@@ -9576,40 +9699,21 @@ DEFUN (clear_bgp_peer_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[2]->arg);
 }
 
-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",
-       CLEAR_STR
-       BGP_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)
 
-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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_soft,
        clear_ip_bgp_peer_group_soft_cmd,
        "clear ip bgp peer-group WORD soft",
@@ -9628,16 +9732,6 @@ DEFUN (clear_ip_bgp_peer_group_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[4]->arg);
 }
 
-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,
@@ -9682,6 +9776,34 @@ DEFUN (clear_ip_bgp_instance_peer_group_ipv4_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[6]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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
+ *
+ * "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
+ *
+ * "clear bgp ipv6 peer-group WORD soft",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all members of peer-group\n"
+ *     "BGP peer-group name\n"
+ *     BGP_SOFT_STR
+ *
+ */
 DEFUN (clear_bgp_peer_group_soft,
        clear_bgp_peer_group_soft_cmd,
        "clear bgp peer-group WORD soft",
@@ -9699,37 +9821,20 @@ DEFUN (clear_bgp_peer_group_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[3]->arg);
 }
 
-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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "Clear all members of peer-group\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_soft,
        clear_ip_bgp_external_soft_cmd,
        "clear ip bgp external soft",
@@ -9747,15 +9852,6 @@ DEFUN (clear_ip_bgp_external_soft,
                        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,
@@ -9798,6 +9894,31 @@ DEFUN (clear_ip_bgp_instance_external_ipv4_soft,
                        BGP_CLEAR_SOFT_BOTH, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp " BGP_INSTANCE_CMD " external soft",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_STR
+ *
+ * "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
+ *
+ * "clear bgp ipv6 external soft",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear all external peers\n"
+ *     BGP_SOFT_STR
+ *
+ */
 DEFUN (clear_bgp_external_soft,
        clear_bgp_external_soft_cmd,
        "clear bgp external soft",
@@ -9814,34 +9935,20 @@ DEFUN (clear_bgp_external_soft,
                        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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "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_soft,
        clear_ip_bgp_as_soft_cmd,
        "clear ip bgp " CMD_AS_RANGE " soft",
@@ -9859,15 +9966,6 @@ DEFUN (clear_ip_bgp_as_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[3]->arg);
 }
 
-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,
@@ -9940,6 +10038,31 @@ DEFUN (clear_ip_bgp_as_encap_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "clear bgp ipv6 " CMD_AS_RANGE " soft",
+ *     CLEAR_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Clear peers with the AS number\n"
+ *     BGP_SOFT_STR
+ *
+ * "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
+ *
+ * "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
+ *
+ */
 DEFUN (clear_bgp_as_soft,
        clear_bgp_as_soft_cmd,
        "clear bgp " CMD_AS_RANGE " soft",
@@ -9956,33 +10079,8 @@ DEFUN (clear_bgp_as_soft,
                        BGP_CLEAR_SOFT_BOTH, argv[2]->arg);
 }
 
-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",
-       CLEAR_STR
-       BGP_STR
-       "Address family\n"
-       "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,
@@ -10123,7 +10221,7 @@ DEFUN (show_bgp_vrfs,
   return CMD_SUCCESS;
 }
 
-DEFUN (show_bgp_memory, 
+DEFUN (show_bgp_memory,
        show_bgp_memory_cmd,
        "show bgp memory",
        SHOW_STR
@@ -10704,7 +10802,18 @@ DEFUN (show_ip_bgp_instance_all_summary,
   return CMD_SUCCESS;
 }
 
-DEFUN (show_ip_bgp_ipv4_summary, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv4 (unicast|multicast) summary {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Summary of BGP neighbor status\n"
+ *
+ */
+DEFUN (show_ip_bgp_ipv4_summary,
        show_ip_bgp_ipv4_summary_cmd,
        "show ip bgp ipv4 (unicast|multicast) summary {json}",
        SHOW_STR
@@ -10723,15 +10832,6 @@ DEFUN (show_ip_bgp_ipv4_summary,
   return bgp_show_summary_vty (vty, NULL, AFI_IP, SAFI_UNICAST, uj);
 }
 
-ALIAS (show_ip_bgp_ipv4_summary,
-       show_bgp_ipv4_safi_summary_cmd,
-       "show bgp ipv4 (unicast|multicast) summary {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Summary of BGP neighbor status\n")
 
 DEFUN (show_bgp_ipv4_vpn_summary,
        show_bgp_ipv4_vpn_summary_cmd,
@@ -10760,6 +10860,19 @@ DEFUN (show_bgp_ipv6_vpn_summary,
   return bgp_show_summary_vty (vty, NULL, AFI_IP6, SAFI_MPLS_VPN, use_json (argc, argv));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp view WORD ipv4 (unicast|multicast) summary {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "BGP view\n"
+ *     "View name\n"
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Summary of BGP neighbor status\n"
+ *
+ */
 DEFUN (show_ip_bgp_instance_ipv4_summary,
        show_ip_bgp_instance_ipv4_summary_cmd,
        "show ip bgp view WORD ipv4 (unicast|multicast) summary {json}",
@@ -10781,17 +10894,6 @@ DEFUN (show_ip_bgp_instance_ipv4_summary,
     return bgp_show_summary_vty (vty, argv[4]->arg, AFI_IP, SAFI_UNICAST, uj);
 }
 
-ALIAS (show_ip_bgp_instance_ipv4_summary,
-       show_bgp_instance_ipv4_safi_summary_cmd,
-       "show bgp view WORD ipv4 (unicast|multicast) summary {json}",
-       SHOW_STR
-       BGP_STR
-       "BGP view\n"
-       "View name\n"
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Summary of BGP neighbor status\n")
 
 DEFUN (show_ip_bgp_vpnv4_all_summary,
        show_ip_bgp_vpnv4_all_summary_cmd,
@@ -10835,6 +10937,15 @@ DEFUN (show_ip_bgp_vpnv4_rd_summary,
 }
 
 #ifdef HAVE_IPV6
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp ipv6 summary {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Summary of BGP neighbor status\n"
+ *
+ */
 DEFUN (show_bgp_summary,
        show_bgp_summary_cmd,
        "show bgp summary {json}",
@@ -10846,6 +10957,16 @@ DEFUN (show_bgp_summary,
   return bgp_show_summary_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, use_json(argc, argv));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 summary {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Summary of BGP neighbor status\n"
+ *
+ */
 DEFUN (show_bgp_instance_summary,
        show_bgp_instance_summary_cmd,
        "show bgp " BGP_INSTANCE_CMD " summary {json}",
@@ -10873,22 +10994,7 @@ DEFUN (show_bgp_instance_all_summary,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_bgp_summary, 
-       show_bgp_ipv6_summary_cmd,
-       "show bgp ipv6 summary {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Summary of BGP neighbor status\n")
 
-ALIAS (show_bgp_instance_summary,
-       show_bgp_instance_ipv6_summary_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 summary {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Summary of BGP neighbor status\n")
 
 DEFUN (show_bgp_ipv6_safi_summary,
        show_bgp_ipv6_safi_summary_cmd,
@@ -10928,7 +11034,7 @@ DEFUN (show_bgp_instance_ipv6_safi_summary,
 }
 
 /* old command */
-DEFUN (show_ipv6_bgp_summary, 
+DEFUN (show_ipv6_bgp_summary,
        show_ipv6_bgp_summary_cmd,
        "show ipv6 bgp summary {json}",
        SHOW_STR
@@ -10942,7 +11048,7 @@ DEFUN (show_ipv6_bgp_summary,
 }
 
 /* old command */
-DEFUN (show_ipv6_mbgp_summary, 
+DEFUN (show_ipv6_mbgp_summary,
        show_ipv6_mbgp_summary_cmd,
        "show ipv6 mbgp summary {json}",
        SHOW_STR
@@ -12786,6 +12892,51 @@ bgp_show_all_instances_neighbors_vty (struct vty *vty, u_char use_json)
 }
 
 /* "show ip bgp neighbors" commands.  */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display VPNv4 NLRI specific information\n"
+ *     "Display information for a route distinguisher\n"
+ *     "VPN Route Distinguisher\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp neighbors {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show ip bgp vpnv4 all neighbors {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display VPNv4 NLRI specific information\n"
+ *     "Display information about all VPNv4 NLRIs\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show ip bgp ipv4 (unicast|multicast) neighbors {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp ipv6 neighbors {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_neighbors,
        show_ip_bgp_neighbors_cmd,
        "show ip bgp neighbors {json}",
@@ -12800,58 +12951,66 @@ DEFUN (show_ip_bgp_neighbors,
   return bgp_show_neighbor_vty (vty, NULL, show_all, NULL, uj, NULL);
 }
 
-ALIAS (show_ip_bgp_neighbors,
-       show_ip_bgp_ipv4_neighbors_cmd,
-       "show ip bgp ipv4 (unicast|multicast) neighbors {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_neighbors,
-       show_ip_bgp_vpnv4_all_neighbors_cmd,
-       "show ip bgp vpnv4 all neighbors {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_neighbors,
-       show_ip_bgp_vpnv4_rd_neighbors_cmd,
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display VPNv4 NLRI specific information\n"
-       "Display information for a route distinguisher\n"
-       "VPN Route Distinguisher\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_neighbors,
-       show_bgp_neighbors_cmd,
-       "show bgp neighbors {json}",
-       SHOW_STR
-       BGP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_neighbors,
-       show_bgp_ipv6_neighbors_cmd,
-       "show bgp ipv6 neighbors {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Address Family modifier\n"
+ *     "Address Family modifier\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display VPNv4 NLRI specific information\n"
+ *     "Display information about all VPNv4 NLRIs\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show ip bgp vpnv4 all neighbors A.B.C.D {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     BGP_STR
+ *     "Display VPNv4 NLRI specific information\n"
+ *     "Display information about all VPNv4 NLRIs\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_neighbors_peer,
        show_ip_bgp_neighbors_peer_cmd,
        "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
@@ -12869,68 +13028,29 @@ DEFUN (show_ip_bgp_neighbors_peer,
   return bgp_show_neighbor_vty (vty, NULL, show_peer, argv[argc - 2], uj, NULL);
 }
 
-ALIAS (show_ip_bgp_neighbors_peer,
-       show_ip_bgp_ipv4_neighbors_peer_cmd,
-       "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Address family\n"
-       "Address Family modifier\n"
-       "Address Family modifier\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_neighbors_peer,
-       show_ip_bgp_vpnv4_all_neighbors_peer_cmd,
-       "show ip bgp vpnv4 all neighbors A.B.C.D {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_neighbors_peer,
-       show_ip_bgp_vpnv4_rd_neighbors_peer_cmd,
-       "show ip bgp vpnv4 rd ASN:nn_or_IP-address:nn neighbors A.B.C.D {json}",
-       SHOW_STR
-       IP_STR
-       BGP_STR
-       "Display VPNv4 NLRI specific information\n"
-       "Display information about all VPNv4 NLRIs\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_neighbors_peer,
-       show_bgp_neighbors_peer_cmd,
-       "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
-       SHOW_STR
-       BGP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_neighbors_peer,
-       show_bgp_ipv6_neighbors_peer_cmd,
-       "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
-       SHOW_STR
-       BGP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " neighbors {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_instance_neighbors,
        show_ip_bgp_instance_neighbors_cmd,
        "show ip bgp " BGP_INSTANCE_CMD " neighbors {json}",
@@ -12962,25 +13082,32 @@ DEFUN (show_ip_bgp_instance_all_neighbors,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_bgp_instance_neighbors,
-       show_bgp_instance_neighbors_cmd,
-       "show bgp " BGP_INSTANCE_CMD " neighbors {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_instance_neighbors,
-       show_bgp_instance_ipv6_neighbors_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "JavaScript Object Notation\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Address family\n"
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "JavaScript Object Notation\n"
+ *
+ * "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
+ *     SHOW_STR
+ *     BGP_STR
+ *     BGP_INSTANCE_HELP_STR
+ *     "Detailed information on TCP and BGP neighbor connections\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor to display information about\n"
+ *     "Neighbor on bgp configured interface\n"
+ *     "JavaScript Object Notation\n"
+ *
+ */
 DEFUN (show_ip_bgp_instance_neighbors_peer,
        show_ip_bgp_instance_neighbors_peer_cmd,
        "show ip bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
@@ -12999,35 +13126,12 @@ DEFUN (show_ip_bgp_instance_neighbors_peer,
   return bgp_show_neighbor_vty (vty, argv[4]->arg, show_peer, argv[6]->arg, uj, NULL);
 }
 
-ALIAS (show_ip_bgp_instance_neighbors_peer,
-       show_bgp_instance_neighbors_peer_cmd,
-       "show bgp " BGP_INSTANCE_CMD " neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "JavaScript Object Notation\n")
 
-ALIAS (show_ip_bgp_instance_neighbors_peer,
-       show_bgp_instance_ipv6_neighbors_peer_cmd,
-       "show bgp " BGP_INSTANCE_CMD " ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) {json}",
-       SHOW_STR
-       BGP_STR
-       BGP_INSTANCE_HELP_STR
-       "Address family\n"
-       "Detailed information on TCP and BGP neighbor connections\n"
-       "Neighbor to display information about\n"
-       "Neighbor to display information about\n"
-       "Neighbor on bgp configured interface\n"
-       "JavaScript Object Notation\n")
        
 /* Show BGP's AS paths internal data.  There are both `show ip bgp
    paths' and `show ip mbgp paths'.  Those functions results are the
    same.*/
-DEFUN (show_ip_bgp_paths, 
+DEFUN (show_ip_bgp_paths,
        show_ip_bgp_paths_cmd,
        "show ip bgp paths",
        SHOW_STR
@@ -13040,7 +13144,7 @@ DEFUN (show_ip_bgp_paths,
   return CMD_SUCCESS;
 }
 
-DEFUN (show_ip_bgp_ipv4_paths, 
+DEFUN (show_ip_bgp_ipv4_paths,
        show_ip_bgp_ipv4_paths_cmd,
        "show ip bgp ipv4 (unicast|multicast) paths",
        SHOW_STR
@@ -13070,7 +13174,7 @@ community_show_all_iterator (struct hash_backet *backet, struct vty *vty)
 }
 
 /* Show BGP's community internal data. */
-DEFUN (show_ip_bgp_community_info, 
+DEFUN (show_ip_bgp_community_info,
        show_ip_bgp_community_info_cmd,
        "show ip bgp community-info",
        SHOW_STR
@@ -13088,7 +13192,7 @@ DEFUN (show_ip_bgp_community_info,
   return CMD_SUCCESS;
 }
 
-DEFUN (show_ip_bgp_attr_info, 
+DEFUN (show_ip_bgp_attr_info,
        show_ip_bgp_attr_info_cmd,
        "show ip bgp attribute-info",
        SHOW_STR
@@ -14026,6 +14130,49 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap,
   return bgp_redistribute_set (vty->index, AFI_IP, protocol, instance);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no redistribute (ospf|table) <1-65535> 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"
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *
+ * "no redistribute (ospf|table) <1-65535> metric <0-4294967295>",
+ *     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"
+ *
+ * "no redistribute (ospf|table) <1-65535> route-map WORD metric <0-4294967295>",
+ *     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"
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *     "Metric for redistributed routes\n"
+ *     "Default metric\n"
+ *
+ * "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_ospf,
        no_bgp_redistribute_ipv4_ospf_cmd,
        "no redistribute (ospf|table) <1-65535>",
@@ -14047,54 +14194,45 @@ DEFUN (no_bgp_redistribute_ipv4_ospf,
   return bgp_redistribute_unset (vty->index, AFI_IP, protocol, instance);
 }
 
-ALIAS (no_bgp_redistribute_ipv4_ospf,
-       no_bgp_redistribute_ipv4_ospf_rmap_cmd,
-       "no redistribute (ospf|table) <1-65535> 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"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
 
-ALIAS (no_bgp_redistribute_ipv4_ospf,
-       no_bgp_redistribute_ipv4_ospf_metric_cmd,
-       "no redistribute (ospf|table) <1-65535> metric <0-4294967295>",
-       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")
 
-ALIAS (no_bgp_redistribute_ipv4_ospf,
-       no_bgp_redistribute_ipv4_ospf_rmap_metric_cmd,
-       "no redistribute (ospf|table) <1-65535> route-map WORD metric <0-4294967295>",
-       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"
-       "Route map reference\n"
-       "Pointer to route-map entries\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
 
-ALIAS (no_bgp_redistribute_ipv4_ospf,
-       no_bgp_redistribute_ipv4_ospf_metric_rmap_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")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD",
+ *     NO_STR
+ *     "Redistribute information from another routing protocol\n"
+ *     QUAGGA_IP_REDIST_HELP_STR_BGPD
+ *     "Metric for redistributed routes\n"
+ *     "Default metric\n"
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *
+ * "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD",
+ *     NO_STR
+ *     "Redistribute information from another routing protocol\n"
+ *     QUAGGA_IP_REDIST_HELP_STR_BGPD
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *
+ * "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
+ *     NO_STR
+ *     "Redistribute information from another routing protocol\n"
+ *     QUAGGA_IP_REDIST_HELP_STR_BGPD
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *     "Metric for redistributed routes\n"
+ *     "Default metric\n"
+ *
+ * "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295>",
+ *     NO_STR
+ *     "Redistribute information from another routing protocol\n"
+ *     QUAGGA_IP_REDIST_HELP_STR_BGPD
+ *     "Metric for redistributed routes\n"
+ *     "Default metric\n"
+ *
+ */
 DEFUN (no_bgp_redistribute_ipv4,
        no_bgp_redistribute_ipv4_cmd,
        "no redistribute " QUAGGA_IP_REDIST_STR_BGPD,
@@ -14113,45 +14251,9 @@ DEFUN (no_bgp_redistribute_ipv4,
   return bgp_redistribute_unset (vty->index, AFI_IP, type, 0);
 }
 
-ALIAS (no_bgp_redistribute_ipv4,
-       no_bgp_redistribute_ipv4_rmap_cmd,
-       "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD",
-       NO_STR
-       "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
 
-ALIAS (no_bgp_redistribute_ipv4,
-       no_bgp_redistribute_ipv4_metric_cmd,
-       "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295>",
-       NO_STR
-       "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD
-       "Metric for redistributed routes\n"
-       "Default metric\n")
 
-ALIAS (no_bgp_redistribute_ipv4,
-       no_bgp_redistribute_ipv4_rmap_metric_cmd,
-       "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
-       NO_STR
-       "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD
-       "Route map reference\n"
-       "Pointer to route-map entries\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
 
-ALIAS (no_bgp_redistribute_ipv4,
-       no_bgp_redistribute_ipv4_metric_rmap_cmd,
-       "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD",
-       NO_STR
-       "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD
-       "Metric for redistributed routes\n"
-       "Default metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
 
 #ifdef HAVE_IPV6
 DEFUN (bgp_redistribute_ipv6,
@@ -14277,6 +14379,41 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
   return bgp_redistribute_set (vty->index, AFI_IP6, type, 0);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD",
+ *     NO_STR
+ *     "Redistribute information from another routing protocol\n"
+ *     QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *
+ * "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
+ *     NO_STR
+ *     "Redistribute information from another routing protocol\n"
+ *     QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *     "Metric for redistributed routes\n"
+ *     "Default metric\n"
+ *
+ * "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD",
+ *     NO_STR
+ *     "Redistribute information from another routing protocol\n"
+ *     QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ *     "Metric for redistributed routes\n"
+ *     "Default metric\n"
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *
+ * "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295>",
+ *     NO_STR
+ *     "Redistribute information from another routing protocol\n"
+ *     QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ *     "Metric for redistributed routes\n"
+ *     "Default metric\n"
+ *
+ */
 DEFUN (no_bgp_redistribute_ipv6,
        no_bgp_redistribute_ipv6_cmd,
        "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD,
@@ -14296,45 +14433,9 @@ DEFUN (no_bgp_redistribute_ipv6,
   return bgp_redistribute_unset (vty->index, AFI_IP6, type, 0);
 }
 
-ALIAS (no_bgp_redistribute_ipv6,
-       no_bgp_redistribute_ipv6_rmap_cmd,
-       "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD",
-       NO_STR
-       "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
 
-ALIAS (no_bgp_redistribute_ipv6,
-       no_bgp_redistribute_ipv6_metric_cmd,
-       "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295>",
-       NO_STR
-       "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD
-       "Metric for redistributed routes\n"
-       "Default metric\n")
 
-ALIAS (no_bgp_redistribute_ipv6,
-       no_bgp_redistribute_ipv6_rmap_metric_cmd,
-       "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
-       NO_STR
-       "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD
-       "Route map reference\n"
-       "Pointer to route-map entries\n"
-       "Metric for redistributed routes\n"
-       "Default metric\n")
 
-ALIAS (no_bgp_redistribute_ipv6,
-       no_bgp_redistribute_ipv6_metric_rmap_cmd,
-       "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD",
-       NO_STR
-       "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD
-       "Metric for redistributed routes\n"
-       "Default metric\n"
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
 #endif /* HAVE_IPV6 */
 
 int
@@ -14477,12 +14578,10 @@ bgp_vty_init (void)
 
   /* "bgp config-type" commands. */
   install_element (CONFIG_NODE, &bgp_config_type_cmd);
-  install_element (CONFIG_NODE, &no_bgp_config_type_val_cmd);
 
   /* bgp route-map delay-timer commands. */
   install_element (CONFIG_NODE, &bgp_set_route_map_delay_timer_cmd);
   install_element (CONFIG_NODE, &no_bgp_set_route_map_delay_timer_cmd);
-  install_element (CONFIG_NODE, &no_bgp_set_route_map_delay_timer_val_cmd);
 
   /* Dummy commands (Currently not supported) */
   install_element (BGP_NODE, &no_synchronization_cmd);
@@ -14490,30 +14589,21 @@ bgp_vty_init (void)
 
   /* "router bgp" commands. */
   install_element (CONFIG_NODE, &router_bgp_cmd);
-  install_element (CONFIG_NODE, &router_bgp_instance_cmd);
-  install_element (CONFIG_NODE, &router_bgp_noasn_cmd);
 
   /* "no router bgp" commands. */
   install_element (CONFIG_NODE, &no_router_bgp_cmd);
-  install_element (CONFIG_NODE, &no_router_bgp_instance_cmd);
-  install_element (CONFIG_NODE, &no_router_bgp_noasn_cmd);
 
   /* "bgp router-id" commands. */
   install_element (BGP_NODE, &bgp_router_id_cmd);
   install_element (BGP_NODE, &no_bgp_router_id_cmd);
-  install_element (BGP_NODE, &no_bgp_router_id_val_cmd);
 
   /* "bgp cluster-id" commands. */
   install_element (BGP_NODE, &bgp_cluster_id_cmd);
-  install_element (BGP_NODE, &bgp_cluster_id32_cmd);
   install_element (BGP_NODE, &no_bgp_cluster_id_cmd);
-  install_element (BGP_NODE, &no_bgp_cluster_id_ip_cmd);
-  install_element (BGP_NODE, &no_bgp_cluster_id_decimal_cmd);
 
   /* "bgp confederation" commands. */
   install_element (BGP_NODE, &bgp_confederation_identifier_cmd);
   install_element (BGP_NODE, &no_bgp_confederation_identifier_cmd);
-  install_element (BGP_NODE, &no_bgp_confederation_identifier_arg_cmd);
 
   /* "bgp confederation peers" commands. */
   install_element (BGP_NODE, &bgp_confederation_peers_cmd);
@@ -14523,12 +14613,9 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &bgp_maxmed_admin_cmd);
   install_element (BGP_NODE, &no_bgp_maxmed_admin_cmd);
   install_element (BGP_NODE, &bgp_maxmed_admin_medv_cmd);
-  install_element (BGP_NODE, &no_bgp_maxmed_admin_medv_cmd);
   install_element (BGP_NODE, &bgp_maxmed_onstartup_cmd);
   install_element (BGP_NODE, &no_bgp_maxmed_onstartup_cmd);
-  install_element (BGP_NODE, &no_bgp_maxmed_onstartup_period_cmd);
   install_element (BGP_NODE, &bgp_maxmed_onstartup_medv_cmd);
-  install_element (BGP_NODE, &no_bgp_maxmed_onstartup_period_medv_cmd);
 
   /* bgp disable-ebgp-connected-nh-check */
   install_element (BGP_NODE, &bgp_disable_connected_route_check_cmd);
@@ -14538,7 +14625,6 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &bgp_update_delay_cmd);
   install_element (BGP_NODE, &no_bgp_update_delay_cmd);
   install_element (BGP_NODE, &bgp_update_delay_establish_wait_cmd);
-  install_element (BGP_NODE, &no_bgp_update_delay_establish_wait_cmd);
 
   install_element (BGP_NODE, &bgp_wpkt_quanta_cmd);
   install_element (BGP_NODE, &no_bgp_wpkt_quanta_cmd);
@@ -14549,38 +14635,27 @@ bgp_vty_init (void)
   /* "maximum-paths" commands. */
   install_element (BGP_NODE, &bgp_maxpaths_cmd);
   install_element (BGP_NODE, &no_bgp_maxpaths_cmd);
-  install_element (BGP_NODE, &no_bgp_maxpaths_arg_cmd);
   install_element (BGP_IPV4_NODE, &bgp_maxpaths_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_maxpaths_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_maxpaths_arg_cmd);
   install_element (BGP_IPV6_NODE, &bgp_maxpaths_cmd);
   install_element (BGP_IPV6_NODE, &no_bgp_maxpaths_cmd);
-  install_element (BGP_IPV6_NODE, &no_bgp_maxpaths_arg_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, &no_bgp_maxpaths_ibgp_arg_cmd);
-  install_element (BGP_NODE, &no_bgp_maxpaths_ibgp_cluster_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);
-  install_element (BGP_IPV4_NODE, &no_bgp_maxpaths_ibgp_cluster_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_maxpaths_ibgp_arg_cmd);
   install_element (BGP_IPV6_NODE, &bgp_maxpaths_ibgp_cmd);
   install_element(BGP_IPV6_NODE, &bgp_maxpaths_ibgp_cluster_cmd);
   install_element (BGP_IPV6_NODE, &no_bgp_maxpaths_ibgp_cmd);
-  install_element (BGP_IPV6_NODE, &no_bgp_maxpaths_ibgp_arg_cmd);
-  install_element (BGP_IPV6_NODE, &no_bgp_maxpaths_ibgp_cluster_cmd);
 
   /* "timers bgp" commands. */
   install_element (BGP_NODE, &bgp_timers_cmd);
   install_element (BGP_NODE, &no_bgp_timers_cmd);
-  install_element (BGP_NODE, &no_bgp_timers_arg_cmd);
 
   /* route-map delay-timer commands - per instance for backwards compat. */
   install_element (BGP_NODE, &bgp_set_route_map_delay_timer_cmd);
   install_element (BGP_NODE, &no_bgp_set_route_map_delay_timer_cmd);
-  install_element (BGP_NODE, &no_bgp_set_route_map_delay_timer_val_cmd);
 
   /* "bgp client-to-client reflection" commands */
   install_element (BGP_NODE, &no_bgp_client_to_client_reflection_cmd);
@@ -14599,10 +14674,8 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_bgp_graceful_restart_cmd);
   install_element (BGP_NODE, &bgp_graceful_restart_stalepath_time_cmd);
   install_element (BGP_NODE, &no_bgp_graceful_restart_stalepath_time_cmd);
-  install_element (BGP_NODE, &no_bgp_graceful_restart_stalepath_time_val_cmd);
   install_element (BGP_NODE, &bgp_graceful_restart_restart_time_cmd);
   install_element (BGP_NODE, &no_bgp_graceful_restart_restart_time_cmd);
-  install_element (BGP_NODE, &no_bgp_graceful_restart_restart_time_val_cmd);
  
   /* "bgp fast-external-failover" commands */
   install_element (BGP_NODE, &bgp_fast_external_failover_cmd);
@@ -14635,10 +14708,8 @@ bgp_vty_init (void)
   /* "bgp bestpath med" commands */
   install_element (BGP_NODE, &bgp_bestpath_med_cmd);
   install_element (BGP_NODE, &bgp_bestpath_med2_cmd);
-  install_element (BGP_NODE, &bgp_bestpath_med3_cmd);
   install_element (BGP_NODE, &no_bgp_bestpath_med_cmd);
   install_element (BGP_NODE, &no_bgp_bestpath_med2_cmd);
-  install_element (BGP_NODE, &no_bgp_bestpath_med3_cmd);
 
   /* "no bgp default ipv4-unicast" commands. */
   install_element (BGP_NODE, &no_bgp_default_ipv4_unicast_cmd);
@@ -14652,7 +14723,6 @@ bgp_vty_init (void)
   /* "bgp default local-preference" commands. */
   install_element (BGP_NODE, &bgp_default_local_preference_cmd);
   install_element (BGP_NODE, &no_bgp_default_local_preference_cmd);
-  install_element (BGP_NODE, &no_bgp_default_local_preference_val_cmd);
 
   /* bgp default show-hostname */
   install_element (BGP_NODE, &bgp_default_show_hostname_cmd);
@@ -14661,7 +14731,6 @@ bgp_vty_init (void)
   /* "bgp default subgroup-pkt-queue-max" commands. */
   install_element (BGP_NODE, &bgp_default_subgroup_pkt_queue_max_cmd);
   install_element (BGP_NODE, &no_bgp_default_subgroup_pkt_queue_max_cmd);
-  install_element (BGP_NODE, &no_bgp_default_subgroup_pkt_queue_max_val_cmd);
 
   /* bgp ibgp-allow-policy-mods command */
   install_element (BGP_NODE, &bgp_rr_allow_outbound_policy_cmd);
@@ -14670,7 +14739,6 @@ bgp_vty_init (void)
   /* "bgp listen limit" commands. */
   install_element (BGP_NODE, &bgp_listen_limit_cmd);
   install_element (BGP_NODE, &no_bgp_listen_limit_cmd);
-  install_element (BGP_NODE, &no_bgp_listen_limit_val_cmd);
 
   /* "bgp listen range" commands. */
   install_element (BGP_NODE, &bgp_listen_range_cmd);
@@ -14680,18 +14748,10 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &neighbor_remote_as_cmd);
   install_element (BGP_NODE, &neighbor_interface_config_cmd);
   install_element (BGP_NODE, &neighbor_interface_config_v6only_cmd);
-  install_element (BGP_NODE, &neighbor_interface_config_peergroup_cmd);
-  install_element (BGP_NODE, &neighbor_interface_config_v6only_peergroup_cmd);
   install_element (BGP_NODE, &neighbor_interface_config_remote_as_cmd);
   install_element (BGP_NODE, &neighbor_interface_v6only_config_remote_as_cmd);
   install_element (BGP_NODE, &no_neighbor_cmd);
-  install_element (BGP_NODE, &no_neighbor_remote_as_cmd);
   install_element (BGP_NODE, &no_neighbor_interface_config_cmd);
-  install_element (BGP_NODE, &no_neighbor_interface_config_v6only_cmd);
-  install_element (BGP_NODE, &no_neighbor_interface_config_peergroup_cmd);
-  install_element (BGP_NODE, &no_neighbor_interface_config_v6only_peergroup_cmd);
-  install_element (BGP_NODE, &no_neighbor_interface_config_remote_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_interface_config_v6only_remote_as_cmd);
 
   /* "neighbor peer-group" commands. */
   install_element (BGP_NODE, &neighbor_peer_group_cmd);
@@ -14703,9 +14763,6 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &neighbor_local_as_no_prepend_cmd);
   install_element (BGP_NODE, &neighbor_local_as_no_prepend_replace_as_cmd);
   install_element (BGP_NODE, &no_neighbor_local_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_local_as_val_cmd);
-  install_element (BGP_NODE, &no_neighbor_local_as_val2_cmd);
-  install_element (BGP_NODE, &no_neighbor_local_as_val3_cmd);
 
   /* "neighbor solo" commands. */
   install_element (BGP_NODE, &neighbor_solo_cmd);
@@ -14714,7 +14771,6 @@ bgp_vty_init (void)
   /* "neighbor password" commands. */
   install_element (BGP_NODE, &neighbor_password_cmd);
   install_element (BGP_NODE, &no_neighbor_password_cmd);
-  install_element (BGP_NODE, &no_neighbor_password_val_cmd);
 
   /* "neighbor activate" commands. */
   install_element (BGP_NODE, &neighbor_activate_cmd);
@@ -14791,201 +14847,93 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &neighbor_attr_unchanged2_cmd);
   install_element (BGP_NODE, &neighbor_attr_unchanged3_cmd);
   install_element (BGP_NODE, &neighbor_attr_unchanged4_cmd);
-  install_element (BGP_NODE, &neighbor_attr_unchanged5_cmd);
-  install_element (BGP_NODE, &neighbor_attr_unchanged6_cmd);
-  install_element (BGP_NODE, &neighbor_attr_unchanged7_cmd);
-  install_element (BGP_NODE, &neighbor_attr_unchanged8_cmd);
-  install_element (BGP_NODE, &neighbor_attr_unchanged9_cmd);
-  install_element (BGP_NODE, &neighbor_attr_unchanged10_cmd);
   install_element (BGP_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_NODE, &no_neighbor_attr_unchanged1_cmd);
   install_element (BGP_NODE, &no_neighbor_attr_unchanged2_cmd);
   install_element (BGP_NODE, &no_neighbor_attr_unchanged3_cmd);
   install_element (BGP_NODE, &no_neighbor_attr_unchanged4_cmd);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged5_cmd);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged6_cmd);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged7_cmd);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged8_cmd);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged9_cmd);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged10_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged1_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged2_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged3_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged4_cmd);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged5_cmd);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged6_cmd);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged7_cmd);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged8_cmd);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged9_cmd);
-  install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged10_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged1_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged2_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged3_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged4_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged5_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged6_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged7_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged8_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged9_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged10_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged1_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged2_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged3_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged4_cmd);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged5_cmd);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged6_cmd);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged7_cmd);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged8_cmd);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged9_cmd);
-  install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged10_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged1_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged2_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged3_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged4_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged5_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged6_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged7_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged8_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged9_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_attr_unchanged10_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged1_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged2_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged3_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged4_cmd);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged5_cmd);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged6_cmd);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged7_cmd);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged8_cmd);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged9_cmd);
-  install_element (BGP_IPV6_NODE, &neighbor_attr_unchanged10_cmd);
   install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged1_cmd);
   install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged2_cmd);
   install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged3_cmd);
   install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged4_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged5_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged6_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged7_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged8_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged9_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_attr_unchanged10_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged1_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged2_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged3_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged4_cmd);
-  install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged5_cmd);
-  install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged6_cmd);
-  install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged7_cmd);
-  install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged8_cmd);
-  install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged9_cmd);
-  install_element (BGP_IPV6M_NODE, &neighbor_attr_unchanged10_cmd);
   install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged1_cmd);
   install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged2_cmd);
   install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged3_cmd);
   install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged4_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged5_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged6_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged7_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged8_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged9_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_attr_unchanged10_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged1_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged2_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged3_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged4_cmd);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged5_cmd);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged6_cmd);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged7_cmd);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged8_cmd);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged9_cmd);
-  install_element (BGP_VPNV4_NODE, &neighbor_attr_unchanged10_cmd);
   install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged1_cmd);
   install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged2_cmd);
   install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged3_cmd);
   install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged4_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged5_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged6_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged7_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged8_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged9_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_attr_unchanged10_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged1_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged2_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged3_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged4_cmd);
-  install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged5_cmd);
-  install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged6_cmd);
-  install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged7_cmd);
-  install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged8_cmd);
-  install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged9_cmd);
-  install_element (BGP_VPNV6_NODE, &neighbor_attr_unchanged10_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged1_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged2_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged3_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged4_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged5_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged6_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged7_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged8_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged9_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_attr_unchanged10_cmd);
 
   install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged1_cmd);
   install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged2_cmd);
   install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged3_cmd);
   install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged4_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged5_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged6_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged7_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged8_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged9_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_attr_unchanged10_cmd);
   install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged1_cmd);
   install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged2_cmd);
   install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged3_cmd);
   install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged4_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged5_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged6_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged7_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged8_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged9_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_attr_unchanged10_cmd);
 
   install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged1_cmd);
   install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged2_cmd);
   install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged3_cmd);
   install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged4_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged5_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged6_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged7_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged8_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged9_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_attr_unchanged10_cmd);
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged1_cmd);
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged2_cmd);
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged3_cmd);
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged4_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged5_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged6_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged7_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged8_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged9_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_attr_unchanged10_cmd);
 
   /* "nexthop-local unchanged" commands */
   install_element (BGP_IPV6_NODE, &neighbor_nexthop_local_unchanged_cmd);
@@ -15252,18 +15200,14 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &neighbor_ebgp_multihop_cmd);
   install_element (BGP_NODE, &neighbor_ebgp_multihop_ttl_cmd);
   install_element (BGP_NODE, &no_neighbor_ebgp_multihop_cmd);
-  install_element (BGP_NODE, &no_neighbor_ebgp_multihop_ttl_cmd);
 
   /* "neighbor disable-connected-check" commands.  */
   install_element (BGP_NODE, &neighbor_disable_connected_check_cmd);
   install_element (BGP_NODE, &no_neighbor_disable_connected_check_cmd);
-  install_element (BGP_NODE, &neighbor_enforce_multihop_cmd);
-  install_element (BGP_NODE, &no_neighbor_enforce_multihop_cmd);
 
   /* "neighbor description" commands. */
   install_element (BGP_NODE, &neighbor_description_cmd);
   install_element (BGP_NODE, &no_neighbor_description_cmd);
-  install_element (BGP_NODE, &no_neighbor_description_val_cmd);
 
   /* "neighbor update-source" commands. "*/
   install_element (BGP_NODE, &neighbor_update_source_cmd);
@@ -15273,33 +15217,26 @@ bgp_vty_init (void)
   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, &no_neighbor_default_originate_rmap_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);
-  install_element (BGP_IPV4_NODE, &no_neighbor_default_originate_rmap_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_default_originate_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_default_originate_rmap_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_default_originate_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_default_originate_rmap_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_default_originate_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_default_originate_rmap_cmd);
   install_element (BGP_IPV6_NODE, &no_neighbor_default_originate_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_default_originate_rmap_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_default_originate_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_default_originate_rmap_cmd);
   install_element (BGP_IPV6M_NODE, &no_neighbor_default_originate_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_default_originate_rmap_cmd);
 
   /* "neighbor port" commands. */
   install_element (BGP_NODE, &neighbor_port_cmd);
   install_element (BGP_NODE, &no_neighbor_port_cmd);
-  install_element (BGP_NODE, &no_neighbor_port_val_cmd);
 
   /* "neighbor weight" commands. */
   install_element (BGP_NODE, &neighbor_weight_cmd);
   install_element (BGP_NODE, &no_neighbor_weight_cmd);
-  install_element (BGP_NODE, &no_neighbor_weight_val_cmd);
 
   /* "neighbor override-capability" commands. */
   install_element (BGP_NODE, &neighbor_override_capability_cmd);
@@ -15312,17 +15249,14 @@ bgp_vty_init (void)
   /* "neighbor timers" commands. */
   install_element (BGP_NODE, &neighbor_timers_cmd);
   install_element (BGP_NODE, &no_neighbor_timers_cmd);
-  install_element (BGP_NODE, &no_neighbor_timers_val_cmd);
 
   /* "neighbor timers connect" commands. */
   install_element (BGP_NODE, &neighbor_timers_connect_cmd);
   install_element (BGP_NODE, &no_neighbor_timers_connect_cmd);
-  install_element (BGP_NODE, &no_neighbor_timers_connect_val_cmd);
 
   /* "neighbor advertisement-interval" commands. */
   install_element (BGP_NODE, &neighbor_advertise_interval_cmd);
   install_element (BGP_NODE, &no_neighbor_advertise_interval_cmd);
-  install_element (BGP_NODE, &no_neighbor_advertise_interval_val_cmd);
 
   /* "neighbor interface" commands. */
   install_element (BGP_NODE, &neighbor_interface_cmd);
@@ -15436,12 +15370,6 @@ bgp_vty_init (void)
   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, &no_neighbor_maximum_prefix_val_cmd);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_threshold_restart_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);
@@ -15449,12 +15377,6 @@ bgp_vty_init (void)
   install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_restart_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_val_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_maximum_prefix_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_maximum_prefix_threshold_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_maximum_prefix_warning_cmd);
@@ -15462,12 +15384,6 @@ bgp_vty_init (void)
   install_element (BGP_IPV4M_NODE, &neighbor_maximum_prefix_restart_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_val_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_maximum_prefix_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_maximum_prefix_threshold_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_maximum_prefix_warning_cmd);
@@ -15475,12 +15391,6 @@ bgp_vty_init (void)
   install_element (BGP_IPV6_NODE, &neighbor_maximum_prefix_restart_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_val_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_maximum_prefix_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_maximum_prefix_threshold_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_maximum_prefix_warning_cmd);
@@ -15488,12 +15398,6 @@ bgp_vty_init (void)
   install_element (BGP_IPV6M_NODE, &neighbor_maximum_prefix_restart_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_IPV6M_NODE, &no_neighbor_maximum_prefix_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_maximum_prefix_val_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_maximum_prefix_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_maximum_prefix_threshold_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_maximum_prefix_warning_cmd);
@@ -15501,12 +15405,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV4_NODE, &neighbor_maximum_prefix_restart_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_val_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_threshold_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_warning_cmd);
@@ -15514,12 +15412,6 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_restart_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_val_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_maximum_prefix_threshold_restart_cmd);
 
   install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_cmd);
   install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_threshold_cmd);
@@ -15528,12 +15420,6 @@ bgp_vty_init (void)
   install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_restart_cmd);
   install_element (BGP_ENCAP_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_ENCAP_NODE, &no_neighbor_maximum_prefix_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_maximum_prefix_val_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_maximum_prefix_threshold_restart_cmd);
 
   install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_cmd);
   install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_threshold_cmd);
@@ -15542,47 +15428,25 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_restart_cmd);
   install_element (BGP_ENCAPV6_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_val_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_threshold_restart_cmd);
 
   /* "neighbor allowas-in" */
   install_element (BGP_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_NODE, &neighbor_allowas_in_arg_cmd);
   install_element (BGP_NODE, &no_neighbor_allowas_in_cmd);
-  install_element (BGP_NODE, &no_neighbor_allowas_in_val_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_IPV4_NODE, &neighbor_allowas_in_arg_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_allowas_in_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_allowas_in_val_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_IPV4M_NODE, &neighbor_allowas_in_arg_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_allowas_in_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_allowas_in_val_cmd);
   install_element (BGP_IPV6_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_IPV6_NODE, &neighbor_allowas_in_arg_cmd);
   install_element (BGP_IPV6_NODE, &no_neighbor_allowas_in_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_allowas_in_val_cmd);
   install_element (BGP_IPV6M_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_IPV6M_NODE, &neighbor_allowas_in_arg_cmd);
   install_element (BGP_IPV6M_NODE, &no_neighbor_allowas_in_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_allowas_in_val_cmd);
   install_element (BGP_VPNV4_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_VPNV4_NODE, &neighbor_allowas_in_arg_cmd);
   install_element (BGP_VPNV4_NODE, &no_neighbor_allowas_in_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_allowas_in_val_cmd);
   install_element (BGP_VPNV6_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_VPNV6_NODE, &neighbor_allowas_in_arg_cmd);
   install_element (BGP_VPNV6_NODE, &no_neighbor_allowas_in_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_allowas_in_val_cmd);
   install_element (BGP_ENCAP_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_allowas_in_arg_cmd);
   install_element (BGP_ENCAP_NODE, &no_neighbor_allowas_in_cmd);
   install_element (BGP_ENCAPV6_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_allowas_in_arg_cmd);
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_allowas_in_cmd);
 
   /* address-family commands. */
@@ -15593,13 +15457,10 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &address_family_ipv6_safi_cmd);
 #endif /* HAVE_IPV6 */
   install_element (BGP_NODE, &address_family_vpnv4_cmd);
-  install_element (BGP_NODE, &address_family_vpnv4_unicast_cmd);
 
   install_element (BGP_NODE, &address_family_vpnv6_cmd);
-  install_element (BGP_NODE, &address_family_vpnv6_unicast_cmd);
 
   install_element (BGP_NODE, &address_family_encap_cmd);
-  install_element (BGP_NODE, &address_family_encapv4_cmd);
 #ifdef HAVE_IPV6
   install_element (BGP_NODE, &address_family_encapv6_cmd);
 #endif
@@ -15616,262 +15477,94 @@ bgp_vty_init (void)
 
   /* "clear ip bgp commands" */
   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);
-  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);
-  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_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_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);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_soft_in_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_vpnv4_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_soft_in_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_vpnv4_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_encap_soft_in_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_encap_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_soft_in_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_in_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_soft_in_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_in_cmd);
   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);
 
   /* 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);
   install_element (ENABLE_NODE, &clear_ip_bgp_all_encap_soft_out_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_all_encap_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_soft_out_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_out_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_soft_out_cmd);
-  install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_out_cmd);
   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);
-  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);
@@ -15889,25 +15582,10 @@ bgp_vty_init (void)
   install_element (ENABLE_NODE, &clear_ip_bgp_peer_encap_soft_cmd);
   install_element (ENABLE_NODE, &clear_ip_bgp_as_encap_soft_cmd);
   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);
-  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);
@@ -15936,18 +15614,14 @@ bgp_vty_init (void)
   install_element (VIEW_NODE, &show_ip_bgp_instance_summary_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_all_summary_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_ipv4_summary_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv4_safi_summary_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_ipv4_summary_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv4_safi_summary_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_summary_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd);
 #ifdef HAVE_IPV6
   install_element (VIEW_NODE, &show_bgp_summary_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_summary_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_all_summary_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_summary_cmd);
   install_element (VIEW_NODE, &show_bgp_ipv6_safi_summary_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_summary_cmd);
   install_element (VIEW_NODE, &show_bgp_instance_ipv6_safi_summary_cmd);
 #endif /* HAVE_IPV6 */
   install_element (RESTRICTED_NODE, &show_ip_bgp_summary_cmd);
@@ -15976,18 +15650,14 @@ bgp_vty_init (void)
   install_element (RESTRICTED_NODE, &show_ip_bgp_instance_summary_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_instance_all_summary_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_summary_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv4_safi_summary_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_instance_ipv4_summary_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_ipv4_safi_summary_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_vpnv4_all_summary_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd);
 #ifdef HAVE_IPV6
   install_element (RESTRICTED_NODE, &show_bgp_summary_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_instance_summary_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_instance_all_summary_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_summary_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_ipv6_safi_summary_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_ipv6_summary_cmd);
   install_element (RESTRICTED_NODE, &show_bgp_instance_ipv6_safi_summary_cmd);
 #endif /* HAVE_IPV6 */
   install_element (ENABLE_NODE, &show_ip_bgp_summary_cmd);
@@ -16016,18 +15686,14 @@ bgp_vty_init (void)
   install_element (ENABLE_NODE, &show_ip_bgp_instance_summary_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_all_summary_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_ipv4_summary_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv4_safi_summary_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_ipv4_summary_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv4_safi_summary_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_summary_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd);
 #ifdef HAVE_IPV6
   install_element (ENABLE_NODE, &show_bgp_summary_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_summary_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_all_summary_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_summary_cmd);
   install_element (ENABLE_NODE, &show_bgp_ipv6_safi_summary_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_summary_cmd);
   install_element (ENABLE_NODE, &show_bgp_instance_ipv6_safi_summary_cmd);
 #endif /* HAVE_IPV6 */
 
@@ -16039,54 +15705,19 @@ bgp_vty_init (void)
 
   /* "show ip bgp neighbors" commands. */
   install_element (VIEW_NODE, &show_ip_bgp_neighbors_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbors_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_neighbors_peer_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbors_peer_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbors_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbors_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_neighbors_peer_cmd);
-  install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_all_neighbors_cmd);
   install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_peer_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_neighbors_peer_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_ipv4_neighbors_peer_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_vpnv4_all_neighbors_peer_cmd);
-  install_element (RESTRICTED_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd);
   install_element (RESTRICTED_NODE, &show_ip_bgp_instance_neighbors_peer_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_neighbors_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbors_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_neighbors_peer_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbors_peer_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbors_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbors_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbors_peer_cmd);
-  install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbors_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_all_neighbors_cmd);
   install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbors_peer_cmd);
 
 #ifdef HAVE_IPV6
-  install_element (VIEW_NODE, &show_bgp_neighbors_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbors_cmd);
-  install_element (VIEW_NODE, &show_bgp_neighbors_peer_cmd);
-  install_element (VIEW_NODE, &show_bgp_ipv6_neighbors_peer_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_neighbors_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbors_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_neighbors_peer_cmd);
-  install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbors_peer_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_neighbors_peer_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_ipv6_neighbors_peer_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_neighbors_peer_cmd);
-  install_element (RESTRICTED_NODE, &show_bgp_instance_ipv6_neighbors_peer_cmd);
-  install_element (ENABLE_NODE, &show_bgp_neighbors_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbors_cmd);
-  install_element (ENABLE_NODE, &show_bgp_neighbors_peer_cmd);
-  install_element (ENABLE_NODE, &show_bgp_ipv6_neighbors_peer_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_neighbors_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbors_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_neighbors_peer_cmd);
-  install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbors_peer_cmd);
 
   /* Old commands.  */
   install_element (VIEW_NODE, &show_ipv6_bgp_summary_cmd);
@@ -16123,54 +15754,34 @@ bgp_vty_init (void)
   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, &no_bgp_redistribute_ipv4_rmap_cmd);
   install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_cmd);
-  install_element (BGP_NODE, &no_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, &no_bgp_redistribute_ipv4_rmap_metric_cmd);
-  install_element (BGP_NODE, &no_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, &no_bgp_redistribute_ipv4_ospf_rmap_cmd);
   install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_cmd);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_ospf_metric_cmd);
   install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_rmap_metric_cmd);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_ospf_rmap_metric_cmd);
   install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_rmap_cmd);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_ospf_metric_rmap_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);
-  install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_rmap_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_metric_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_metric_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_rmap_metric_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_metric_rmap_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_rmap_metric_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_metric_rmap_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_ospf_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_ospf_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_ospf_rmap_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_ospf_rmap_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_ospf_metric_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_ospf_metric_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_ospf_rmap_metric_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_ospf_rmap_metric_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_ospf_metric_rmap_cmd);
-  install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_ospf_metric_rmap_cmd);
 #ifdef HAVE_IPV6
   install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_cmd);
   install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_cmd);
   install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_rmap_cmd);
-  install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_rmap_cmd);
   install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_metric_cmd);
-  install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_metric_cmd);
   install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_rmap_metric_cmd);
   install_element (BGP_IPV6_NODE, &bgp_redistribute_ipv6_metric_rmap_cmd);
-  install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_rmap_metric_cmd);
-  install_element (BGP_IPV6_NODE, &no_bgp_redistribute_ipv6_metric_rmap_cmd);
 #endif /* HAVE_IPV6 */
 
   /* ttl_security commands */
@@ -16339,6 +15950,16 @@ community_list_unset_vty (struct vty *vty, int argc, const char **argv,
 /* "community-list" keyword help string.  */
 #define COMMUNITY_LIST_STR "Add a community list entry\n"
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip community-list <1-99> (deny|permit)",
+ *     IP_STR
+ *     COMMUNITY_LIST_STR
+ *     "Community list number (standard)\n"
+ *     "Specify community to reject\n"
+ *     "Specify community to accept\n"
+ *
+ */
 DEFUN (ip_community_list_standard,
        ip_community_list_standard_cmd,
        "ip community-list <1-99> (deny|permit) .AA:NN",
@@ -16352,14 +15973,6 @@ DEFUN (ip_community_list_standard,
   return community_list_set_vty (vty, argc, argv, COMMUNITY_LIST_STANDARD, 0);
 }
 
-ALIAS (ip_community_list_standard,
-       ip_community_list_standard2_cmd,
-       "ip community-list <1-99> (deny|permit)",
-       IP_STR
-       COMMUNITY_LIST_STR
-       "Community list number (standard)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n")
 
 DEFUN (ip_community_list_expanded,
        ip_community_list_expanded_cmd,
@@ -16374,6 +15987,17 @@ DEFUN (ip_community_list_expanded,
   return community_list_set_vty (vty, argc, argv, COMMUNITY_LIST_EXPANDED, 0);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip community-list standard WORD (deny|permit)",
+ *     IP_STR
+ *     COMMUNITY_LIST_STR
+ *     "Add a standard community-list entry\n"
+ *     "Community list name\n"
+ *     "Specify community to reject\n"
+ *     "Specify community to accept\n"
+ *
+ */
 DEFUN (ip_community_list_name_standard,
        ip_community_list_name_standard_cmd,
        "ip community-list standard WORD (deny|permit) .AA:NN",
@@ -16388,15 +16012,6 @@ DEFUN (ip_community_list_name_standard,
   return community_list_set_vty (vty, argc, argv, COMMUNITY_LIST_STANDARD, 1);
 }
 
-ALIAS (ip_community_list_name_standard,
-       ip_community_list_name_standard2_cmd,
-       "ip community-list standard WORD (deny|permit)",
-       IP_STR
-       COMMUNITY_LIST_STR
-       "Add a standard community-list entry\n"
-       "Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n")
 
 DEFUN (ip_community_list_name_expanded,
        ip_community_list_name_expanded_cmd,
@@ -16717,6 +16332,16 @@ extcommunity_list_unset_vty (struct vty *vty, int argc, struct cmd_token **argv,
 #define EXTCOMMUNITY_LIST_STR "Add a extended community list entry\n"
 #define EXTCOMMUNITY_VAL_STR  "Extended community attribute in 'rt aa:nn_or_IPaddr:nn' OR 'soo aa:nn_or_IPaddr:nn' format\n"
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip extcommunity-list <1-99> (deny|permit)",
+ *     IP_STR
+ *     EXTCOMMUNITY_LIST_STR
+ *     "Extended Community list number (standard)\n"
+ *     "Specify community to reject\n"
+ *     "Specify community to accept\n"
+ *
+ */
 DEFUN (ip_extcommunity_list_standard,
        ip_extcommunity_list_standard_cmd,
        "ip extcommunity-list <1-99> (deny|permit) .AA:NN",
@@ -16730,14 +16355,6 @@ DEFUN (ip_extcommunity_list_standard,
   return extcommunity_list_set_vty (vty, argc, argv, EXTCOMMUNITY_LIST_STANDARD, 0);
 }
 
-ALIAS (ip_extcommunity_list_standard,
-       ip_extcommunity_list_standard2_cmd,
-       "ip extcommunity-list <1-99> (deny|permit)",
-       IP_STR
-       EXTCOMMUNITY_LIST_STR
-       "Extended Community list number (standard)\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n")
 
 DEFUN (ip_extcommunity_list_expanded,
        ip_extcommunity_list_expanded_cmd,
@@ -16752,6 +16369,17 @@ DEFUN (ip_extcommunity_list_expanded,
   return extcommunity_list_set_vty (vty, argc, argv, EXTCOMMUNITY_LIST_EXPANDED, 0);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip extcommunity-list standard WORD (deny|permit)",
+ *     IP_STR
+ *     EXTCOMMUNITY_LIST_STR
+ *     "Specify standard extcommunity-list\n"
+ *     "Extended Community list name\n"
+ *     "Specify community to reject\n"
+ *     "Specify community to accept\n"
+ *
+ */
 DEFUN (ip_extcommunity_list_name_standard,
        ip_extcommunity_list_name_standard_cmd,
        "ip extcommunity-list standard WORD (deny|permit) .AA:NN",
@@ -16766,15 +16394,6 @@ DEFUN (ip_extcommunity_list_name_standard,
   return extcommunity_list_set_vty (vty, argc, argv, EXTCOMMUNITY_LIST_STANDARD, 1);
 }
 
-ALIAS (ip_extcommunity_list_name_standard,
-       ip_extcommunity_list_name_standard2_cmd,
-       "ip extcommunity-list standard WORD (deny|permit)",
-       IP_STR
-       EXTCOMMUNITY_LIST_STR
-       "Specify standard extcommunity-list\n"
-       "Extended Community list name\n"
-       "Specify community to reject\n"
-       "Specify community to accept\n")
 
 DEFUN (ip_extcommunity_list_name_expanded,
        ip_extcommunity_list_name_expanded_cmd,
@@ -17088,10 +16707,8 @@ community_list_vty (void)
 
   /* Community-list.  */
   install_element (CONFIG_NODE, &ip_community_list_standard_cmd);
-  install_element (CONFIG_NODE, &ip_community_list_standard2_cmd);
   install_element (CONFIG_NODE, &ip_community_list_expanded_cmd);
   install_element (CONFIG_NODE, &ip_community_list_name_standard_cmd);
-  install_element (CONFIG_NODE, &ip_community_list_name_standard2_cmd);
   install_element (CONFIG_NODE, &ip_community_list_name_expanded_cmd);
   install_element (CONFIG_NODE, &no_ip_community_list_standard_all_cmd);
   install_element (CONFIG_NODE, &no_ip_community_list_standard_direction_cmd);
@@ -17110,10 +16727,8 @@ community_list_vty (void)
 
   /* Extcommunity-list.  */
   install_element (CONFIG_NODE, &ip_extcommunity_list_standard_cmd);
-  install_element (CONFIG_NODE, &ip_extcommunity_list_standard2_cmd);
   install_element (CONFIG_NODE, &ip_extcommunity_list_expanded_cmd);
   install_element (CONFIG_NODE, &ip_extcommunity_list_name_standard_cmd);
-  install_element (CONFIG_NODE, &ip_extcommunity_list_name_standard2_cmd);
   install_element (CONFIG_NODE, &ip_extcommunity_list_name_expanded_cmd);
   install_element (CONFIG_NODE, &no_ip_extcommunity_list_standard_all_cmd);
   install_element (CONFIG_NODE, &no_ip_extcommunity_list_standard_direction_cmd);
index 86d5efd7798afa6cb8a5c67fe1a316beeaf4393e..35781ef2cafb484980274ba135149de5b6c964bb 100644 (file)
@@ -357,6 +357,15 @@ DEFUN (match_ip_address,
   return isis_route_match_add(vty, vty->index, "ip address", argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *
+ */
 DEFUN (no_match_ip_address,
        no_match_ip_address_val_cmd,
        "no match ip address (<1-199>|<1300-2699>|WORD)",
@@ -373,13 +382,6 @@ DEFUN (no_match_ip_address,
   return isis_route_match_delete(vty, vty->index, "ip address", argv[4]->arg);
 }
 
-ALIAS (no_match_ip_address,
-       no_match_ip_address_cmd,
-       "no match ip address",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n")
 
 /* ------------------------------------------------------------*/
 
@@ -395,6 +397,17 @@ DEFUN (match_ip_address_prefix_list,
   return isis_route_match_add(vty, vty->index, "ip address prefix-list", argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_address_prefix_list,
        no_match_ip_address_prefix_list_cmd,
        "no match ip address prefix-list",
@@ -409,15 +422,6 @@ DEFUN (no_match_ip_address_prefix_list,
   return isis_route_match_delete (vty, vty->index, "ip address prefix-list", argv[0]);
 }
 
-ALIAS (no_match_ip_address_prefix_list,
-       no_match_ip_address_prefix_list_val_cmd,
-       "no match ip address prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
 /* ------------------------------------------------------------*/
 
@@ -432,6 +436,15 @@ DEFUN (match_ipv6_address,
   return isis_route_match_add(vty, vty->index, "ipv6 address", argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ipv6 address",
+ *     NO_STR
+ *     MATCH_STR
+ *     IPV6_STR
+ *     "Match IPv6 address of route\n"
+ *
+ */
 DEFUN (no_match_ipv6_address,
        no_match_ipv6_address_val_cmd,
        "no match ipv6 address WORD",
@@ -446,13 +459,6 @@ DEFUN (no_match_ipv6_address,
   return isis_route_match_delete(vty, vty->index, "ipv6 address", argv[4]->arg);
 }
 
-ALIAS (no_match_ipv6_address,
-       no_match_ipv6_address_cmd,
-       "no match ipv6 address",
-       NO_STR
-       MATCH_STR
-       IPV6_STR
-       "Match IPv6 address of route\n")
 
 /* ------------------------------------------------------------*/
 
@@ -468,6 +474,17 @@ DEFUN (match_ipv6_address_prefix_list,
   return isis_route_match_add(vty, vty->index, "ipv6 address prefix-list", argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ipv6 address prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IPV6_STR
+ *     "Match address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ipv6_address_prefix_list,
        no_match_ipv6_address_prefix_list_cmd,
        "no match ipv6 address prefix-list",
@@ -482,15 +499,6 @@ DEFUN (no_match_ipv6_address_prefix_list,
   return isis_route_match_delete (vty, vty->index, "ipv6 address prefix-list", argv[0]);
 }
 
-ALIAS (no_match_ipv6_address_prefix_list,
-       no_match_ipv6_address_prefix_list_val_cmd,
-       "no match ipv6 address prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IPV6_STR
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
 /* ------------------------------------------------------------*/
 
@@ -498,7 +506,7 @@ ALIAS (no_match_ipv6_address_prefix_list,
  * commands at the same node, therefore add set metric with the same 32-bit range as ospf and
  * verify that the input is a valid isis metric */
 DEFUN (set_metric,
-      set_metric_cmd,
+       set_metric_cmd,
       "set metric <0-4294967295>",
       SET_STR
       "Metric vale for destination routing protocol\n"
@@ -507,8 +515,19 @@ DEFUN (set_metric,
   return isis_route_set_add(vty, vty->index, "metric", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set metric",
+ *     NO_STR
+ *     SET_STR
+ *     "Metric vale for destination routing protocol\n");
+ *     
+ *     void
+ *     isis_route_map_init(void
+ *
+ */
 DEFUN (no_set_metric,
-      no_set_metric_val_cmd,
+       no_set_metric_val_cmd,
       "no set metric <0-4294967295>",
       NO_STR
       SET_STR
@@ -520,15 +539,6 @@ DEFUN (no_set_metric,
   return isis_route_set_delete(vty, vty->index, "metric", argv[3]->arg);
 }
 
-ALIAS (no_set_metric,
-       no_set_metric_cmd,
-       "no set metric",
-       NO_STR
-       SET_STR
-       "Metric vale for destination routing protocol\n");
-
-void
-isis_route_map_init(void)
 {
   route_map_init();
   route_map_init_vty();
@@ -536,25 +546,20 @@ isis_route_map_init(void)
   route_map_install_match(&route_match_ip_address_cmd);
   install_element(RMAP_NODE, &match_ip_address_cmd);
   install_element(RMAP_NODE, &no_match_ip_address_val_cmd);
-  install_element(RMAP_NODE, &no_match_ip_address_cmd);
 
   route_map_install_match(&route_match_ip_address_prefix_list_cmd);
   install_element(RMAP_NODE, &match_ip_address_prefix_list_cmd);
-  install_element(RMAP_NODE, &no_match_ip_address_prefix_list_val_cmd);
   install_element(RMAP_NODE, &no_match_ip_address_prefix_list_cmd);
 
   route_map_install_match(&route_match_ipv6_address_cmd);
   install_element(RMAP_NODE, &match_ipv6_address_cmd);
   install_element(RMAP_NODE, &no_match_ipv6_address_val_cmd);
-  install_element(RMAP_NODE, &no_match_ipv6_address_cmd);
 
   route_map_install_match(&route_match_ipv6_address_prefix_list_cmd);
   install_element(RMAP_NODE, &match_ipv6_address_prefix_list_cmd);
-  install_element(RMAP_NODE, &no_match_ipv6_address_prefix_list_val_cmd);
   install_element(RMAP_NODE, &no_match_ipv6_address_prefix_list_cmd);
 
   route_map_install_set(&route_set_metric_cmd);
   install_element(RMAP_NODE, &set_metric_cmd);
   install_element(RMAP_NODE, &no_set_metric_val_cmd);
-  install_element(RMAP_NODE, &no_set_metric_cmd);
 }
index 79fbdc4d2438dcb326619d6fb5763f066e48b77e..b0976177ff62a7b6c29ea7d5660953cd5e882751 100644 (file)
@@ -323,6 +323,17 @@ DEFUN (isis_passwd,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis password (md5|clear) WORD",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Configure the authentication password for a circuit\n"
+ *     "HMAC-MD5 authentication\n"
+ *     "Cleartext password\n"
+ *     "Circuit password\n"
+ *
+ */
 DEFUN (no_isis_passwd,
        no_isis_passwd_cmd,
        "no isis password",
@@ -339,15 +350,6 @@ DEFUN (no_isis_passwd,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_passwd,
-       no_isis_passwd_arg_cmd,
-       "no isis password (md5|clear) WORD",
-       NO_STR
-       "IS-IS commands\n"
-       "Configure the authentication password for a circuit\n"
-       "HMAC-MD5 authentication\n"
-       "Cleartext password\n"
-       "Circuit password\n")
 
 DEFUN (isis_priority,
        isis_priority_cmd,
@@ -375,6 +377,15 @@ DEFUN (isis_priority,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis priority <0-127>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set priority for Designated Router election\n"
+ *     "Priority value\n"
+ *
+ */
 DEFUN (no_isis_priority,
        no_isis_priority_cmd,
        "no isis priority",
@@ -392,13 +403,6 @@ DEFUN (no_isis_priority,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_priority,
-       no_isis_priority_arg_cmd,
-       "no isis priority <0-127>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set priority for Designated Router election\n"
-       "Priority value\n")
 
 DEFUN (isis_priority_l1,
        isis_priority_l1_cmd,
@@ -426,6 +430,16 @@ DEFUN (isis_priority_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis priority <0-127> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set priority for Designated Router election\n"
+ *     "Priority value\n"
+ *     "Specify priority for level-1 routing\n"
+ *
+ */
 DEFUN (no_isis_priority_l1,
        no_isis_priority_l1_cmd,
        "no isis priority level-1",
@@ -443,14 +457,6 @@ DEFUN (no_isis_priority_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_priority_l1,
-       no_isis_priority_l1_arg_cmd,
-       "no isis priority <0-127> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set priority for Designated Router election\n"
-       "Priority value\n"
-       "Specify priority for level-1 routing\n")
 
 DEFUN (isis_priority_l2,
        isis_priority_l2_cmd,
@@ -478,6 +484,16 @@ DEFUN (isis_priority_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis priority <0-127> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set priority for Designated Router election\n"
+ *     "Priority value\n"
+ *     "Specify priority for level-2 routing\n"
+ *
+ */
 DEFUN (no_isis_priority_l2,
        no_isis_priority_l2_cmd,
        "no isis priority level-2",
@@ -495,14 +511,6 @@ DEFUN (no_isis_priority_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_priority_l2,
-       no_isis_priority_l2_arg_cmd,
-       "no isis priority <0-127> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set priority for Designated Router election\n"
-       "Priority value\n"
-       "Specify priority for level-2 routing\n")
 
 /* Metric command */
 DEFUN (isis_metric,
@@ -544,6 +552,15 @@ DEFUN (isis_metric,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis metric <0-16777215>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set default metric for circuit\n"
+ *     "Default metric value\n"
+ *
+ */
 DEFUN (no_isis_metric,
        no_isis_metric_cmd,
        "no isis metric",
@@ -560,13 +577,6 @@ DEFUN (no_isis_metric,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_metric,
-       no_isis_metric_arg_cmd,
-       "no isis metric <0-16777215>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set default metric for circuit\n"
-       "Default metric value\n")
 
 DEFUN (isis_metric_l1,
        isis_metric_l1_cmd,
@@ -607,6 +617,16 @@ DEFUN (isis_metric_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis metric <0-16777215> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set default metric for circuit\n"
+ *     "Default metric value\n"
+ *     "Specify metric for level-1 routing\n"
+ *
+ */
 DEFUN (no_isis_metric_l1,
        no_isis_metric_l1_cmd,
        "no isis metric level-1",
@@ -623,14 +643,6 @@ DEFUN (no_isis_metric_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_metric_l1,
-       no_isis_metric_l1_arg_cmd,
-       "no isis metric <0-16777215> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set default metric for circuit\n"
-       "Default metric value\n"
-       "Specify metric for level-1 routing\n")
 
 DEFUN (isis_metric_l2,
        isis_metric_l2_cmd,
@@ -671,6 +683,16 @@ DEFUN (isis_metric_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis metric <0-16777215> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set default metric for circuit\n"
+ *     "Default metric value\n"
+ *     "Specify metric for level-2 routing\n"
+ *
+ */
 DEFUN (no_isis_metric_l2,
        no_isis_metric_l2_cmd,
        "no isis metric level-2",
@@ -687,14 +709,6 @@ DEFUN (no_isis_metric_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_metric_l2,
-       no_isis_metric_l2_arg_cmd,
-       "no isis metric <0-16777215> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set default metric for circuit\n"
-       "Default metric value\n"
-       "Specify metric for level-2 routing\n")
 /* end of metrics */
 
 DEFUN (isis_hello_interval,
@@ -724,6 +738,16 @@ DEFUN (isis_hello_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-interval <1-600>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set Hello interval\n"
+ *     "Hello interval value\n"
+ *     "Holdtime 1 second, interval depends on multiplier\n"
+ *
+ */
 DEFUN (no_isis_hello_interval,
        no_isis_hello_interval_cmd,
        "no isis hello-interval",
@@ -741,14 +765,6 @@ DEFUN (no_isis_hello_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_interval,
-       no_isis_hello_interval_arg_cmd,
-       "no isis hello-interval <1-600>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set Hello interval\n"
-       "Hello interval value\n"
-       "Holdtime 1 second, interval depends on multiplier\n")
 
 DEFUN (isis_hello_interval_l1,
        isis_hello_interval_l1_cmd,
@@ -777,6 +793,17 @@ DEFUN (isis_hello_interval_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-interval <1-600> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set Hello interval\n"
+ *     "Hello interval value\n"
+ *     "Holdtime 1 second, interval depends on multiplier\n"
+ *     "Specify hello-interval for level-1 IIHs\n"
+ *
+ */
 DEFUN (no_isis_hello_interval_l1,
        no_isis_hello_interval_l1_cmd,
        "no isis hello-interval level-1",
@@ -794,15 +821,6 @@ DEFUN (no_isis_hello_interval_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_interval_l1,
-       no_isis_hello_interval_l1_arg_cmd,
-       "no isis hello-interval <1-600> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set Hello interval\n"
-       "Hello interval value\n"
-       "Holdtime 1 second, interval depends on multiplier\n"
-       "Specify hello-interval for level-1 IIHs\n")
 
 DEFUN (isis_hello_interval_l2,
        isis_hello_interval_l2_cmd,
@@ -831,6 +849,17 @@ DEFUN (isis_hello_interval_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-interval <1-600> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set Hello interval\n"
+ *     "Hello interval value\n"
+ *     "Holdtime 1 second, interval depends on multiplier\n"
+ *     "Specify hello-interval for level-2 IIHs\n"
+ *
+ */
 DEFUN (no_isis_hello_interval_l2,
        no_isis_hello_interval_l2_cmd,
        "no isis hello-interval level-2",
@@ -848,15 +877,6 @@ DEFUN (no_isis_hello_interval_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_interval_l2,
-       no_isis_hello_interval_l2_arg_cmd,
-       "no isis hello-interval <1-600> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set Hello interval\n"
-       "Hello interval value\n"
-       "Holdtime 1 second, interval depends on multiplier\n"
-       "Specify hello-interval for level-2 IIHs\n")
 
 DEFUN (isis_hello_multiplier,
        isis_hello_multiplier_cmd,
@@ -884,6 +904,15 @@ DEFUN (isis_hello_multiplier,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-multiplier <2-100>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set multiplier for Hello holding time\n"
+ *     "Hello multiplier value\n"
+ *
+ */
 DEFUN (no_isis_hello_multiplier,
        no_isis_hello_multiplier_cmd,
        "no isis hello-multiplier",
@@ -901,13 +930,6 @@ DEFUN (no_isis_hello_multiplier,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_multiplier,
-       no_isis_hello_multiplier_arg_cmd,
-       "no isis hello-multiplier <2-100>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set multiplier for Hello holding time\n"
-       "Hello multiplier value\n")
 
 DEFUN (isis_hello_multiplier_l1,
        isis_hello_multiplier_l1_cmd,
@@ -935,6 +957,16 @@ DEFUN (isis_hello_multiplier_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-multiplier <2-100> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set multiplier for Hello holding time\n"
+ *     "Hello multiplier value\n"
+ *     "Specify hello multiplier for level-1 IIHs\n"
+ *
+ */
 DEFUN (no_isis_hello_multiplier_l1,
        no_isis_hello_multiplier_l1_cmd,
        "no isis hello-multiplier level-1",
@@ -952,14 +984,6 @@ DEFUN (no_isis_hello_multiplier_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_multiplier_l1,
-       no_isis_hello_multiplier_l1_arg_cmd,
-       "no isis hello-multiplier <2-100> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set multiplier for Hello holding time\n"
-       "Hello multiplier value\n"
-       "Specify hello multiplier for level-1 IIHs\n")
 
 DEFUN (isis_hello_multiplier_l2,
        isis_hello_multiplier_l2_cmd,
@@ -987,6 +1011,16 @@ DEFUN (isis_hello_multiplier_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis hello-multiplier <2-100> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set multiplier for Hello holding time\n"
+ *     "Hello multiplier value\n"
+ *     "Specify hello multiplier for level-2 IIHs\n"
+ *
+ */
 DEFUN (no_isis_hello_multiplier_l2,
        no_isis_hello_multiplier_l2_cmd,
        "no isis hello-multiplier level-2",
@@ -1004,14 +1038,6 @@ DEFUN (no_isis_hello_multiplier_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_isis_hello_multiplier_l2,
-       no_isis_hello_multiplier_l2_arg_cmd,
-       "no isis hello-multiplier <2-100> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set multiplier for Hello holding time\n"
-       "Hello multiplier value\n"
-       "Specify hello multiplier for level-2 IIHs\n")
 
 DEFUN (isis_hello_padding,
        isis_hello_padding_cmd,
@@ -1074,6 +1100,15 @@ DEFUN (csnp_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis csnp-interval <1-600>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set CSNP interval in seconds\n"
+ *     "CSNP interval value\n"
+ *
+ */
 DEFUN (no_csnp_interval,
        no_csnp_interval_cmd,
        "no isis csnp-interval",
@@ -1091,13 +1126,6 @@ DEFUN (no_csnp_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_csnp_interval,
-       no_csnp_interval_arg_cmd,
-       "no isis csnp-interval <1-600>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set CSNP interval in seconds\n"
-       "CSNP interval value\n")
 
 DEFUN (csnp_interval_l1,
        csnp_interval_l1_cmd,
@@ -1125,6 +1153,16 @@ DEFUN (csnp_interval_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis csnp-interval <1-600> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set CSNP interval in seconds\n"
+ *     "CSNP interval value\n"
+ *     "Specify interval for level-1 CSNPs\n"
+ *
+ */
 DEFUN (no_csnp_interval_l1,
        no_csnp_interval_l1_cmd,
        "no isis csnp-interval level-1",
@@ -1142,14 +1180,6 @@ DEFUN (no_csnp_interval_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_csnp_interval_l1,
-       no_csnp_interval_l1_arg_cmd,
-       "no isis csnp-interval <1-600> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set CSNP interval in seconds\n"
-       "CSNP interval value\n"
-       "Specify interval for level-1 CSNPs\n")
 
 DEFUN (csnp_interval_l2,
        csnp_interval_l2_cmd,
@@ -1177,6 +1207,16 @@ DEFUN (csnp_interval_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis csnp-interval <1-600> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set CSNP interval in seconds\n"
+ *     "CSNP interval value\n"
+ *     "Specify interval for level-2 CSNPs\n"
+ *
+ */
 DEFUN (no_csnp_interval_l2,
        no_csnp_interval_l2_cmd,
        "no isis csnp-interval level-2",
@@ -1194,14 +1234,6 @@ DEFUN (no_csnp_interval_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_csnp_interval_l2,
-       no_csnp_interval_l2_arg_cmd,
-       "no isis csnp-interval <1-600> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set CSNP interval in seconds\n"
-       "CSNP interval value\n"
-       "Specify interval for level-2 CSNPs\n")
 
 DEFUN (psnp_interval,
        psnp_interval_cmd,
@@ -1229,6 +1261,15 @@ DEFUN (psnp_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis psnp-interval <1-120>",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set PSNP interval in seconds\n"
+ *     "PSNP interval value\n"
+ *
+ */
 DEFUN (no_psnp_interval,
        no_psnp_interval_cmd,
        "no isis psnp-interval",
@@ -1246,13 +1287,6 @@ DEFUN (no_psnp_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_psnp_interval,
-       no_psnp_interval_arg_cmd,
-       "no isis psnp-interval <1-120>",
-       NO_STR
-       "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "PSNP interval value\n")
 
 DEFUN (psnp_interval_l1,
        psnp_interval_l1_cmd,
@@ -1280,6 +1314,16 @@ DEFUN (psnp_interval_l1,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis psnp-interval <1-120> level-1",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set PSNP interval in seconds\n"
+ *     "PSNP interval value\n"
+ *     "Specify interval for level-1 PSNPs\n"
+ *
+ */
 DEFUN (no_psnp_interval_l1,
        no_psnp_interval_l1_cmd,
        "no isis psnp-interval level-1",
@@ -1297,14 +1341,6 @@ DEFUN (no_psnp_interval_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_psnp_interval_l1,
-       no_psnp_interval_l1_arg_cmd,
-       "no isis psnp-interval <1-120> level-1",
-       NO_STR
-       "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "PSNP interval value\n"
-       "Specify interval for level-1 PSNPs\n")
 
 DEFUN (psnp_interval_l2,
        psnp_interval_l2_cmd,
@@ -1332,6 +1368,16 @@ DEFUN (psnp_interval_l2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no isis psnp-interval <1-120> level-2",
+ *     NO_STR
+ *     "IS-IS commands\n"
+ *     "Set PSNP interval in seconds\n"
+ *     "PSNP interval value\n"
+ *     "Specify interval for level-2 PSNPs\n"
+ *
+ */
 DEFUN (no_psnp_interval_l2,
        no_psnp_interval_l2_cmd,
        "no isis psnp-interval level-2",
@@ -1349,14 +1395,6 @@ DEFUN (no_psnp_interval_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_psnp_interval_l2,
-       no_psnp_interval_l2_arg_cmd,
-       "no isis psnp-interval <1-120> level-2",
-       NO_STR
-       "IS-IS commands\n"
-       "Set PSNP interval in seconds\n"
-       "PSNP interval value\n"
-       "Specify interval for level-2 PSNPs\n")
 
 static int
 validate_metric_style_narrow (struct vty *vty, struct isis_area *area)
@@ -1566,6 +1604,14 @@ DEFUN (area_lsp_mtu,
   return area_lsp_mtu_set(vty, lsp_mtu);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-mtu <128-4352>",
+ *     NO_STR
+ *     "Configure the maximum size of generated LSPs\n"
+ *     "Maximum size of generated LSPs\n"
+ *
+ */
 DEFUN (no_area_lsp_mtu,
        no_area_lsp_mtu_cmd,
        "no lsp-mtu",
@@ -1575,12 +1621,6 @@ DEFUN (no_area_lsp_mtu,
   return area_lsp_mtu_set(vty, DEFAULT_LSP_MTU);
 }
 
-ALIAS (no_area_lsp_mtu,
-       no_area_lsp_mtu_arg_cmd,
-       "no lsp-mtu <128-4352>",
-       NO_STR
-       "Configure the maximum size of generated LSPs\n"
-       "Maximum size of generated LSPs\n");
 
 DEFUN (is_type,
        is_type_cmd,
@@ -1689,6 +1729,14 @@ DEFUN (lsp_gen_interval,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-gen-interval <1-120>",
+ *     NO_STR
+ *     "Minimum interval between regenerating same LSP\n"
+ *     "Minimum interval in seconds\n"
+ *
+ */
 DEFUN (no_lsp_gen_interval,
        no_lsp_gen_interval_cmd,
        "no lsp-gen-interval",
@@ -1705,12 +1753,6 @@ DEFUN (no_lsp_gen_interval,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
-ALIAS (no_lsp_gen_interval,
-       no_lsp_gen_interval_arg_cmd,
-       "no lsp-gen-interval <1-120>",
-       NO_STR
-       "Minimum interval between regenerating same LSP\n"
-       "Minimum interval in seconds\n")
 
 DEFUN (lsp_gen_interval_l1,
        lsp_gen_interval_l1_cmd,
@@ -1729,6 +1771,15 @@ DEFUN (lsp_gen_interval_l1,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-gen-interval level-1 <1-120>",
+ *     NO_STR
+ *     "Minimum interval between regenerating same LSP\n"
+ *     "Set interval for level 1 only\n"
+ *     "Minimum interval in seconds\n"
+ *
+ */
 DEFUN (no_lsp_gen_interval_l1,
        no_lsp_gen_interval_l1_cmd,
        "no lsp-gen-interval level-1",
@@ -1746,13 +1797,6 @@ DEFUN (no_lsp_gen_interval_l1,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
-ALIAS (no_lsp_gen_interval_l1,
-       no_lsp_gen_interval_l1_arg_cmd,
-       "no lsp-gen-interval level-1 <1-120>",
-       NO_STR
-       "Minimum interval between regenerating same LSP\n"
-       "Set interval for level 1 only\n"
-       "Minimum interval in seconds\n")
 
 DEFUN (lsp_gen_interval_l2,
        lsp_gen_interval_l2_cmd,
@@ -1771,6 +1815,15 @@ DEFUN (lsp_gen_interval_l2,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-gen-interval level-2 <1-120>",
+ *     NO_STR
+ *     "Minimum interval between regenerating same LSP\n"
+ *     "Set interval for level 2 only\n"
+ *     "Minimum interval in seconds\n"
+ *
+ */
 DEFUN (no_lsp_gen_interval_l2,
        no_lsp_gen_interval_l2_cmd,
        "no lsp-gen-interval level-2",
@@ -1788,13 +1841,6 @@ DEFUN (no_lsp_gen_interval_l2,
   return set_lsp_gen_interval (vty, area, interval, level);
 }
 
-ALIAS (no_lsp_gen_interval_l2,
-       no_lsp_gen_interval_l2_arg_cmd,
-       "no lsp-gen-interval level-2 <1-120>",
-       NO_STR
-       "Minimum interval between regenerating same LSP\n"
-       "Set interval for level 2 only\n"
-       "Minimum interval in seconds\n")
 
 DEFUN (spf_interval,
        spf_interval_cmd,
@@ -1813,6 +1859,26 @@ DEFUN (spf_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no spf-interval level-2 <1-120>",
+ *     NO_STR
+ *     "Minimum interval between SPF calculations\n"
+ *     "Set interval for level 2 only\n"
+ *     "Minimum interval between consecutive SPFs in seconds\n"
+ *
+ * "no spf-interval <1-120>",
+ *     NO_STR
+ *     "Minimum interval between SPF calculations\n"
+ *     "Minimum interval between consecutive SPFs in seconds\n"
+ *
+ * "no spf-interval level-1 <1-120>",
+ *     NO_STR
+ *     "Minimum interval between SPF calculations\n"
+ *     "Set interval for level 1 only\n"
+ *     "Minimum interval between consecutive SPFs in seconds\n"
+ *
+ */
 DEFUN (no_spf_interval,
        no_spf_interval_cmd,
        "no spf-interval",
@@ -1829,12 +1895,6 @@ DEFUN (no_spf_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_spf_interval,
-       no_spf_interval_arg_cmd,
-       "no spf-interval <1-120>",
-       NO_STR
-       "Minimum interval between SPF calculations\n"
-       "Minimum interval between consecutive SPFs in seconds\n")
 
 DEFUN (spf_interval_l1,
        spf_interval_l1_cmd,
@@ -1869,13 +1929,6 @@ DEFUN (no_spf_interval_l1,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_spf_interval,
-       no_spf_interval_l1_arg_cmd,
-       "no spf-interval level-1 <1-120>",
-       NO_STR
-       "Minimum interval between SPF calculations\n"
-       "Set interval for level 1 only\n"
-       "Minimum interval between consecutive SPFs in seconds\n")
 
 DEFUN (spf_interval_l2,
        spf_interval_l2_cmd,
@@ -1910,13 +1963,6 @@ DEFUN (no_spf_interval_l2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_spf_interval,
-       no_spf_interval_l2_arg_cmd,
-       "no spf-interval level-2 <1-120>",
-       NO_STR
-       "Minimum interval between SPF calculations\n"
-       "Set interval for level 2 only\n"
-       "Minimum interval between consecutive SPFs in seconds\n")
 
 static int
 area_max_lsp_lifetime_set(struct vty *vty, int level,
@@ -1979,6 +2025,14 @@ DEFUN (max_lsp_lifetime,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_1_AND_2, atoi(argv[1]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no max-lsp-lifetime <350-65535>",
+ *     NO_STR
+ *     "Maximum LSP lifetime\n"
+ *     "LSP lifetime in seconds\n"
+ *
+ */
 DEFUN (no_max_lsp_lifetime,
        no_max_lsp_lifetime_cmd,
        "no max-lsp-lifetime",
@@ -1989,12 +2043,6 @@ DEFUN (no_max_lsp_lifetime,
                                   DEFAULT_LSP_LIFETIME);
 }
 
-ALIAS (no_max_lsp_lifetime,
-       no_max_lsp_lifetime_arg_cmd,
-       "no max-lsp-lifetime <350-65535>",
-       NO_STR
-       "Maximum LSP lifetime\n"
-       "LSP lifetime in seconds\n")
 
 DEFUN (max_lsp_lifetime_l1,
        max_lsp_lifetime_l1_cmd,
@@ -2005,6 +2053,14 @@ DEFUN (max_lsp_lifetime_l1,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_1, atoi(argv[2]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no max-lsp-lifetime level-1 <350-65535>",
+ *     NO_STR
+ *     "Maximum LSP lifetime for Level 1 only\n"
+ *     "LSP lifetime for Level 1 only in seconds\n"
+ *
+ */
 DEFUN (no_max_lsp_lifetime_l1,
        no_max_lsp_lifetime_l1_cmd,
        "no max-lsp-lifetime level-1",
@@ -2014,12 +2070,6 @@ DEFUN (no_max_lsp_lifetime_l1,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_1, DEFAULT_LSP_LIFETIME);
 }
 
-ALIAS (no_max_lsp_lifetime_l1,
-       no_max_lsp_lifetime_l1_arg_cmd,
-       "no max-lsp-lifetime level-1 <350-65535>",
-       NO_STR
-       "Maximum LSP lifetime for Level 1 only\n"
-       "LSP lifetime for Level 1 only in seconds\n")
 
 DEFUN (max_lsp_lifetime_l2,
        max_lsp_lifetime_l2_cmd,
@@ -2030,6 +2080,14 @@ DEFUN (max_lsp_lifetime_l2,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_2, atoi(argv[2]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no max-lsp-lifetime level-2 <350-65535>",
+ *     NO_STR
+ *     "Maximum LSP lifetime for Level 2 only\n"
+ *     "LSP lifetime for Level 2 only in seconds\n"
+ *
+ */
 DEFUN (no_max_lsp_lifetime_l2,
        no_max_lsp_lifetime_l2_cmd,
        "no max-lsp-lifetime level-2",
@@ -2039,12 +2097,6 @@ DEFUN (no_max_lsp_lifetime_l2,
   return area_max_lsp_lifetime_set(vty, IS_LEVEL_2, DEFAULT_LSP_LIFETIME);
 }
 
-ALIAS (no_max_lsp_lifetime_l2,
-       no_max_lsp_lifetime_l2_arg_cmd,
-       "no max-lsp-lifetime level-2 <350-65535>",
-       NO_STR
-       "Maximum LSP lifetime for Level 2 only\n"
-       "LSP lifetime for Level 2 only in seconds\n")
 
 static int
 area_lsp_refresh_interval_set(struct vty *vty, int level, uint16_t interval)
@@ -2099,6 +2151,14 @@ DEFUN (lsp_refresh_interval,
   return area_lsp_refresh_interval_set(vty, IS_LEVEL_1_AND_2, atoi(argv[1]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-refresh-interval <1-65235>",
+ *     NO_STR
+ *     "LSP refresh interval\n"
+ *     "LSP refresh interval in seconds\n"
+ *
+ */
 DEFUN (no_lsp_refresh_interval,
        no_lsp_refresh_interval_cmd,
        "no lsp-refresh-interval",
@@ -2109,12 +2169,6 @@ DEFUN (no_lsp_refresh_interval,
                                       DEFAULT_MAX_LSP_GEN_INTERVAL);
 }
 
-ALIAS (no_lsp_refresh_interval,
-       no_lsp_refresh_interval_arg_cmd,
-       "no lsp-refresh-interval <1-65235>",
-       NO_STR
-       "LSP refresh interval\n"
-       "LSP refresh interval in seconds\n")
 
 DEFUN (lsp_refresh_interval_l1,
        lsp_refresh_interval_l1_cmd,
@@ -2125,6 +2179,14 @@ DEFUN (lsp_refresh_interval_l1,
   return area_lsp_refresh_interval_set(vty, IS_LEVEL_1, atoi(argv[2]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-refresh-interval level-1 <1-65235>",
+ *     NO_STR
+ *     "LSP refresh interval for Level 1 only\n"
+ *     "LSP refresh interval for Level 1 only in seconds\n"
+ *
+ */
 DEFUN (no_lsp_refresh_interval_l1,
        no_lsp_refresh_interval_l1_cmd,
        "no lsp-refresh-interval level-1",
@@ -2135,12 +2197,6 @@ DEFUN (no_lsp_refresh_interval_l1,
                                       DEFAULT_MAX_LSP_GEN_INTERVAL);
 }
 
-ALIAS (no_lsp_refresh_interval_l1,
-       no_lsp_refresh_interval_l1_arg_cmd,
-       "no lsp-refresh-interval level-1 <1-65235>",
-       NO_STR
-       "LSP refresh interval for Level 1 only\n"
-       "LSP refresh interval for Level 1 only in seconds\n")
 
 DEFUN (lsp_refresh_interval_l2,
        lsp_refresh_interval_l2_cmd,
@@ -2151,6 +2207,14 @@ DEFUN (lsp_refresh_interval_l2,
   return area_lsp_refresh_interval_set(vty, IS_LEVEL_2, atoi(argv[2]->arg));
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no lsp-refresh-interval level-2 <1-65235>",
+ *     NO_STR
+ *     "LSP refresh interval for Level 2 only\n"
+ *     "LSP refresh interval for Level 2 only in seconds\n"
+ *
+ */
 DEFUN (no_lsp_refresh_interval_l2,
        no_lsp_refresh_interval_l2_cmd,
        "no lsp-refresh-interval level-2",
@@ -2161,12 +2225,6 @@ DEFUN (no_lsp_refresh_interval_l2,
                                       DEFAULT_MAX_LSP_GEN_INTERVAL);
 }
 
-ALIAS (no_lsp_refresh_interval_l2,
-       no_lsp_refresh_interval_l2_arg_cmd,
-       "no lsp-refresh-interval level-2 <1-65235>",
-       NO_STR
-       "LSP refresh interval for Level 2 only\n"
-       "LSP refresh interval for Level 2 only in seconds\n")
 
 static int
 area_passwd_set(struct vty *vty, int level,
@@ -2192,6 +2250,19 @@ area_passwd_set(struct vty *vty, int level,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "(area-password|domain-password) md5 WORD authenticate snp (send-only|validate)",
+ *     "Configure the authentication password for an area\n"
+ *     "Set the authentication password for a routing domain\n"
+ *     "Authentication type\n"
+ *     "Level-wide password\n"
+ *     "Authentication\n"
+ *     "SNP PDUs\n"
+ *     "Send but do not check PDUs on receiving\n"
+ *     "Send and check PDUs on receiving\n"
+ *
+ */
 DEFUN (area_passwd_md5,
        area_passwd_md5_cmd,
        "(area-password|domain-password) md5 WORD",
@@ -2214,18 +2285,20 @@ DEFUN (area_passwd_md5,
                          argv[2]->arg, snp_auth);
 }
 
-ALIAS (area_passwd_md5,
-       area_passwd_md5_snpauth_cmd,
-       "(area-password|domain-password) md5 WORD authenticate snp (send-only|validate)",
-       "Configure the authentication password for an area\n"
-       "Set the authentication password for a routing domain\n"
-       "Authentication type\n"
-       "Level-wide password\n"
-       "Authentication\n"
-       "SNP PDUs\n"
-       "Send but do not check PDUs on receiving\n"
-       "Send and check PDUs on receiving\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "(area-password|domain-password) clear WORD authenticate snp (send-only|validate)",
+ *     "Configure the authentication password for an area\n"
+ *     "Set the authentication password for a routing domain\n"
+ *     "Authentication type\n"
+ *     "Area password\n"
+ *     "Authentication\n"
+ *     "SNP PDUs\n"
+ *     "Send but do not check PDUs on receiving\n"
+ *     "Send and check PDUs on receiving\n"
+ *
+ */
 DEFUN (area_passwd_clear,
        area_passwd_clear_cmd,
        "(area-password|domain-password) clear WORD",
@@ -2248,17 +2321,6 @@ DEFUN (area_passwd_clear,
                          argv[2]->arg, snp_auth);
 }
 
-ALIAS (area_passwd_clear,
-       area_passwd_clear_snpauth_cmd,
-       "(area-password|domain-password) clear WORD authenticate snp (send-only|validate)",
-       "Configure the authentication password for an area\n"
-       "Set the authentication password for a routing domain\n"
-       "Authentication type\n"
-       "Area password\n"
-       "Authentication\n"
-       "SNP PDUs\n"
-       "Send but do not check PDUs on receiving\n"
-       "Send and check PDUs on receiving\n")
 
 DEFUN (no_area_passwd,
        no_area_passwd_cmd,
@@ -2296,70 +2358,51 @@ isis_vty_init (void)
 
   install_element (INTERFACE_NODE, &isis_passwd_cmd);
   install_element (INTERFACE_NODE, &no_isis_passwd_cmd);
-  install_element (INTERFACE_NODE, &no_isis_passwd_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_priority_cmd);
   install_element (INTERFACE_NODE, &no_isis_priority_cmd);
-  install_element (INTERFACE_NODE, &no_isis_priority_arg_cmd);
   install_element (INTERFACE_NODE, &isis_priority_l1_cmd);
   install_element (INTERFACE_NODE, &no_isis_priority_l1_cmd);
-  install_element (INTERFACE_NODE, &no_isis_priority_l1_arg_cmd);
   install_element (INTERFACE_NODE, &isis_priority_l2_cmd);
   install_element (INTERFACE_NODE, &no_isis_priority_l2_cmd);
-  install_element (INTERFACE_NODE, &no_isis_priority_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_metric_cmd);
   install_element (INTERFACE_NODE, &no_isis_metric_cmd);
-  install_element (INTERFACE_NODE, &no_isis_metric_arg_cmd);
   install_element (INTERFACE_NODE, &isis_metric_l1_cmd);
   install_element (INTERFACE_NODE, &no_isis_metric_l1_cmd);
-  install_element (INTERFACE_NODE, &no_isis_metric_l1_arg_cmd);
   install_element (INTERFACE_NODE, &isis_metric_l2_cmd);
   install_element (INTERFACE_NODE, &no_isis_metric_l2_cmd);
-  install_element (INTERFACE_NODE, &no_isis_metric_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_hello_interval_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_interval_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_interval_arg_cmd);
   install_element (INTERFACE_NODE, &isis_hello_interval_l1_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_interval_l1_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_interval_l1_arg_cmd);
   install_element (INTERFACE_NODE, &isis_hello_interval_l2_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_interval_l2_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_interval_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_hello_multiplier_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_multiplier_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_multiplier_arg_cmd);
   install_element (INTERFACE_NODE, &isis_hello_multiplier_l1_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_multiplier_l1_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_multiplier_l1_arg_cmd);
   install_element (INTERFACE_NODE, &isis_hello_multiplier_l2_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_multiplier_l2_cmd);
-  install_element (INTERFACE_NODE, &no_isis_hello_multiplier_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &isis_hello_padding_cmd);
   install_element (INTERFACE_NODE, &no_isis_hello_padding_cmd);
 
   install_element (INTERFACE_NODE, &csnp_interval_cmd);
   install_element (INTERFACE_NODE, &no_csnp_interval_cmd);
-  install_element (INTERFACE_NODE, &no_csnp_interval_arg_cmd);
   install_element (INTERFACE_NODE, &csnp_interval_l1_cmd);
   install_element (INTERFACE_NODE, &no_csnp_interval_l1_cmd);
-  install_element (INTERFACE_NODE, &no_csnp_interval_l1_arg_cmd);
   install_element (INTERFACE_NODE, &csnp_interval_l2_cmd);
   install_element (INTERFACE_NODE, &no_csnp_interval_l2_cmd);
-  install_element (INTERFACE_NODE, &no_csnp_interval_l2_arg_cmd);
 
   install_element (INTERFACE_NODE, &psnp_interval_cmd);
   install_element (INTERFACE_NODE, &no_psnp_interval_cmd);
-  install_element (INTERFACE_NODE, &no_psnp_interval_arg_cmd);
   install_element (INTERFACE_NODE, &psnp_interval_l1_cmd);
   install_element (INTERFACE_NODE, &no_psnp_interval_l1_cmd);
-  install_element (INTERFACE_NODE, &no_psnp_interval_l1_arg_cmd);
   install_element (INTERFACE_NODE, &psnp_interval_l2_cmd);
   install_element (INTERFACE_NODE, &no_psnp_interval_l2_cmd);
-  install_element (INTERFACE_NODE, &no_psnp_interval_l2_arg_cmd);
 
   install_element (ISIS_NODE, &metric_style_cmd);
   install_element (ISIS_NODE, &no_metric_style_cmd);
@@ -2375,54 +2418,39 @@ isis_vty_init (void)
 
   install_element (ISIS_NODE, &area_lsp_mtu_cmd);
   install_element (ISIS_NODE, &no_area_lsp_mtu_cmd);
-  install_element (ISIS_NODE, &no_area_lsp_mtu_arg_cmd);
 
   install_element (ISIS_NODE, &is_type_cmd);
   install_element (ISIS_NODE, &no_is_type_cmd);
 
   install_element (ISIS_NODE, &lsp_gen_interval_cmd);
   install_element (ISIS_NODE, &no_lsp_gen_interval_cmd);
-  install_element (ISIS_NODE, &no_lsp_gen_interval_arg_cmd);
   install_element (ISIS_NODE, &lsp_gen_interval_l1_cmd);
   install_element (ISIS_NODE, &no_lsp_gen_interval_l1_cmd);
-  install_element (ISIS_NODE, &no_lsp_gen_interval_l1_arg_cmd);
   install_element (ISIS_NODE, &lsp_gen_interval_l2_cmd);
   install_element (ISIS_NODE, &no_lsp_gen_interval_l2_cmd);
-  install_element (ISIS_NODE, &no_lsp_gen_interval_l2_arg_cmd);
 
   install_element (ISIS_NODE, &spf_interval_cmd);
   install_element (ISIS_NODE, &no_spf_interval_cmd);
-  install_element (ISIS_NODE, &no_spf_interval_arg_cmd);
   install_element (ISIS_NODE, &spf_interval_l1_cmd);
   install_element (ISIS_NODE, &no_spf_interval_l1_cmd);
-  install_element (ISIS_NODE, &no_spf_interval_l1_arg_cmd);
   install_element (ISIS_NODE, &spf_interval_l2_cmd);
   install_element (ISIS_NODE, &no_spf_interval_l2_cmd);
-  install_element (ISIS_NODE, &no_spf_interval_l2_arg_cmd);
 
   install_element (ISIS_NODE, &max_lsp_lifetime_cmd);
   install_element (ISIS_NODE, &no_max_lsp_lifetime_cmd);
-  install_element (ISIS_NODE, &no_max_lsp_lifetime_arg_cmd);
   install_element (ISIS_NODE, &max_lsp_lifetime_l1_cmd);
   install_element (ISIS_NODE, &no_max_lsp_lifetime_l1_cmd);
-  install_element (ISIS_NODE, &no_max_lsp_lifetime_l1_arg_cmd);
   install_element (ISIS_NODE, &max_lsp_lifetime_l2_cmd);
   install_element (ISIS_NODE, &no_max_lsp_lifetime_l2_cmd);
-  install_element (ISIS_NODE, &no_max_lsp_lifetime_l2_arg_cmd);
 
   install_element (ISIS_NODE, &lsp_refresh_interval_cmd);
   install_element (ISIS_NODE, &no_lsp_refresh_interval_cmd);
-  install_element (ISIS_NODE, &no_lsp_refresh_interval_arg_cmd);
   install_element (ISIS_NODE, &lsp_refresh_interval_l1_cmd);
   install_element (ISIS_NODE, &no_lsp_refresh_interval_l1_cmd);
-  install_element (ISIS_NODE, &no_lsp_refresh_interval_l1_arg_cmd);
   install_element (ISIS_NODE, &lsp_refresh_interval_l2_cmd);
   install_element (ISIS_NODE, &no_lsp_refresh_interval_l2_cmd);
-  install_element (ISIS_NODE, &no_lsp_refresh_interval_l2_arg_cmd);
 
   install_element (ISIS_NODE, &area_passwd_md5_cmd);
-  install_element (ISIS_NODE, &area_passwd_md5_snpauth_cmd);
   install_element (ISIS_NODE, &area_passwd_clear_cmd);
-  install_element (ISIS_NODE, &area_passwd_clear_snpauth_cmd);
   install_element (ISIS_NODE, &no_area_passwd_cmd);
 }
index c1401ac1358482cab6009e32f7544c4d9848152c..bfee7a810bf3de7195c9d5f0f9ea57efadbcefab 100644 (file)
@@ -1978,6 +1978,14 @@ DEFUN (topology_baseis,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no topology base-is",
+ *     NO_STR
+ *     "Topology generation for IS-IS\n"
+ *     "A Network IS Base for this topology\n"
+ *
+ */
 DEFUN (no_topology_baseis,
        no_topology_baseis_cmd,
        "no topology base-is WORD",
@@ -1995,12 +2003,6 @@ DEFUN (no_topology_baseis,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_topology_baseis,
-       no_topology_baseis_noid_cmd,
-       "no topology base-is",
-       NO_STR
-       "Topology generation for IS-IS\n"
-       "A Network IS Base for this topology\n")
 
 DEFUN (topology_basedynh,
        topology_basedynh_cmd,
@@ -2418,7 +2420,6 @@ isis_init ()
   install_element (ISIS_NODE, &topology_baseis_cmd);
   install_element (ISIS_NODE, &topology_basedynh_cmd);
   install_element (ISIS_NODE, &no_topology_baseis_cmd);
-  install_element (ISIS_NODE, &no_topology_baseis_noid_cmd);
   install_element (VIEW_NODE, &show_isis_generated_topology_cmd);
   install_element (ENABLE_NODE, &show_isis_generated_topology_cmd);
 #endif /* TOPOLOGY_GENERATE */
index 680d32b03e03b94d594655bfa3b879161bf44401..b676b0c9d32711de799400bd44ca0294f95e85e4 100644 (file)
@@ -952,6 +952,12 @@ DEFUN (disable,
 }
 
 /* Down vty node level. */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "quit",
+ *     "Exit current mode and down to previous mode\n"
+ *
+ */
 DEFUN (config_exit,
        config_exit_cmd,
        "exit",
@@ -1011,10 +1017,6 @@ DEFUN (config_exit,
 }
 
 /* quit is alias of exit. */
-ALIAS (config_exit,
-       config_quit_cmd,
-       "quit",
-       "Exit current mode and down to previous mode\n")
 
 /* End of configuration. */
 DEFUN (config_end,
@@ -1124,6 +1126,18 @@ DEFUN (config_list,
 }
 
 /* Write current configuration into file. */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "copy running-config startup-config",
+ *     "Copy configuration\n"
+ *     "Copy running config to... \n"
+ *     "Copy running config to startup config (same as write file)\n"
+ *
+ * "show running-config",
+ *     SHOW_STR
+ *     "running configuration\n"
+ *
+ */
 DEFUN (config_write,
        config_write_cmd,
        "write [<file|memory|terminal>]",
@@ -1268,19 +1282,8 @@ finished:
   return ret;
 }
 
-ALIAS (config_write,
-       copy_runningconfig_startupconfig_cmd,
-       "copy running-config startup-config",
-       "Copy configuration\n"
-       "Copy running config to... \n"
-       "Copy running config to startup config (same as write file)\n")
 
 /* Write current configuration into the terminal. */
-ALIAS (config_write,
-       show_running_config_cmd,
-       "show running-config",
-       SHOW_STR
-       "running configuration\n")
 
 /* Write startup configuration into the terminal. */
 DEFUN (show_startup_config,
@@ -1352,7 +1355,8 @@ DEFUN (config_no_hostname,
 }
 
 /* VTY interface password set. */
-DEFUN (config_password, password_cmd,
+DEFUN (config_password,
+       password_cmd,
        "password [8] WORD",
        "Assign the terminal connection password\n"
        "Specifies a HIDDEN password will follow\n"
@@ -1393,7 +1397,8 @@ DEFUN (config_password, password_cmd,
 }
 
 /* VTY enable password set. */
-DEFUN (config_enable_password, enable_password_cmd,
+DEFUN (config_enable_password,
+       enable_password_cmd,
        "enable password [8] WORD",
        "Modify enable password parameters\n"
        "Assign the privileged level password\n"
@@ -1448,7 +1453,8 @@ DEFUN (config_enable_password, enable_password_cmd,
 }
 
 /* VTY enable password delete. */
-DEFUN (no_config_enable_password, no_enable_password_cmd,
+DEFUN (no_config_enable_password,
+       no_enable_password_cmd,
        "no enable password",
        NO_STR
        "Modify enable password parameters\n"
@@ -1515,7 +1521,8 @@ DEFUN (no_service_password_encrypt,
   return CMD_SUCCESS;
 }
 
-DEFUN (config_terminal_length, config_terminal_length_cmd,
+DEFUN (config_terminal_length,
+       config_terminal_length_cmd,
        "terminal length (0-512)",
        "Set terminal line parameters\n"
        "Set number of lines on a screen\n"
@@ -1535,7 +1542,8 @@ DEFUN (config_terminal_length, config_terminal_length_cmd,
   return CMD_SUCCESS;
 }
 
-DEFUN (config_terminal_no_length, config_terminal_no_length_cmd,
+DEFUN (config_terminal_no_length,
+       config_terminal_no_length_cmd,
        "terminal no length",
        "Set terminal line parameters\n"
        NO_STR
@@ -1545,7 +1553,8 @@ DEFUN (config_terminal_no_length, config_terminal_no_length_cmd,
   return CMD_SUCCESS;
 }
 
-DEFUN (service_terminal_length, service_terminal_length_cmd,
+DEFUN (service_terminal_length,
+       service_terminal_length_cmd,
        "service terminal-length (0-512)",
        "Set up miscellaneous service\n"
        "System wide terminal length configuration\n"
@@ -1565,7 +1574,8 @@ DEFUN (service_terminal_length, service_terminal_length_cmd,
   return CMD_SUCCESS;
 }
 
-DEFUN (no_service_terminal_length, no_service_terminal_length_cmd,
+DEFUN (no_service_terminal_length,
+       no_service_terminal_length_cmd,
        "no service terminal-length [(0-512)]",
        NO_STR
        "Set up miscellaneous service\n"
@@ -2085,13 +2095,11 @@ void
 install_default (enum node_type node)
 {
   install_element (node, &config_exit_cmd);
-  install_element (node, &config_quit_cmd);
   install_element (node, &config_end_cmd);
   install_element (node, &config_help_cmd);
   install_element (node, &config_list_cmd);
 
   install_element (node, &config_write_cmd);
-  install_element (node, &show_running_config_cmd);
 }
 
 /* Initialize command interface. Install basic nodes and commands. */
@@ -2125,7 +2133,6 @@ cmd_init (int terminal)
     {
       install_element (VIEW_NODE, &config_list_cmd);
       install_element (VIEW_NODE, &config_exit_cmd);
-      install_element (VIEW_NODE, &config_quit_cmd);
       install_element (VIEW_NODE, &config_help_cmd);
       install_element (VIEW_NODE, &config_enable_cmd);
       install_element (VIEW_NODE, &config_terminal_length_cmd);
@@ -2136,7 +2143,6 @@ cmd_init (int terminal)
 
       install_element (RESTRICTED_NODE, &config_list_cmd);
       install_element (RESTRICTED_NODE, &config_exit_cmd);
-      install_element (RESTRICTED_NODE, &config_quit_cmd);
       install_element (RESTRICTED_NODE, &config_help_cmd);
       install_element (RESTRICTED_NODE, &config_enable_cmd);
       install_element (RESTRICTED_NODE, &config_terminal_length_cmd);
@@ -2149,7 +2155,6 @@ cmd_init (int terminal)
       install_default (ENABLE_NODE);
       install_element (ENABLE_NODE, &config_disable_cmd);
       install_element (ENABLE_NODE, &config_terminal_cmd);
-      install_element (ENABLE_NODE, &copy_runningconfig_startupconfig_cmd);
     }
   install_element (ENABLE_NODE, &show_startup_config_cmd);
   install_element (ENABLE_NODE, &show_version_cmd);
index 33801ca11c0df238012dc83f9a4e4ee86eec4741..dee752f220f6e75cc1159ccd9e4769e4ad10655f 100644 (file)
@@ -1381,6 +1381,20 @@ DEFUN (access_list_remark,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark .LINE",
+ *     NO_STR
+ *     "Add an access list entry\n"
+ *     "IP standard access list\n"
+ *     "IP extended access list\n"
+ *     "IP standard access list (expanded range)\n"
+ *     "IP extended access list (expanded range)\n"
+ *     "IP zebra access-list\n"
+ *     "Access list entry comment\n"
+ *     "Comment up to 100 characters\n"
+ *
+ */
 DEFUN (no_access_list_remark,
        no_access_list_remark_cmd,
        "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark",
@@ -1396,18 +1410,6 @@ DEFUN (no_access_list_remark,
   return vty_access_list_remark_unset (vty, AFI_IP, argv[2]->arg);
 }
        
-ALIAS (no_access_list_remark,
-       no_access_list_remark_arg_cmd,
-       "no access-list (<1-99>|<100-199>|<1300-1999>|<2000-2699>|WORD) remark .LINE",
-       NO_STR
-       "Add an access list entry\n"
-       "IP standard access list\n"
-       "IP extended access list\n"
-       "IP standard access list (expanded range)\n"
-       "IP extended access list (expanded range)\n"
-       "IP zebra access-list\n"
-       "Access list entry comment\n"
-       "Comment up to 100 characters\n")
 
 #ifdef HAVE_IPV6
 DEFUN (ipv6_access_list,
@@ -1550,6 +1552,17 @@ DEFUN (ipv6_access_list_remark,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 access-list WORD remark .LINE",
+ *     NO_STR
+ *     IPV6_STR
+ *     "Add an access list entry\n"
+ *     "IPv6 zebra access-list\n"
+ *     "Access list entry comment\n"
+ *     "Comment up to 100 characters\n"
+ *
+ */
 DEFUN (no_ipv6_access_list_remark,
        no_ipv6_access_list_remark_cmd,
        "no ipv6 access-list WORD remark",
@@ -1562,15 +1575,6 @@ DEFUN (no_ipv6_access_list_remark,
   return vty_access_list_remark_unset (vty, AFI_IP6, argv[3]->arg);
 }
        
-ALIAS (no_ipv6_access_list_remark,
-       no_ipv6_access_list_remark_arg_cmd,
-       "no ipv6 access-list WORD remark .LINE",
-       NO_STR
-       IPV6_STR
-       "Add an access list entry\n"
-       "IPv6 zebra access-list\n"
-       "Access list entry comment\n"
-       "Comment up to 100 characters\n")
 #endif /* HAVE_IPV6 */
 
 void config_write_access_zebra (struct vty *, struct filter *);
@@ -1958,7 +1962,6 @@ access_list_init_ipv4 (void)
   install_element (CONFIG_NODE, &access_list_remark_cmd);
   install_element (CONFIG_NODE, &no_access_list_all_cmd);
   install_element (CONFIG_NODE, &no_access_list_remark_cmd);
-  install_element (CONFIG_NODE, &no_access_list_remark_arg_cmd);
 }
 
 #ifdef HAVE_IPV6
@@ -2022,7 +2025,6 @@ access_list_init_ipv6 (void)
   install_element (CONFIG_NODE, &no_ipv6_access_list_all_cmd);
   install_element (CONFIG_NODE, &ipv6_access_list_remark_cmd);
   install_element (CONFIG_NODE, &no_ipv6_access_list_remark_cmd);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_remark_arg_cmd);
 }
 #endif /* HAVE_IPV6 */
 
index 0e1199f21a92afe4d2e088fe2db3e54b4c1137b9..240a03cab4ddce8f1f04c5d793a0fe51b20ac707 100644 (file)
@@ -209,6 +209,16 @@ if_rmap_unset (const char *ifname, enum if_rmap_type type,
   return 1;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "route-map RMAP_NAME (in|out) IFNAME",
+ *     "Route map set\n"
+ *     "Route map name\n"
+ *     "Route map set for input filtering\n"
+ *     "Route map set for output filtering\n"
+ *     "Route map interface name\n"
+ *
+ */
 DEFUN (if_rmap,
        if_rmap_cmd,
        "route-map RMAP_NAME (in|out) IFNAME",
@@ -235,15 +245,18 @@ DEFUN (if_rmap,
   return CMD_SUCCESS;
 }      
 
-ALIAS (if_rmap,
-       if_ipv6_rmap_cmd,
-       "route-map RMAP_NAME (in|out) IFNAME",
-       "Route map set\n"
-       "Route map name\n"
-       "Route map set for input filtering\n"
-       "Route map set for output filtering\n"
-       "Route map interface name\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no route-map ROUTEMAP_NAME (in|out) IFNAME",
+ *     NO_STR
+ *     "Route map unset\n"
+ *     "Route map name\n"
+ *     "Route map for input filtering\n"
+ *     "Route map for output filtering\n"
+ *     "Route map interface name\n"
+ *
+ */
 DEFUN (no_if_rmap,
        no_if_rmap_cmd,
        "no route-map ROUTEMAP_NAME (in|out) IFNAME",
@@ -276,15 +289,6 @@ DEFUN (no_if_rmap,
   return CMD_SUCCESS;
 }      
 
-ALIAS (no_if_rmap,
-       no_if_ipv6_rmap_cmd,
-       "no route-map ROUTEMAP_NAME (in|out) IFNAME",
-       NO_STR
-       "Route map unset\n"
-       "Route map name\n"
-       "Route map for input filtering\n"
-       "Route map for output filtering\n"
-       "Route map interface name\n")
 
 /* Configuration write function. */
 int
@@ -333,8 +337,6 @@ if_rmap_init (int node)
 {
   ifrmaphash = hash_create (if_rmap_hash_make, if_rmap_hash_cmp);
   if (node == RIPNG_NODE) {
-    install_element (RIPNG_NODE, &if_ipv6_rmap_cmd);
-    install_element (RIPNG_NODE, &no_if_ipv6_rmap_cmd);
   } else if (node == RIP_NODE) {
     install_element (RIP_NODE, &if_rmap_cmd);
     install_element (RIP_NODE, &no_if_rmap_cmd);
index 3de92887bf9f69e1464b490880c9c1ef38ddd77e..d874e1d0245a3749692623d2a3856fd31bcb3597 100644 (file)
@@ -1824,6 +1824,17 @@ DEFUN (ip_prefix_list_description,
   return CMD_SUCCESS;
 }       
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip prefix-list WORD description .LINE",
+ *     NO_STR
+ *     IP_STR
+ *     PREFIX_LIST_STR
+ *     "Name of a prefix list\n"
+ *     "Prefix-list specific description\n"
+ *     "Up to 80 characters describing this prefix-list\n"
+ *
+ */
 DEFUN (no_ip_prefix_list_description,
        no_ip_prefix_list_description_cmd,
        "no ip prefix-list WORD description",
@@ -1836,15 +1847,6 @@ DEFUN (no_ip_prefix_list_description,
   return vty_prefix_list_desc_unset (vty, AFI_IP, argv[3]->arg);
 }
 
-ALIAS (no_ip_prefix_list_description,
-       no_ip_prefix_list_description_arg_cmd,
-       "no ip prefix-list WORD description .LINE",
-       NO_STR
-       IP_STR
-       PREFIX_LIST_STR
-       "Name of a prefix list\n"
-       "Prefix-list specific description\n"
-       "Up to 80 characters describing this prefix-list\n")
 
 DEFUN (show_ip_prefix_list,
        show_ip_prefix_list_cmd,
@@ -2420,6 +2422,17 @@ DEFUN (ipv6_prefix_list_description,
   return CMD_SUCCESS;
 }       
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 prefix-list WORD description .LINE",
+ *     NO_STR
+ *     IPV6_STR
+ *     PREFIX_LIST_STR
+ *     "Name of a prefix list\n"
+ *     "Prefix-list specific description\n"
+ *     "Up to 80 characters describing this prefix-list\n"
+ *
+ */
 DEFUN (no_ipv6_prefix_list_description,
        no_ipv6_prefix_list_description_cmd,
        "no ipv6 prefix-list WORD description",
@@ -2432,15 +2445,6 @@ DEFUN (no_ipv6_prefix_list_description,
   return vty_prefix_list_desc_unset (vty, AFI_IP6, argv[3]->arg);
 }
 
-ALIAS (no_ipv6_prefix_list_description,
-       no_ipv6_prefix_list_description_arg_cmd,
-       "no ipv6 prefix-list WORD description .LINE",
-       NO_STR
-       IPV6_STR
-       PREFIX_LIST_STR
-       "Name of a prefix list\n"
-       "Prefix-list specific description\n"
-       "Up to 80 characters describing this prefix-list\n")
 
 DEFUN (show_ipv6_prefix_list,
        show_ipv6_prefix_list_cmd,
@@ -2946,7 +2950,6 @@ prefix_list_init_ipv4 (void)
 
   install_element (CONFIG_NODE, &ip_prefix_list_description_cmd);
   install_element (CONFIG_NODE, &no_ip_prefix_list_description_cmd);
-  install_element (CONFIG_NODE, &no_ip_prefix_list_description_arg_cmd);
 
   install_element (CONFIG_NODE, &ip_prefix_list_sequence_number_cmd);
   install_element (CONFIG_NODE, &no_ip_prefix_list_sequence_number_cmd);
@@ -3023,7 +3026,6 @@ prefix_list_init_ipv6 (void)
 
   install_element (CONFIG_NODE, &ipv6_prefix_list_description_cmd);
   install_element (CONFIG_NODE, &no_ipv6_prefix_list_description_cmd);
-  install_element (CONFIG_NODE, &no_ipv6_prefix_list_description_arg_cmd);
 
   install_element (CONFIG_NODE, &ipv6_prefix_list_sequence_number_cmd);
   install_element (CONFIG_NODE, &no_ipv6_prefix_list_sequence_number_cmd);
index 2d7a8be661ee2b0ef8b4973ea2159ab9be3511ec..f89d078028600d38791fc66cf053628a6d966452 100644 (file)
@@ -1530,6 +1530,16 @@ DEFUN (no_rmap_onmatch_next,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "continue",
+ *     "Continue on a different entry within the route-map\n"
+ *
+ * "continue (1-65535)",
+ *     "Continue on a different entry within the route-map\n"
+ *     "Route-map entry sequence number\n"
+ *
+ */
 DEFUN (rmap_onmatch_goto,
        rmap_onmatch_goto_cmd,
        "on-match goto (1-65535)",
@@ -1578,6 +1588,18 @@ DEFUN (rmap_onmatch_goto,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no continue",
+ *     NO_STR
+ *     "Continue on a different entry within the route-map\n"
+ *
+ * "no continue (1-65535)",
+ *     NO_STR
+ *     "Continue on a different entry within the route-map\n"
+ *     "Route-map entry sequence number\n"
+ *
+ */
 DEFUN (no_rmap_onmatch_goto,
        no_rmap_onmatch_goto_cmd,
        "no on-match goto",
@@ -1596,30 +1618,10 @@ DEFUN (no_rmap_onmatch_goto,
 }
 
 /* Cisco/GNU Zebra compatible ALIASes for on-match next */
-ALIAS (rmap_onmatch_goto,
-       rmap_continue_cmd,
-       "continue",
-       "Continue on a different entry within the route-map\n")
-
-ALIAS (no_rmap_onmatch_goto,
-       no_rmap_continue_cmd,
-       "no continue",
-       NO_STR
-       "Continue on a different entry within the route-map\n")
+
 
 /* GNU Zebra compatible */
-ALIAS (rmap_onmatch_goto,
-       rmap_continue_seq_cmd,
-       "continue (1-65535)",
-       "Continue on a different entry within the route-map\n"
-       "Route-map entry sequence number\n")
-
-ALIAS (no_rmap_onmatch_goto,
-       no_rmap_continue_seq,
-       "no continue (1-65535)",
-       NO_STR
-       "Continue on a different entry within the route-map\n"
-       "Route-map entry sequence number\n")
+
 
 DEFUN (rmap_show_name,
        rmap_show_name_cmd,
@@ -1809,8 +1811,6 @@ route_map_init_vty (void)
   install_element (RMAP_NODE, &no_rmap_onmatch_goto_cmd);
   
   /* Install the continue stuff (ALIAS of on-match). */
-  install_element (RMAP_NODE, &rmap_continue_cmd);
-  install_element (RMAP_NODE, &no_rmap_continue_cmd);
   
   /* Install the call stuff. */
   install_element (RMAP_NODE, &rmap_call_cmd);
index a106d5d24d32995c252b457d8e224b52ca7cfe38..2ecd1d5e0f9b964ce5275cb316b45a96ecddc5bd 100644 (file)
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2923,6 +2923,14 @@ DEFUN (terminal_monitor,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no terminal monitor",
+ *     NO_STR
+ *     "Set terminal line parameters\n"
+ *     "Copy debug output to the current terminal line\n"
+ *
+ */
 DEFUN (terminal_no_monitor,
        terminal_no_monitor_cmd,
        "terminal no monitor",
@@ -2934,12 +2942,6 @@ DEFUN (terminal_no_monitor,
   return CMD_SUCCESS;
 }
 
-ALIAS (terminal_no_monitor,
-       no_terminal_monitor_cmd,
-       "no terminal monitor",
-       NO_STR
-       "Set terminal line parameters\n"
-       "Copy debug output to the current terminal line\n")
 
 DEFUN (show_history,
        show_history_cmd,
@@ -3149,7 +3151,6 @@ vty_init (struct thread_master *master_thread)
   install_element (CONFIG_NODE, &log_commands_cmd);
   install_element (ENABLE_NODE, &terminal_monitor_cmd);
   install_element (ENABLE_NODE, &terminal_no_monitor_cmd);
-  install_element (ENABLE_NODE, &no_terminal_monitor_cmd);
   install_element (ENABLE_NODE, &show_history_cmd);
 
   install_default (VTY_NODE);
index cd11cd2a89ea334d2a557c2557a9300b7e47c9dc..4863342ef19f8c1eb4058a887b5fe42e9272bd55 100644 (file)
@@ -433,6 +433,32 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
   oa = ospf6_area_get (area_id, ospf6);                    \
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "area (A.B.C.D|<0-4294967295>) range X:X::X:X/M advertise cost <0-16777215>",
+ *     "OSPF area parameters\n"
+ *     OSPF6_AREA_ID_STR
+ *     "Summarize routes matching address/mask (border routers only)\n"
+ *     "Area range prefix\n"
+ *     "User specified metric for this range\n"
+ *     "Advertised metric for this range\n"
+ *
+ * "area A.B.C.D range X:X::X:X/M (advertise|not-advertise)",
+ *     "OSPF area parameters\n"
+ *     OSPF6_AREA_ID_STR
+ *     "Configured address range\n"
+ *     "Specify IPv6 prefix\n"
+ *     
+ *
+ * "area (A.B.C.D|<0-4294967295>) range X:X::X:X/M cost <0-16777215>",
+ *     "OSPF area parameters\n"
+ *     OSPF6_AREA_ID_STR
+ *     "Summarize routes matching address/mask (border routers only)\n"
+ *     "Area range prefix\n"
+ *     "User specified metric for this range\n"
+ *     "Advertised metric for this range\n"
+ *
+ */
 DEFUN (area_range,
        area_range_cmd,
        "area A.B.C.D range X:X::X:X/M",
@@ -503,35 +529,37 @@ DEFUN (area_range,
   return CMD_SUCCESS;
 }
 
-ALIAS (area_range,
-       area_range_advertise_cmd,
-       "area A.B.C.D range X:X::X:X/M (advertise|not-advertise)",
-       "OSPF area parameters\n"
-       OSPF6_AREA_ID_STR
-       "Configured address range\n"
-       "Specify IPv6 prefix\n"
-       )
 
-ALIAS (area_range,
-       area_range_cost_cmd,
-       "area (A.B.C.D|<0-4294967295>) range X:X::X:X/M cost <0-16777215>",
-       "OSPF area parameters\n"
-       OSPF6_AREA_ID_STR
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
-
-ALIAS (area_range,
-       area_range_advertise_cost_cmd,
-       "area (A.B.C.D|<0-4294967295>) range X:X::X:X/M advertise cost <0-16777215>",
-       "OSPF area parameters\n"
-       OSPF6_AREA_ID_STR
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
 
+
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no area (A.B.C.D|<0-4294967295>) range X:X::X:X/M advertise cost <0-16777215>",
+ *     NO_STR
+ *     "OSPF area parameters\n"
+ *     OSPF6_AREA_ID_STR
+ *     "Summarize routes matching address/mask (border routers only)\n"
+ *     "Area range prefix\n"
+ *     "User specified metric for this range\n"
+ *     "Advertised metric for this range\n"
+ *
+ * "no area A.B.C.D range X:X::X:X/M (advertise|not-advertise)",
+ *     NO_STR
+ *     "OSPF area parameters\n"
+ *     OSPF6_AREA_ID_STR
+ *     "Configured address range\n"
+ *     "Specify IPv6 prefix\n"
+ *
+ * "no area (A.B.C.D|<0-4294967295>) range X:X::X:X/M cost <0-16777215>",
+ *     NO_STR
+ *     "OSPF area parameters\n"
+ *     OSPF6_AREA_ID_STR
+ *     "Summarize routes matching address/mask (border routers only)\n"
+ *     "Area range prefix\n"
+ *     "User specified metric for this range\n"
+ *     "Advertised metric for this range\n"
+ *
+ */
 DEFUN (no_area_range,
        no_area_range_cmd,
        "no area A.B.C.D range X:X::X:X/M",
@@ -584,36 +612,8 @@ DEFUN (no_area_range,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_area_range,
-       no_area_range_advertise_cmd,
-       "no area A.B.C.D range X:X::X:X/M (advertise|not-advertise)",
-       NO_STR
-       "OSPF area parameters\n"
-       OSPF6_AREA_ID_STR
-       "Configured address range\n"
-       "Specify IPv6 prefix\n")
 
-ALIAS (no_area_range,
-       no_area_range_cost_cmd,
-       "no area (A.B.C.D|<0-4294967295>) range X:X::X:X/M cost <0-16777215>",
-       NO_STR
-       "OSPF area parameters\n"
-       OSPF6_AREA_ID_STR
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
-
-ALIAS (no_area_range,
-       no_area_range_advertise_cost_cmd,
-       "no area (A.B.C.D|<0-4294967295>) range X:X::X:X/M advertise cost <0-16777215>",
-       NO_STR
-       "OSPF area parameters\n"
-       OSPF6_AREA_ID_STR
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
+
 
 void
 ospf6_area_config_write (struct vty *vty)
@@ -1094,13 +1094,7 @@ ospf6_area_init (void)
   install_element (ENABLE_NODE, &show_ipv6_ospf6_simulate_spf_tree_root_cmd);
 
   install_element (OSPF6_NODE, &area_range_cmd);
-  install_element (OSPF6_NODE, &area_range_advertise_cmd);
-  install_element (OSPF6_NODE, &area_range_cost_cmd);
-  install_element (OSPF6_NODE, &area_range_advertise_cost_cmd);
   install_element (OSPF6_NODE, &no_area_range_cmd);
-  install_element (OSPF6_NODE, &no_area_range_advertise_cmd);
-  install_element (OSPF6_NODE, &no_area_range_cost_cmd);
-  install_element (OSPF6_NODE, &no_area_range_advertise_cost_cmd);
   install_element (OSPF6_NODE, &ospf6_area_stub_no_summary_cmd);
   install_element (OSPF6_NODE, &ospf6_area_stub_cmd);
   install_element (OSPF6_NODE, &no_ospf6_area_stub_no_summary_cmd);
index f513e68f703e3aca1db6b9b1db0f882173a3dafd..696f18f030901d2bce9fb4b5456f10fe439378f8 100644 (file)
@@ -679,6 +679,16 @@ DEFUN (ospf6_redistribute_routemap,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no redistribute " QUAGGA_REDIST_STR_OSPF6D " route-map WORD",
+ *     NO_STR
+ *     "Redistribute\n"
+ *     QUAGGA_REDIST_HELP_STR_OSPF6D
+ *     "Route map reference\n"
+ *     "Route map name\n"
+ *
+ */
 DEFUN (no_ospf6_redistribute,
        no_ospf6_redistribute_cmd,
        "no redistribute " QUAGGA_REDIST_STR_OSPF6D,
@@ -698,14 +708,6 @@ DEFUN (no_ospf6_redistribute,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf6_redistribute,
-       no_ospf6_redistribute_route_map_cmd,
-       "no redistribute " QUAGGA_REDIST_STR_OSPF6D " route-map WORD",
-       NO_STR
-       "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_OSPF6D
-       "Route map reference\n"
-       "Route map name\n")
 
 int
 ospf6_redistribute_config_write (struct vty *vty)
@@ -1051,6 +1053,15 @@ DEFUN (ospf6_routemap_match_interface,
 }
 
 /* "no match interface WORD" */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match interface WORD",
+ *     MATCH_STR
+ *     NO_STR
+ *     "Match first hop interface of route\n"
+ *     "Interface name\n"
+ *
+ */
 DEFUN (ospf6_routemap_no_match_interface,
        ospf6_routemap_no_match_interface_cmd,
        "no match interface",
@@ -1063,13 +1074,6 @@ DEFUN (ospf6_routemap_no_match_interface,
   return route_map_command_status (vty, ret);
 }
 
-ALIAS (ospf6_routemap_no_match_interface,
-       ospf6_routemap_no_match_interface_val_cmd,
-       "no match interface WORD",
-       MATCH_STR
-       NO_STR
-       "Match first hop interface of route\n"
-       "Interface name\n")
 
 /* add "set metric-type" */
 DEFUN (ospf6_routemap_set_metric_type,
@@ -1114,6 +1118,15 @@ DEFUN (set_metric,
 }
 
 /* delete "set metric" */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set metric <0-4294967295>",
+ *     NO_STR
+ *     SET_STR
+ *     "Metric value for destination routing protocol\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_set_metric,
        no_set_metric_cmd,
        "no set metric",
@@ -1132,13 +1145,6 @@ DEFUN (no_set_metric,
   return route_map_command_status (vty, ret);
 }
 
-ALIAS (no_set_metric,
-       no_set_metric_val_cmd,
-       "no set metric <0-4294967295>",
-       NO_STR
-       SET_STR
-       "Metric value for destination routing protocol\n"
-       "Metric value\n")
 
 /* add "set forwarding-address" */
 DEFUN (ospf6_routemap_set_forwarding,
@@ -1189,7 +1195,6 @@ ospf6_routemap_init (void)
   /* Match interface */
   install_element (RMAP_NODE, &ospf6_routemap_match_interface_cmd);
   install_element (RMAP_NODE, &ospf6_routemap_no_match_interface_cmd);
-  install_element (RMAP_NODE, &ospf6_routemap_no_match_interface_val_cmd);
 
   /* ASE Metric Type (e.g. Type-1/Type-2) */
   install_element (RMAP_NODE, &ospf6_routemap_set_metric_type_cmd);
@@ -1198,7 +1203,6 @@ ospf6_routemap_init (void)
   /* ASE Metric */
   install_element (RMAP_NODE, &set_metric_cmd);
   install_element (RMAP_NODE, &no_set_metric_cmd);
-  install_element (RMAP_NODE, &no_set_metric_val_cmd);
 
   /* ASE Metric */
   install_element (RMAP_NODE, &ospf6_routemap_set_forwarding_cmd);
@@ -1351,7 +1355,6 @@ ospf6_asbr_init (void)
   install_element (OSPF6_NODE, &ospf6_redistribute_cmd);
   install_element (OSPF6_NODE, &ospf6_redistribute_routemap_cmd);
   install_element (OSPF6_NODE, &no_ospf6_redistribute_cmd);
-  install_element (OSPF6_NODE, &no_ospf6_redistribute_route_map_cmd);
 }
 
 void
@@ -1408,12 +1411,3 @@ config_write_ospf6_debug_asbr (struct vty *vty)
 }
 
 void
-install_element_ospf6_debug_asbr ()
-{
-  install_element (ENABLE_NODE, &debug_ospf6_asbr_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf6_asbr_cmd);
-  install_element (CONFIG_NODE, &debug_ospf6_asbr_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf6_asbr_cmd);
-}
-
-
index e53fb218008271093dda231dd0c3a54a4250081a..66cc59bc32d1fc9c4d4eeb4b325d760264d2cbb6 100644 (file)
@@ -986,6 +986,16 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
 }
 
 /* show interface */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 interface",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     INTERFACE_STR
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_interface,
        show_ipv6_ospf6_interface_ifname_cmd,
        "show ipv6 ospf6 interface IFNAME",
@@ -1019,15 +1029,34 @@ DEFUN (show_ipv6_ospf6_interface,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_interface,
-       show_ipv6_ospf6_interface_cmd,
-       "show ipv6 ospf6 interface",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 interface IFNAME prefix (X:X::X:X|X:X::X:X/M|detail)",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     INTERFACE_STR
+ *     IFNAME_STR
+ *     "Display connected prefixes to advertise\n"
+ *     OSPF6_ROUTE_ADDRESS_STR
+ *     OSPF6_ROUTE_PREFIX_STR
+ *     "Display details of the prefixes\n"
+ *     
+ *
+ * "show ipv6 ospf6 interface IFNAME prefix X:X::X:X/M (match|detail)",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     INTERFACE_STR
+ *     IFNAME_STR
+ *     "Display connected prefixes to advertise\n"
+ *     OSPF6_ROUTE_PREFIX_STR
+ *     OSPF6_ROUTE_MATCH_STR
+ *     "Display details of the prefixes\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_interface_ifname_prefix,
        show_ipv6_ospf6_interface_ifname_prefix_cmd,
        "show ipv6 ospf6 interface IFNAME prefix",
@@ -1063,34 +1092,33 @@ DEFUN (show_ipv6_ospf6_interface_ifname_prefix,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_interface_ifname_prefix,
-       show_ipv6_ospf6_interface_ifname_prefix_detail_cmd,
-       "show ipv6 ospf6 interface IFNAME prefix (X:X::X:X|X:X::X:X/M|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       IFNAME_STR
-       "Display connected prefixes to advertise\n"
-       OSPF6_ROUTE_ADDRESS_STR
-       OSPF6_ROUTE_PREFIX_STR
-       "Display details of the prefixes\n"
-       )
 
-ALIAS (show_ipv6_ospf6_interface_ifname_prefix,
-       show_ipv6_ospf6_interface_ifname_prefix_match_cmd,
-       "show ipv6 ospf6 interface IFNAME prefix X:X::X:X/M (match|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       IFNAME_STR
-       "Display connected prefixes to advertise\n"
-       OSPF6_ROUTE_PREFIX_STR
-       OSPF6_ROUTE_MATCH_STR
-       "Display details of the prefixes\n"
-       )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 interface prefix X:X::X:X/M (match|detail)",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     INTERFACE_STR
+ *     "Display connected prefixes to advertise\n"
+ *     OSPF6_ROUTE_PREFIX_STR
+ *     OSPF6_ROUTE_MATCH_STR
+ *     "Display details of the prefixes\n"
+ *     
+ *
+ * "show ipv6 ospf6 interface prefix (X:X::X:X|X:X::X:X/M|detail)",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     INTERFACE_STR
+ *     "Display connected prefixes to advertise\n"
+ *     OSPF6_ROUTE_ADDRESS_STR
+ *     OSPF6_ROUTE_PREFIX_STR
+ *     "Display details of the prefixes\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_interface_prefix,
        show_ipv6_ospf6_interface_prefix_cmd,
        "show ipv6 ospf6 interface prefix",
@@ -1117,31 +1145,7 @@ DEFUN (show_ipv6_ospf6_interface_prefix,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_interface_prefix,
-       show_ipv6_ospf6_interface_prefix_detail_cmd,
-       "show ipv6 ospf6 interface prefix (X:X::X:X|X:X::X:X/M|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       "Display connected prefixes to advertise\n"
-       OSPF6_ROUTE_ADDRESS_STR
-       OSPF6_ROUTE_PREFIX_STR
-       "Display details of the prefixes\n"
-       )
 
-ALIAS (show_ipv6_ospf6_interface_prefix,
-       show_ipv6_ospf6_interface_prefix_match_cmd,
-       "show ipv6 ospf6 interface prefix X:X::X:X/M (match|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       "Display connected prefixes to advertise\n"
-       OSPF6_ROUTE_PREFIX_STR
-       OSPF6_ROUTE_MATCH_STR
-       "Display details of the prefixes\n"
-       )
 
 
 /* interface variable set command */
@@ -1352,6 +1356,15 @@ DEFUN (auto_cost_reference_bandwidth,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no auto-cost reference-bandwidth <1-4294967>",
+ *     NO_STR
+ *     "Calculate OSPF interface cost according to bandwidth\n"
+ *     "Use reference bandwidth method to assign OSPF cost\n"
+ *     "The reference bandwidth in terms of Mbits per second\n"
+ *
+ */
 DEFUN (no_auto_cost_reference_bandwidth,
        no_auto_cost_reference_bandwidth_cmd,
        "no auto-cost reference-bandwidth",
@@ -1375,13 +1388,6 @@ DEFUN (no_auto_cost_reference_bandwidth,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_auto_cost_reference_bandwidth,
-       no_auto_cost_reference_bandwidth_val_cmd,
-       "no auto-cost reference-bandwidth <1-4294967>",
-       NO_STR
-       "Calculate OSPF interface cost according to bandwidth\n"
-       "Use reference bandwidth method to assign OSPF cost\n"
-       "The reference bandwidth in terms of Mbits per second\n")
 
 DEFUN (ipv6_ospf6_hellointerval,
        ipv6_ospf6_hellointerval_cmd,
@@ -1899,22 +1905,12 @@ ospf6_interface_init (void)
   /* Install interface node. */
   install_node (&interface_node, config_write_ospf6_interface);
 
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_interface_prefix_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_prefix_detail_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_prefix_match_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_detail_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_match_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_cmd);
   install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_prefix_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_prefix_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_prefix_match_cmd);
   install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_cmd);
   install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_prefix_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_prefix_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_prefix_match_cmd);
 
   install_element (CONFIG_NODE, &interface_cmd);
   install_default (INTERFACE_NODE);
@@ -1946,7 +1942,6 @@ ospf6_interface_init (void)
   /* reference bandwidth commands */
   install_element (OSPF6_NODE, &auto_cost_reference_bandwidth_cmd);
   install_element (OSPF6_NODE, &no_auto_cost_reference_bandwidth_cmd);
-  install_element (OSPF6_NODE, &no_auto_cost_reference_bandwidth_val_cmd);
 }
 
 /* Clear the specified interface structure */
index fbc72d6fe72eeee61c2ab858c3b46c4fb6b277fb..d58ab567b3e23f6226b67aaf6300fd1351798191 100644 (file)
@@ -816,6 +816,16 @@ ospf6_lsa_handler_name (struct ospf6_lsa_handler *h)
   return buf;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf6 lsa (router|network|inter-prefix|inter-router|as-external|link|intra-prefix|unknown) (originate|examine|flooding)",
+ *     DEBUG_STR
+ *     OSPF6_STR
+ *     "Debug Link State Advertisements (LSAs)\n"
+ *     "Specify LS type as Hexadecimal\n"
+ *     
+ *
+ */
 DEFUN (debug_ospf6_lsa_type,
        debug_ospf6_lsa_hex_cmd,
        "debug ospf6 lsa (router|network|inter-prefix|inter-router|as-external|link|intra-prefix|unknown)",
@@ -860,15 +870,18 @@ DEFUN (debug_ospf6_lsa_type,
   return CMD_SUCCESS;
 }
 
-ALIAS (debug_ospf6_lsa_type,
-       debug_ospf6_lsa_hex_detail_cmd,
-       "debug ospf6 lsa (router|network|inter-prefix|inter-router|as-external|link|intra-prefix|unknown) (originate|examine|flooding)",
-       DEBUG_STR
-       OSPF6_STR
-       "Debug Link State Advertisements (LSAs)\n"
-       "Specify LS type as Hexadecimal\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf6 lsa (router|network|inter-prefix|inter-router|as-external|link|intra-prefix) (originate|examine|flooding)",
+ *     NO_STR
+ *     DEBUG_STR
+ *     OSPF6_STR
+ *     "Debug Link State Advertisements (LSAs)\n"
+ *     "Specify LS type as Hexadecimal\n"
+ *     
+ *
+ */
 DEFUN (no_debug_ospf6_lsa_type,
        no_debug_ospf6_lsa_hex_cmd,
        "no debug ospf6 lsa (router|network|inter-prefix|inter-router|as-external|link|intra-prefix|unknown)",
@@ -913,27 +926,14 @@ DEFUN (no_debug_ospf6_lsa_type,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_ospf6_lsa_type,
-       no_debug_ospf6_lsa_hex_detail_cmd,
-       "no debug ospf6 lsa (router|network|inter-prefix|inter-router|as-external|link|intra-prefix) (originate|examine|flooding)",
-       NO_STR
-       DEBUG_STR
-       OSPF6_STR
-       "Debug Link State Advertisements (LSAs)\n"
-       "Specify LS type as Hexadecimal\n"
-      )
 
 void
 install_element_ospf6_debug_lsa (void)
 {
   install_element (ENABLE_NODE, &debug_ospf6_lsa_hex_cmd);
-  install_element (ENABLE_NODE, &debug_ospf6_lsa_hex_detail_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf6_lsa_hex_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf6_lsa_hex_detail_cmd);
   install_element (CONFIG_NODE, &debug_ospf6_lsa_hex_cmd);
-  install_element (CONFIG_NODE, &debug_ospf6_lsa_hex_detail_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf6_lsa_hex_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf6_lsa_hex_detail_cmd);
 }
 
 int
index adaef2f9f342b906c268f9aff5eca35080d4a608..e8f4990c9d48e4afc83f93464e2f783b54aad50f 100644 (file)
@@ -2338,6 +2338,24 @@ ospf6_lsack_send_interface (struct thread *thread)
 
 
 /* Commands */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf6 message (unknown|hello|dbdesc|lsreq|lsupdate|lsack|all) (send|recv)",
+ *     DEBUG_STR
+ *     OSPF6_STR
+ *     "Debug OSPFv3 message\n"
+ *     "Debug Unknown message\n"
+ *     "Debug Hello message\n"
+ *     "Debug Database Description message\n"
+ *     "Debug Link State Request message\n"
+ *     "Debug Link State Update message\n"
+ *     "Debug Link State Acknowledgement message\n"
+ *     "Debug All message\n"
+ *     "Debug only sending message\n"
+ *     "Debug only receiving message\n"
+ *     
+ *
+ */
 DEFUN (debug_ospf6_message,
        debug_ospf6_message_cmd,
        "debug ospf6 message (unknown|hello|dbdesc|lsreq|lsupdate|lsack|all)",
@@ -2393,24 +2411,28 @@ DEFUN (debug_ospf6_message,
   return CMD_SUCCESS;
 }
 
-ALIAS (debug_ospf6_message,
-       debug_ospf6_message_sendrecv_cmd,
-       "debug ospf6 message (unknown|hello|dbdesc|lsreq|lsupdate|lsack|all) (send|recv)",
-       DEBUG_STR
-       OSPF6_STR
-       "Debug OSPFv3 message\n"
-       "Debug Unknown message\n"
-       "Debug Hello message\n"
-       "Debug Database Description message\n"
-       "Debug Link State Request message\n"
-       "Debug Link State Update message\n"
-       "Debug Link State Acknowledgement message\n"
-       "Debug All message\n"
-       "Debug only sending message\n"
-       "Debug only receiving message\n"
-       )
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf6 message "
+ *     "(unknown|hello|dbdesc|lsreq|lsupdate|lsack|all) (send|recv)",
+ *     NO_STR
+ *     DEBUG_STR
+ *     OSPF6_STR
+ *     "Debug OSPFv3 message\n"
+ *     "Debug Unknown message\n"
+ *     "Debug Hello message\n"
+ *     "Debug Database Description message\n"
+ *     "Debug Link State Request message\n"
+ *     "Debug Link State Update message\n"
+ *     "Debug Link State Acknowledgement message\n"
+ *     "Debug All message\n"
+ *     "Debug only sending message\n"
+ *     "Debug only receiving message\n"
+ *     
+ *
+ */
 DEFUN (no_debug_ospf6_message,
        no_debug_ospf6_message_cmd,
        "no debug ospf6 message (unknown|hello|dbdesc|lsreq|lsupdate|lsack|all)",
@@ -2467,24 +2489,6 @@ DEFUN (no_debug_ospf6_message,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_ospf6_message,
-       no_debug_ospf6_message_sendrecv_cmd,
-       "no debug ospf6 message "
-       "(unknown|hello|dbdesc|lsreq|lsupdate|lsack|all) (send|recv)",
-       NO_STR
-       DEBUG_STR
-       OSPF6_STR
-       "Debug OSPFv3 message\n"
-       "Debug Unknown message\n"
-       "Debug Hello message\n"
-       "Debug Database Description message\n"
-       "Debug Link State Request message\n"
-       "Debug Link State Update message\n"
-       "Debug Link State Acknowledgement message\n"
-       "Debug All message\n"
-       "Debug only sending message\n"
-       "Debug only receiving message\n"
-       )
 
 int
 config_write_ospf6_debug_message (struct vty *vty)
@@ -2549,12 +2553,8 @@ install_element_ospf6_debug_message (void)
 {
   install_element (ENABLE_NODE, &debug_ospf6_message_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf6_message_cmd);
-  install_element (ENABLE_NODE, &debug_ospf6_message_sendrecv_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf6_message_sendrecv_cmd);
   install_element (CONFIG_NODE, &debug_ospf6_message_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf6_message_cmd);
-  install_element (CONFIG_NODE, &debug_ospf6_message_sendrecv_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf6_message_sendrecv_cmd);
 }
 
 
index 3e0977162967254daa9f49e5d14e7a7a9b2706fb..fbf0efed897eaeb58583670c3348173b91ae7e2b 100644 (file)
@@ -827,6 +827,18 @@ ospf6_neighbor_show_detail (struct vty *vty, struct ospf6_neighbor *on)
   ospf6_bfd_show_info(vty, on->bfd_info, 0);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 neighbor (detail|drchoice)",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     "Neighbor list\n"
+ *     "Display details\n"
+ *     "Display DR choices\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_neighbor,
        show_ipv6_ospf6_neighbor_cmd,
        "show ipv6 ospf6 neighbor",
@@ -870,16 +882,6 @@ DEFUN (show_ipv6_ospf6_neighbor,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_neighbor,
-       show_ipv6_ospf6_neighbor_detail_cmd,
-       "show ipv6 ospf6 neighbor (detail|drchoice)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       "Neighbor list\n"
-       "Display details\n"
-       "Display DR choices\n"
-      )
 
 DEFUN (show_ipv6_ospf6_neighbor_one,
        show_ipv6_ospf6_neighbor_one_cmd,
@@ -920,11 +922,20 @@ void
 ospf6_neighbor_init (void)
 {
   install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_detail_cmd);
   install_element (ENABLE_NODE, &show_ipv6_ospf6_neighbor_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_neighbor_detail_cmd);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf6 neighbor (state|event)",
+ *     DEBUG_STR
+ *     OSPF6_STR
+ *     "Debug OSPFv3 Neighbor\n"
+ *     "Debug OSPFv3 Neighbor State Change\n"
+ *     "Debug OSPFv3 Neighbor Event\n"
+ *     
+ *
+ */
 DEFUN (debug_ospf6_neighbor,
        debug_ospf6_neighbor_cmd,
        "debug ospf6 neighbor",
@@ -948,16 +959,19 @@ DEFUN (debug_ospf6_neighbor,
   return CMD_SUCCESS;
 }
 
-ALIAS (debug_ospf6_neighbor,
-       debug_ospf6_neighbor_detail_cmd,
-       "debug ospf6 neighbor (state|event)",
-       DEBUG_STR
-       OSPF6_STR
-       "Debug OSPFv3 Neighbor\n"
-       "Debug OSPFv3 Neighbor State Change\n"
-       "Debug OSPFv3 Neighbor Event\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf6 neighbor (state|event)",
+ *     NO_STR
+ *     DEBUG_STR
+ *     OSPF6_STR
+ *     "Debug OSPFv3 Neighbor\n"
+ *     "Debug OSPFv3 Neighbor State Change\n"
+ *     "Debug OSPFv3 Neighbor Event\n"
+ *     
+ *
+ */
 DEFUN (no_debug_ospf6_neighbor,
        no_debug_ospf6_neighbor_cmd,
        "no debug ospf6 neighbor",
@@ -982,16 +996,6 @@ DEFUN (no_debug_ospf6_neighbor,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_ospf6_neighbor,
-       no_debug_ospf6_neighbor_detail_cmd,
-       "no debug ospf6 neighbor (state|event)",
-       NO_STR
-       DEBUG_STR
-       OSPF6_STR
-       "Debug OSPFv3 Neighbor\n"
-       "Debug OSPFv3 Neighbor State Change\n"
-       "Debug OSPFv3 Neighbor Event\n"
-      )
 
 DEFUN (no_debug_ospf6,
        no_debug_ospf6_cmd,
@@ -1054,14 +1058,10 @@ void
 install_element_ospf6_debug_neighbor (void)
 {
   install_element (ENABLE_NODE, &debug_ospf6_neighbor_cmd);
-  install_element (ENABLE_NODE, &debug_ospf6_neighbor_detail_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf6_neighbor_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf6_neighbor_detail_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf6_cmd);
   install_element (CONFIG_NODE, &debug_ospf6_neighbor_cmd);
-  install_element (CONFIG_NODE, &debug_ospf6_neighbor_detail_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf6_neighbor_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf6_neighbor_detail_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf6_cmd);
 }
 
index fe5006b24d907162c7d6776607fc992adbde1234..6511d0b36305681b06dd4dd1d4d8066452cb1a4a 100644 (file)
@@ -900,6 +900,18 @@ DEFUN (ospf6_timers_throttle_spf,
   return ospf6_timers_spf_set (vty, delay, hold, max);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no timers throttle spf <0-600000> <0-600000> <0-600000>",
+ *     NO_STR
+ *     "Adjust routing timers\n"
+ *     "Throttling adaptive timer\n"
+ *     "OSPF6 SPF timers\n"
+ *     "Delay (msec) from first change received till SPF calculation\n"
+ *     "Initial hold time (msec) between consecutive SPF calculations\n"
+ *     "Maximum hold time (msec)\n"
+ *
+ */
 DEFUN (no_ospf6_timers_throttle_spf,
        no_ospf6_timers_throttle_spf_cmd,
        "no timers throttle spf",
@@ -914,16 +926,6 @@ DEFUN (no_ospf6_timers_throttle_spf,
                               OSPF_SPF_MAX_HOLDTIME_DEFAULT);
 }
 
-ALIAS (no_ospf6_timers_throttle_spf,
-       no_ospf6_timers_throttle_spf_val_cmd,
-       "no timers throttle spf <0-600000> <0-600000> <0-600000>",
-       NO_STR
-       "Adjust routing timers\n"
-       "Throttling adaptive timer\n"
-       "OSPF6 SPF timers\n"
-       "Delay (msec) from first change received till SPF calculation\n"
-       "Initial hold time (msec) between consecutive SPF calculations\n"
-       "Maximum hold time (msec)\n")
 
 int
 config_write_ospf6_debug_spf (struct vty *vty)
@@ -972,5 +974,4 @@ ospf6_spf_init (void)
 {
   install_element (OSPF6_NODE, &ospf6_timers_throttle_spf_cmd);
   install_element (OSPF6_NODE, &no_ospf6_timers_throttle_spf_cmd);
-  install_element (OSPF6_NODE, &no_ospf6_timers_throttle_spf_val_cmd);
 }
index e04f22fd094e93da534f8d24f2ea7e0c8682068b..8ddc6cfc8fc485abafbdf7a8c4e96b1cc4db41b5 100644 (file)
@@ -423,6 +423,16 @@ DEFUN (ospf6_timers_lsa,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no timers lsa min-arrival <0-600000>",
+ *     NO_STR
+ *     "Adjust routing timers\n"
+ *     "OSPF6 LSA timers\n"
+ *     "Minimum delay in receiving new version of a LSA\n"
+ *     "Delay in milliseconds\n"
+ *
+ */
 DEFUN (no_ospf6_timers_lsa,
        no_ospf6_timers_lsa_cmd,
        "no timers lsa min-arrival",
@@ -451,14 +461,6 @@ DEFUN (no_ospf6_timers_lsa,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf6_timers_lsa,
-       no_ospf6_timers_lsa_val_cmd,
-       "no timers lsa min-arrival <0-600000>",
-       NO_STR
-       "Adjust routing timers\n"
-       "OSPF6 LSA timers\n"
-       "Minimum delay in receiving new version of a LSA\n"
-       "Delay in milliseconds\n")
 
 DEFUN (ospf6_interface_area,
        ospf6_interface_area_cmd,
@@ -774,6 +776,31 @@ DEFUN (show_ipv6_ospf6,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 route (intra-area|inter-area|external-1|external-2)",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     ROUTE_STR
+ *     "Display Intra-Area routes\n"
+ *     "Display Inter-Area routes\n"
+ *     "Display Type-1 External routes\n"
+ *     "Display Type-2 External routes\n"
+ *     
+ *
+ * "show ipv6 ospf6 route (X:X::X:X|X:X::X:X/M|detail|summary)",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     ROUTE_STR
+ *     "Specify IPv6 address\n"
+ *     "Specify IPv6 prefix\n"
+ *     "Detailed information\n"
+ *     "Summary of route table\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_route,
        show_ipv6_ospf6_route_cmd,
        "show ipv6 ospf6 route",
@@ -789,19 +816,19 @@ DEFUN (show_ipv6_ospf6_route,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_route,
-       show_ipv6_ospf6_route_detail_cmd,
-       "show ipv6 ospf6 route (X:X::X:X|X:X::X:X/M|detail|summary)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       ROUTE_STR
-       "Specify IPv6 address\n"
-       "Specify IPv6 prefix\n"
-       "Detailed information\n"
-       "Summary of route table\n"
-       )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 route X:X::X:X/M longer",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     ROUTE_STR
+ *     "Specify IPv6 prefix\n"
+ *     "Display routes longer than the specified route\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_route_match,
        show_ipv6_ospf6_route_match_cmd,
        "show ipv6 ospf6 route X:X::X:X/M match",
@@ -837,29 +864,7 @@ DEFUN (show_ipv6_ospf6_route_match_detail,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_route_match,
-       show_ipv6_ospf6_route_longer_cmd,
-       "show ipv6 ospf6 route X:X::X:X/M longer",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       ROUTE_STR
-       "Specify IPv6 prefix\n"
-       "Display routes longer than the specified route\n"
-       )
 
-ALIAS (show_ipv6_ospf6_route,
-       show_ipv6_ospf6_route_type_cmd,
-       "show ipv6 ospf6 route (intra-area|inter-area|external-1|external-2)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       ROUTE_STR
-       "Display Intra-Area routes\n"
-       "Display Inter-Area routes\n"
-       "Display Type-1 External routes\n"
-       "Display Type-2 External routes\n"
-       )
 
 DEFUN (show_ipv6_ospf6_route_type_detail,
        show_ipv6_ospf6_route_type_detail_cmd,
@@ -965,18 +970,12 @@ ospf6_top_init (void)
   install_element (CONFIG_NODE, &no_router_ospf6_cmd);
 
   install_element (VIEW_NODE, &show_ipv6_ospf6_route_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_route_detail_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_route_match_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_route_match_detail_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_route_longer_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_route_type_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_route_type_detail_cmd);
   install_element (ENABLE_NODE, &show_ipv6_ospf6_route_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_detail_cmd);
   install_element (ENABLE_NODE, &show_ipv6_ospf6_route_match_cmd);
   install_element (ENABLE_NODE, &show_ipv6_ospf6_route_match_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_longer_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_type_cmd);
   install_element (ENABLE_NODE, &show_ipv6_ospf6_route_type_detail_cmd);
 
   install_default (OSPF6_NODE);
@@ -989,7 +988,6 @@ ospf6_top_init (void)
   /* LSA timers commands */
   install_element (OSPF6_NODE, &ospf6_timers_lsa_cmd);
   install_element (OSPF6_NODE, &no_ospf6_timers_lsa_cmd);
-  install_element (OSPF6_NODE, &no_ospf6_timers_lsa_val_cmd);
 
   install_element (OSPF6_NODE, &ospf6_interface_area_cmd);
   install_element (OSPF6_NODE, &no_ospf6_interface_area_cmd);
index 1e22a3517ea51da1c84ce403ab2f80d00149cbeb..f172b50f05e2240ee27c5d513055f28ae9145904 100644 (file)
@@ -707,6 +707,15 @@ ospf6_zebra_init (struct thread_master *master)
 
 /* Debug */
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf6 zebra",
+ *     DEBUG_STR
+ *     OSPF6_STR
+ *     "Debug connection between zebra\n"
+ *     
+ *
+ */
 DEFUN (debug_ospf6_zebra_sendrecv,
        debug_ospf6_zebra_sendrecv_cmd,
        "debug ospf6 zebra (send|recv)",
@@ -733,15 +742,18 @@ DEFUN (debug_ospf6_zebra_sendrecv,
   return CMD_SUCCESS;
 }
 
-ALIAS (debug_ospf6_zebra_sendrecv,
-       debug_ospf6_zebra_cmd,
-       "debug ospf6 zebra",
-       DEBUG_STR
-       OSPF6_STR
-       "Debug connection between zebra\n"
-      )
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf6 zebra",
+ *     NO_STR
+ *     DEBUG_STR
+ *     OSPF6_STR
+ *     "Debug connection between zebra\n"
+ *     
+ *
+ */
 DEFUN (no_debug_ospf6_zebra_sendrecv,
        no_debug_ospf6_zebra_sendrecv_cmd,
        "no debug ospf6 zebra (send|recv)",
@@ -769,14 +781,6 @@ DEFUN (no_debug_ospf6_zebra_sendrecv,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_ospf6_zebra_sendrecv,
-       no_debug_ospf6_zebra_cmd,
-       "no debug ospf6 zebra",
-       NO_STR
-       DEBUG_STR
-       OSPF6_STR
-       "Debug connection between zebra\n"
-      )
 
 int
 config_write_ospf6_debug_zebra (struct vty *vty)
@@ -796,12 +800,8 @@ config_write_ospf6_debug_zebra (struct vty *vty)
 void
 install_element_ospf6_debug_zebra (void)
 {
-  install_element (ENABLE_NODE, &debug_ospf6_zebra_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf6_zebra_cmd);
   install_element (ENABLE_NODE, &debug_ospf6_zebra_sendrecv_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf6_zebra_sendrecv_cmd);
-  install_element (CONFIG_NODE, &debug_ospf6_zebra_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf6_zebra_cmd);
   install_element (CONFIG_NODE, &debug_ospf6_zebra_sendrecv_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf6_zebra_sendrecv_cmd);
 }
index ecd0c047188aa1dc59ca19d339f4ea9516b38b9a..74ca444d40689a7f7bb50cea279ec6f6040eeeb0 100644 (file)
@@ -165,6 +165,19 @@ parse_type_spec (int argc, struct cmd_token **argv)
   return type;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database (detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database,
        show_ipv6_ospf6_database_cmd,
        "show ipv6 ospf6 database",
@@ -207,18 +220,32 @@ DEFUN (show_ipv6_ospf6_database,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database,
-       show_ipv6_ospf6_database_detail_cmd,
-       "show ipv6 ospf6 database (detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_type,
        show_ipv6_ospf6_database_type_cmd,
        "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix)",
@@ -287,30 +314,45 @@ DEFUN (show_ipv6_ospf6_database_type,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_type,
-       show_ipv6_ospf6_database_type_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database * A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Any Link state Type\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ * "show ipv6 ospf6 database linkstate-id A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Search by Link state ID\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ * "show ipv6 ospf6 database linkstate-id A.B.C.D",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Search by Link state ID\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_id,
        show_ipv6_ospf6_database_id_cmd,
        "show ipv6 ospf6 database * A.B.C.D",
@@ -365,47 +407,48 @@ DEFUN (show_ipv6_ospf6_database_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_id,
-       show_ipv6_ospf6_database_id_detail_cmd,
-       "show ipv6 ospf6 database * A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Any Link state Type\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
-ALIAS (show_ipv6_ospf6_database_id,
-       show_ipv6_ospf6_database_linkstate_id_cmd,
-       "show ipv6 ospf6 database linkstate-id A.B.C.D",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-      )
 
-ALIAS (show_ipv6_ospf6_database_id,
-       show_ipv6_ospf6_database_linkstate_id_detail_cmd,
-       "show ipv6 ospf6 database linkstate-id A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database * * A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Any Link state Type\n"
+ *     "Any Link state ID\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ * "show ipv6 ospf6 database adv-router A.B.C.D",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Search by Advertising Router\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     
+ *
+ * "show ipv6 ospf6 database adv-router A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Search by Advertising Router\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_router,
        show_ipv6_ospf6_database_router_cmd,
        "show ipv6 ospf6 database * * A.B.C.D",
@@ -461,48 +504,79 @@ DEFUN (show_ipv6_ospf6_database_router,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_router,
-       show_ipv6_ospf6_database_router_detail_cmd,
-       "show ipv6 ospf6 database * * A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Any Link state Type\n"
-       "Any Link state ID\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
-ALIAS (show_ipv6_ospf6_database_router,
-       show_ipv6_ospf6_database_adv_router_cmd,
-       "show ipv6 ospf6 database adv-router A.B.C.D",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Search by Advertising Router\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-      )
 
-ALIAS (show_ipv6_ospf6_database_router,
-       show_ipv6_ospf6_database_adv_router_detail_cmd,
-       "show ipv6 ospf6 database adv-router A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Search by Advertising Router\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) linkstate-id A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Search by Link state ID\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) linkstate-id A.B.C.D",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Search by Link state ID\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_type_id,
        show_ipv6_ospf6_database_type_id_cmd,
        "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) A.B.C.D",
@@ -583,79 +657,80 @@ DEFUN (show_ipv6_ospf6_database_type_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_type_id,
-       show_ipv6_ospf6_database_type_id_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
-ALIAS (show_ipv6_ospf6_database_type_id,
-       show_ipv6_ospf6_database_type_linkstate_id_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) linkstate-id A.B.C.D",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-      )
 
-ALIAS (show_ipv6_ospf6_database_type_id,
-       show_ipv6_ospf6_database_type_linkstate_id_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) linkstate-id A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) * A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Any Link state ID\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) adv-router A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Search by Advertising Router\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) adv-router A.B.C.D",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Search by Advertising Router\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_type_router,
        show_ipv6_ospf6_database_type_router_cmd,
        "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) * A.B.C.D",
@@ -737,80 +812,26 @@ DEFUN (show_ipv6_ospf6_database_type_router,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_type_router,
-       show_ipv6_ospf6_database_type_router_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) * A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Any Link state ID\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
-ALIAS (show_ipv6_ospf6_database_type_router,
-       show_ipv6_ospf6_database_type_adv_router_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) adv-router A.B.C.D",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Search by Advertising Router\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-      )
 
-ALIAS (show_ipv6_ospf6_database_type_router,
-       show_ipv6_ospf6_database_type_adv_router_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) adv-router A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Search by Advertising Router\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database * A.B.C.D A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Any Link state Type\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_id_router,
        show_ipv6_ospf6_database_id_router_cmd,
        "show ipv6 ospf6 database * A.B.C.D A.B.C.D",
@@ -877,22 +898,25 @@ DEFUN (show_ipv6_ospf6_database_id_router,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_id_router,
-       show_ipv6_ospf6_database_id_router_detail_cmd,
-       "show ipv6 ospf6 database * A.B.C.D A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Any Link state Type\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database adv-router A.B.C.D linkstate-id A.B.C.D "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Search by Advertising Router\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     "Search by Link state ID\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id,
        show_ipv6_ospf6_database_adv_router_linkstate_id_cmd,
        "show ipv6 ospf6 database adv-router A.B.C.D linkstate-id A.B.C.D",
@@ -960,23 +984,33 @@ DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_adv_router_linkstate_id,
-       show_ipv6_ospf6_database_adv_router_linkstate_id_detail_cmd,
-       "show ipv6 ospf6 database adv-router A.B.C.D linkstate-id A.B.C.D "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Search by Advertising Router\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) A.B.C.D A.B.C.D "
+ *     "(dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_type_id_router,
        show_ipv6_ospf6_database_type_id_router_cmd,
        "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) A.B.C.D A.B.C.D",
@@ -1069,31 +1103,36 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_type_id_router,
-       show_ipv6_ospf6_database_type_id_router_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) A.B.C.D A.B.C.D "
-       "(dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) "
+ *     "adv-router A.B.C.D linkstate-id A.B.C.D "
+ *     "(dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Search by Advertising Router\n"
+ *     "Specify Advertising Router as IPv4 address notation\n"
+ *     "Search by Link state ID\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
        show_ipv6_ospf6_database_type_adv_router_linkstate_id_cmd,
        "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) adv-router A.B.C.D linkstate-id A.B.C.D",
@@ -1188,34 +1227,21 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
-       show_ipv6_ospf6_database_type_adv_router_linkstate_id_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) "
-       "adv-router A.B.C.D linkstate-id A.B.C.D "
-       "(dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Search by Advertising Router\n"
-       "Specify Advertising Router as IPv4 address notation\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database self-originated "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Self-originated LSAs\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_self_originated,
        show_ipv6_ospf6_database_self_originated_cmd,
        "show ipv6 ospf6 database self-originated",
@@ -1261,19 +1287,33 @@ DEFUN (show_ipv6_ospf6_database_self_originated,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_self_originated,
-       show_ipv6_ospf6_database_self_originated_detail_cmd,
-       "show ipv6 ospf6 database self-originated "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Self-originated LSAs\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) self-originated "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Display Self-originated LSAs\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_type_self_originated,
        show_ipv6_ospf6_database_type_self_originated_cmd,
        "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) self-originated",
@@ -1346,31 +1386,35 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_type_self_originated,
-       show_ipv6_ospf6_database_type_self_originated_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) self-originated "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Display Self-originated LSAs\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) self-originated "
+ *     "linkstate-id A.B.C.D (detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Display Self-originated LSAs\n"
+ *     "Search by Link state ID\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
        show_ipv6_ospf6_database_type_self_originated_linkstate_id_cmd,
        "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) self-originated linkstate-id A.B.C.D",
@@ -1456,33 +1500,35 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
-       show_ipv6_ospf6_database_type_self_originated_linkstate_id_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) self-originated "
-       "linkstate-id A.B.C.D (detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Display Self-originated LSAs\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 database "
+ *     "(router|network|inter-prefix|inter-router|as-external|"
+ *     "group-membership|type-7|link|intra-prefix) A.B.C.D self-originated "
+ *     "(detail|dump|internal)",
+ *     SHOW_STR
+ *     IPV6_STR
+ *     OSPF6_STR
+ *     "Display Link state database\n"
+ *     "Display Router LSAs\n"
+ *     "Display Network LSAs\n"
+ *     "Display Inter-Area-Prefix LSAs\n"
+ *     "Display Inter-Area-Router LSAs\n"
+ *     "Display As-External LSAs\n"
+ *     "Display Group-Membership LSAs\n"
+ *     "Display Type-7 LSAs\n"
+ *     "Display Link LSAs\n"
+ *     "Display Intra-Area-Prefix LSAs\n"
+ *     "Display Self-originated LSAs\n"
+ *     "Search by Link state ID\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     "Display details of LSAs\n"
+ *     "Dump LSAs\n"
+ *     "Display LSA's internal information\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
        show_ipv6_ospf6_database_type_id_self_originated_cmd,
        "show ipv6 ospf6 database (router|network|inter-prefix|inter-router|as-external|group-membership|type-7|link|intra-prefix) A.B.C.D self-originated",
@@ -1567,34 +1613,20 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_database_type_id_self_originated,
-       show_ipv6_ospf6_database_type_id_self_originated_detail_cmd,
-       "show ipv6 ospf6 database "
-       "(router|network|inter-prefix|inter-router|as-external|"
-       "group-membership|type-7|link|intra-prefix) A.B.C.D self-originated "
-       "(detail|dump|internal)",
-       SHOW_STR
-       IPV6_STR
-       OSPF6_STR
-       "Display Link state database\n"
-       "Display Router LSAs\n"
-       "Display Network LSAs\n"
-       "Display Inter-Area-Prefix LSAs\n"
-       "Display Inter-Area-Router LSAs\n"
-       "Display As-External LSAs\n"
-       "Display Group-Membership LSAs\n"
-       "Display Type-7 LSAs\n"
-       "Display Link LSAs\n"
-       "Display Intra-Area-Prefix LSAs\n"
-       "Display Self-originated LSAs\n"
-       "Search by Link state ID\n"
-       "Specify Link state ID as IPv4 address notation\n"
-       "Display details of LSAs\n"
-       "Dump LSAs\n"
-       "Display LSA's internal information\n"
-      )
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 border-routers (A.B.C.D|detail)",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     "Display routing table for ABR and ASBR\n"
+ *     "Specify Router-ID\n"
+ *     "Display Detail\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_border_routers,
        show_ipv6_ospf6_border_routers_cmd,
        "show ipv6 ospf6 border-routers",
@@ -1650,17 +1682,29 @@ DEFUN (show_ipv6_ospf6_border_routers,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_border_routers,
-       show_ipv6_ospf6_border_routers_detail_cmd,
-       "show ipv6 ospf6 border-routers (A.B.C.D|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       "Display routing table for ABR and ASBR\n"
-       "Specify Router-ID\n"
-       "Display Detail\n"
-      )
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 ospf6 linkstate network A.B.C.D A.B.C.D",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     "Display linkstate routing table\n"
+ *     "Display Network Entry\n"
+ *     "Specify Router ID as IPv4 address notation\n"
+ *     "Specify Link state ID as IPv4 address notation\n"
+ *     
+ *
+ * "show ipv6 ospf6 linkstate router A.B.C.D",
+ *     SHOW_STR
+ *     IP6_STR
+ *     OSPF6_STR
+ *     "Display linkstate routing table\n"
+ *     "Display Router Entry\n"
+ *     "Specify Router ID as IPv4 address notation\n"
+ *     
+ *
+ */
 DEFUN (show_ipv6_ospf6_linkstate,
        show_ipv6_ospf6_linkstate_cmd,
        "show ipv6 ospf6 linkstate",
@@ -1686,28 +1730,7 @@ DEFUN (show_ipv6_ospf6_linkstate,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_linkstate,
-       show_ipv6_ospf6_linkstate_router_cmd,
-       "show ipv6 ospf6 linkstate router A.B.C.D",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       "Display linkstate routing table\n"
-       "Display Router Entry\n"
-       "Specify Router ID as IPv4 address notation\n"
-      )
 
-ALIAS (show_ipv6_ospf6_linkstate,
-       show_ipv6_ospf6_linkstate_network_cmd,
-       "show ipv6 ospf6 linkstate network A.B.C.D A.B.C.D",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       "Display linkstate routing table\n"
-       "Display Network Entry\n"
-       "Specify Router ID as IPv4 address notation\n"
-       "Specify Link state ID as IPv4 address notation\n"
-      )
 
 DEFUN (show_ipv6_ospf6_linkstate_detail,
        show_ipv6_ospf6_linkstate_detail_cmd,
@@ -1757,126 +1780,3 @@ ospf6_init (void)
   ospf6_bfd_init();
   install_node (&debug_node, config_write_ospf6_debug);
 
-  install_element_ospf6_debug_message ();
-  install_element_ospf6_debug_lsa ();
-  install_element_ospf6_debug_interface ();
-  install_element_ospf6_debug_neighbor ();
-  install_element_ospf6_debug_zebra ();
-  install_element_ospf6_debug_spf ();
-  install_element_ospf6_debug_route ();
-  install_element_ospf6_debug_brouter ();
-  install_element_ospf6_debug_asbr ();
-  install_element_ospf6_debug_abr ();
-  install_element_ospf6_debug_flood ();
-
-  install_element_ospf6_clear_interface ();
-
-  install_element (VIEW_NODE, &show_version_ospf6_cmd);
-  install_element (ENABLE_NODE, &show_version_ospf6_cmd);
-
-  install_element (VIEW_NODE, &show_ipv6_ospf6_border_routers_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_border_routers_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_border_routers_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_border_routers_detail_cmd);
-
-  install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_router_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_network_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_linkstate_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_linkstate_router_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_linkstate_network_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_linkstate_detail_cmd);
-
-#define INSTALL(n,c) \
-  install_element (n ## _NODE, &show_ipv6_ospf6_ ## c)
-
-  INSTALL (VIEW, database_cmd);
-  INSTALL (VIEW, database_detail_cmd);
-  INSTALL (VIEW, database_type_cmd);
-  INSTALL (VIEW, database_type_detail_cmd);
-  INSTALL (VIEW, database_id_cmd);
-  INSTALL (VIEW, database_id_detail_cmd);
-  INSTALL (VIEW, database_linkstate_id_cmd);
-  INSTALL (VIEW, database_linkstate_id_detail_cmd);
-  INSTALL (VIEW, database_router_cmd);
-  INSTALL (VIEW, database_router_detail_cmd);
-  INSTALL (VIEW, database_adv_router_cmd);
-  INSTALL (VIEW, database_adv_router_detail_cmd);
-  INSTALL (VIEW, database_type_id_cmd);
-  INSTALL (VIEW, database_type_id_detail_cmd);
-  INSTALL (VIEW, database_type_linkstate_id_cmd);
-  INSTALL (VIEW, database_type_linkstate_id_detail_cmd);
-  INSTALL (VIEW, database_type_router_cmd);
-  INSTALL (VIEW, database_type_router_detail_cmd);
-  INSTALL (VIEW, database_type_adv_router_cmd);
-  INSTALL (VIEW, database_type_adv_router_detail_cmd);
-  INSTALL (VIEW, database_adv_router_linkstate_id_cmd);
-  INSTALL (VIEW, database_adv_router_linkstate_id_detail_cmd);
-  INSTALL (VIEW, database_id_router_cmd);
-  INSTALL (VIEW, database_id_router_detail_cmd);
-  INSTALL (VIEW, database_type_id_router_cmd);
-  INSTALL (VIEW, database_type_id_router_detail_cmd);
-  INSTALL (VIEW, database_type_adv_router_linkstate_id_cmd);
-  INSTALL (VIEW, database_type_adv_router_linkstate_id_detail_cmd);
-  INSTALL (VIEW, database_self_originated_cmd);
-  INSTALL (VIEW, database_self_originated_detail_cmd);
-  INSTALL (VIEW, database_type_self_originated_cmd);
-  INSTALL (VIEW, database_type_self_originated_detail_cmd);
-  INSTALL (VIEW, database_type_id_self_originated_cmd);
-  INSTALL (VIEW, database_type_id_self_originated_detail_cmd);
-  INSTALL (VIEW, database_type_self_originated_linkstate_id_cmd);
-  INSTALL (VIEW, database_type_self_originated_linkstate_id_detail_cmd);
-
-  INSTALL (ENABLE, database_cmd);
-  INSTALL (ENABLE, database_detail_cmd);
-  INSTALL (ENABLE, database_type_cmd);
-  INSTALL (ENABLE, database_type_detail_cmd);
-  INSTALL (ENABLE, database_id_cmd);
-  INSTALL (ENABLE, database_id_detail_cmd);
-  INSTALL (ENABLE, database_linkstate_id_cmd);
-  INSTALL (ENABLE, database_linkstate_id_detail_cmd);
-  INSTALL (ENABLE, database_router_cmd);
-  INSTALL (ENABLE, database_router_detail_cmd);
-  INSTALL (ENABLE, database_adv_router_cmd);
-  INSTALL (ENABLE, database_adv_router_detail_cmd);
-  INSTALL (ENABLE, database_type_id_cmd);
-  INSTALL (ENABLE, database_type_id_detail_cmd);
-  INSTALL (ENABLE, database_type_linkstate_id_cmd);
-  INSTALL (ENABLE, database_type_linkstate_id_detail_cmd);
-  INSTALL (ENABLE, database_type_router_cmd);
-  INSTALL (ENABLE, database_type_router_detail_cmd);
-  INSTALL (ENABLE, database_type_adv_router_cmd);
-  INSTALL (ENABLE, database_type_adv_router_detail_cmd);
-  INSTALL (ENABLE, database_adv_router_linkstate_id_cmd);
-  INSTALL (ENABLE, database_adv_router_linkstate_id_detail_cmd);
-  INSTALL (ENABLE, database_id_router_cmd);
-  INSTALL (ENABLE, database_id_router_detail_cmd);
-  INSTALL (ENABLE, database_type_id_router_cmd);
-  INSTALL (ENABLE, database_type_id_router_detail_cmd);
-  INSTALL (ENABLE, database_type_adv_router_linkstate_id_cmd);
-  INSTALL (ENABLE, database_type_adv_router_linkstate_id_detail_cmd);
-  INSTALL (ENABLE, database_self_originated_cmd);
-  INSTALL (ENABLE, database_self_originated_detail_cmd);
-  INSTALL (ENABLE, database_type_self_originated_cmd);
-  INSTALL (ENABLE, database_type_self_originated_detail_cmd);
-  INSTALL (ENABLE, database_type_id_self_originated_cmd);
-  INSTALL (ENABLE, database_type_id_self_originated_detail_cmd);
-  INSTALL (ENABLE, database_type_self_originated_linkstate_id_cmd);
-  INSTALL (ENABLE, database_type_self_originated_linkstate_id_detail_cmd);
-
-  /* Make ospf protocol socket. */
-  ospf6_serv_sock ();
-  thread_add_read (master, ospf6_receive, NULL, ospf6_sock);
-}
-
-void
-ospf6_clean (void)
-{
-  if (!ospf6)
-    return;
-  if (ospf6->route_table)
-    ospf6_route_remove_all (ospf6->route_table);
-  if (ospf6->brouter_table)
-    ospf6_route_remove_all (ospf6->brouter_table);
-}
index dd44ab2ac1e3c2b1e1e9597965cd50b6a1436487..2689cecc4ac9fe0ece5dbebcac2d218badc18cc4 100644 (file)
@@ -404,6 +404,18 @@ DEFUN (ip_ospf_bfd_param,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf bfd " BFD_CMD_DETECT_MULT_RANGE BFD_CMD_MIN_RX_RANGE BFD_CMD_MIN_TX_RANGE,
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Enables BFD support\n"
+ *     "Detect Multiplier\n"
+ *     "Required min receive interval\n"
+ *     "Desired min transmit interval\n"
+ *
+ */
 DEFUN (no_ip_ospf_bfd,
        no_ip_ospf_bfd_cmd,
        "no ip ospf bfd",
@@ -427,16 +439,6 @@ DEFUN (no_ip_ospf_bfd,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_bfd,
-       no_ip_ospf_bfd_param_cmd,
-       "no ip ospf bfd " BFD_CMD_DETECT_MULT_RANGE BFD_CMD_MIN_RX_RANGE BFD_CMD_MIN_TX_RANGE,
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enables BFD support\n"
-       "Detect Multiplier\n"
-       "Required min receive interval\n"
-       "Desired min transmit interval\n")
 
 void
 ospf_bfd_init(void)
@@ -451,5 +453,4 @@ ospf_bfd_init(void)
   install_element (INTERFACE_NODE, &ip_ospf_bfd_cmd);
   install_element (INTERFACE_NODE, &ip_ospf_bfd_param_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_bfd_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_bfd_param_cmd);
 }
index 583a4d85d92231d4d32144ed2587ce15125880f3..60356e774aab9759a571a5237381774af3bf1775 100644 (file)
@@ -814,6 +814,37 @@ debug_ospf_packet_common (struct vty *vty, int arg_base, int argc,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)",
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "OSPF packets\n"
+ *     "OSPF Hello\n"
+ *     "OSPF Database Description\n"
+ *     "OSPF Link State Request\n"
+ *     "OSPF Link State Update\n"
+ *     "OSPF Link State Acknowledgment\n"
+ *     "OSPF all packets\n"
+ *     "Packet sent\n"
+ *     "Packet received\n"
+ *     "Detail Information\n"
+ *
+ * "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)",
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "OSPF packets\n"
+ *     "OSPF Hello\n"
+ *     "OSPF Database Description\n"
+ *     "OSPF Link State Request\n"
+ *     "OSPF Link State Update\n"
+ *     "OSPF Link State Acknowledgment\n"
+ *     "OSPF all packets\n"
+ *     "Packet sent\n"
+ *     "Packet received\n"
+ *     "Detail information\n"
+ *
+ */
 DEFUN (debug_ospf_packet,
        debug_ospf_packet_all_cmd,
        "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)",
@@ -830,38 +861,41 @@ DEFUN (debug_ospf_packet,
   return (debug_ospf_packet_common(vty, 0, argc, argv));
 }
 
-ALIAS (debug_ospf_packet,
-       debug_ospf_packet_send_recv_cmd,
-       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)",
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail information\n")
-
-ALIAS (debug_ospf_packet,
-       debug_ospf_packet_send_recv_detail_cmd,
-       "debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)",
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
+
        
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)",
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "OSPF packets\n"
+ *     "OSPF Hello\n"
+ *     "OSPF Database Description\n"
+ *     "OSPF Link State Request\n"
+ *     "OSPF Link State Update\n"
+ *     "OSPF Link State Acknowledgment\n"
+ *     "OSPF all packets\n"
+ *     "Packet sent\n"
+ *     "Packet received\n"
+ *     "Detail information\n"
+ *
+ * "debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)",
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "OSPF packets\n"
+ *     "OSPF Hello\n"
+ *     "OSPF Database Description\n"
+ *     "OSPF Link State Request\n"
+ *     "OSPF Link State Update\n"
+ *     "OSPF Link State Acknowledgment\n"
+ *     "OSPF all packets\n"
+ *     "Packet sent\n"
+ *     "Packet received\n"
+ *     "Detail Information\n"
+ *
+ */
 DEFUN (debug_ospf_instance_packet,
        debug_ospf_instance_packet_all_cmd,
        "debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all)",
@@ -885,39 +919,7 @@ DEFUN (debug_ospf_instance_packet,
   return (debug_ospf_packet_common(vty, 1, argc, argv));
 }
 
-ALIAS (debug_ospf_instance_packet,
-       debug_ospf_instance_packet_send_recv_cmd,
-       "debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)",
-       "Debugging functions\n"
-       "OSPF information\n"
-       "Instance ID\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail information\n")
-
-ALIAS (debug_ospf_instance_packet,
-       debug_ospf_instance_packet_send_recv_detail_cmd,
-       "debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)",
-       "Debugging functions\n"
-       "OSPF information\n"
-       "Instance ID\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
+
 
 static int
 no_debug_ospf_packet_common (struct vty *vty, int arg_base, int argc,
@@ -982,6 +984,39 @@ no_debug_ospf_packet_common (struct vty *vty, int arg_base, int argc,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)",
+ *     NO_STR
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "OSPF packets\n"
+ *     "OSPF Hello\n"
+ *     "OSPF Database Description\n"
+ *     "OSPF Link State Request\n"
+ *     "OSPF Link State Update\n"
+ *     "OSPF Link State Acknowledgment\n"
+ *     "OSPF all packets\n"
+ *     "Packet sent\n"
+ *     "Packet received\n"
+ *     "Detail Information\n"
+ *
+ * "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)",
+ *     NO_STR
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "OSPF packets\n"
+ *     "OSPF Hello\n"
+ *     "OSPF Database Description\n"
+ *     "OSPF Link State Request\n"
+ *     "OSPF Link State Update\n"
+ *     "OSPF Link State Acknowledgment\n"
+ *     "OSPF all packets\n"
+ *     "Packet sent\n"
+ *     "Packet received\n"
+ *     "Detail Information\n"
+ *
+ */
 DEFUN (no_debug_ospf_packet,
        no_debug_ospf_packet_all_cmd,
        "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)",
@@ -999,40 +1034,43 @@ DEFUN (no_debug_ospf_packet,
   return no_debug_ospf_packet_common(vty, 0, argc, argv);
 }
 
-ALIAS (no_debug_ospf_packet,
-       no_debug_ospf_packet_send_recv_cmd,
-       "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)",
-       NO_STR
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
-
-ALIAS (no_debug_ospf_packet,
-       no_debug_ospf_packet_send_recv_detail_cmd,
-       "no debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)",
-       NO_STR
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
 
+
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)",
+ *     NO_STR
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "OSPF packets\n"
+ *     "OSPF Hello\n"
+ *     "OSPF Database Description\n"
+ *     "OSPF Link State Request\n"
+ *     "OSPF Link State Update\n"
+ *     "OSPF Link State Acknowledgment\n"
+ *     "OSPF all packets\n"
+ *     "Packet sent\n"
+ *     "Packet received\n"
+ *     "Detail Information\n"
+ *
+ * "no debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)",
+ *     NO_STR
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "OSPF packets\n"
+ *     "OSPF Hello\n"
+ *     "OSPF Database Description\n"
+ *     "OSPF Link State Request\n"
+ *     "OSPF Link State Update\n"
+ *     "OSPF Link State Acknowledgment\n"
+ *     "OSPF all packets\n"
+ *     "Packet sent\n"
+ *     "Packet received\n"
+ *     "Detail Information\n"
+ *
+ */
 DEFUN (no_debug_ospf_instance_packet,
        no_debug_ospf_instance_packet_all_cmd,
        "no debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all)",
@@ -1057,41 +1095,7 @@ DEFUN (no_debug_ospf_instance_packet,
   return (no_debug_ospf_packet_common(vty, 1, argc, argv));
 }
 
-ALIAS (no_debug_ospf_instance_packet,
-       no_debug_ospf_instance_packet_send_recv_cmd,
-       "no debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv|detail)",
-       NO_STR
-       "Debugging functions\n"
-       "OSPF information\n"
-       "Instance ID\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
-
-ALIAS (no_debug_ospf_instance_packet,
-       no_debug_ospf_instance_packet_send_recv_detail_cmd,
-       "no debug ospf <1-65535> packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) (detail|)",
-       NO_STR
-       "Debugging functions\n"
-       "OSPF information\n"
-       "Instance ID\n"
-       "OSPF packets\n"
-       "OSPF Hello\n"
-       "OSPF Database Description\n"
-       "OSPF Link State Request\n"
-       "OSPF Link State Update\n"
-       "OSPF Link State Acknowledgment\n"
-       "OSPF all packets\n"
-       "Packet sent\n"
-       "Packet received\n"
-       "Detail Information\n")
+
 
 
 static int
@@ -1130,6 +1134,17 @@ debug_ospf_ism_common (struct vty *vty, int arg_base, int argc, struct cmd_token
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf ism (status|events|timers)",
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "OSPF Interface State Machine\n"
+ *     "ISM Status Information\n"
+ *     "ISM Event Information\n"
+ *     "ISM TImer Information\n"
+ *
+ */
 DEFUN (debug_ospf_ism,
        debug_ospf_ism_cmd,
        "debug ospf ism",
@@ -1140,16 +1155,19 @@ DEFUN (debug_ospf_ism,
   return debug_ospf_ism_common(vty, 0, argc, argv);
 }
 
-ALIAS (debug_ospf_ism,
-       debug_ospf_ism_sub_cmd,
-       "debug ospf ism (status|events|timers)",
-       DEBUG_STR
-       OSPF_STR
-       "OSPF Interface State Machine\n"
-       "ISM Status Information\n"
-       "ISM Event Information\n"
-       "ISM TImer Information\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf <1-65535> ism (status|events|timers)",
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "Instance ID\n"
+ *     "OSPF Interface State Machine\n"
+ *     "ISM Status Information\n"
+ *     "ISM Event Information\n"
+ *     "ISM TImer Information\n"
+ *
+ */
 DEFUN (debug_ospf_instance_ism,
        debug_ospf_instance_ism_cmd,
        "debug ospf <1-65535> ism",
@@ -1167,16 +1185,6 @@ DEFUN (debug_ospf_instance_ism,
   return debug_ospf_ism_common(vty, 1, argc, argv);
 }
 
-ALIAS (debug_ospf_instance_ism,
-       debug_ospf_instance_ism_sub_cmd,
-       "debug ospf <1-65535> ism (status|events|timers)",
-       DEBUG_STR
-       OSPF_STR
-       "Instance ID\n"
-       "OSPF Interface State Machine\n"
-       "ISM Status Information\n"
-       "ISM Event Information\n"
-       "ISM TImer Information\n")
 
 static int
 no_debug_ospf_ism_common(struct vty *vty, int arg_base, int argc,
@@ -1214,6 +1222,18 @@ no_debug_ospf_ism_common(struct vty *vty, int arg_base, int argc,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf ism (status|events|timers)",
+ *     NO_STR
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "OSPF Interface State Machine\n"
+ *     "ISM Status Information\n"
+ *     "ISM Event Information\n"
+ *     "ISM Timer Information\n"
+ *
+ */
 DEFUN (no_debug_ospf_ism,
        no_debug_ospf_ism_cmd,
        "no debug ospf ism",
@@ -1225,17 +1245,20 @@ DEFUN (no_debug_ospf_ism,
   return no_debug_ospf_ism_common(vty, 0, argc, argv);
 }
 
-ALIAS (no_debug_ospf_ism,
-       no_debug_ospf_ism_sub_cmd,
-       "no debug ospf ism (status|events|timers)",
-       NO_STR
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF Interface State Machine\n"
-       "ISM Status Information\n"
-       "ISM Event Information\n"
-       "ISM Timer Information\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf <1-65535> ism (status|events|timers)",
+ *     NO_STR
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "OSPF Interface State Machine\n"
+ *     "ISM Status Information\n"
+ *     "ISM Event Information\n"
+ *     "ISM Timer Information\n"
+ *
+ */
 DEFUN (no_debug_ospf_instance_ism,
        no_debug_ospf_instance_ism_cmd,
        "no debug ospf <1-65535> ism",
@@ -1254,17 +1277,6 @@ DEFUN (no_debug_ospf_instance_ism,
   return no_debug_ospf_ism_common(vty, 1, argc, argv);
 }
 
-ALIAS (no_debug_ospf_instance_ism,
-       no_debug_ospf_instance_ism_sub_cmd,
-       "no debug ospf <1-65535> ism (status|events|timers)",
-       NO_STR
-       "Debugging functions\n"
-       "OSPF information\n"
-       "Instance ID\n"
-       "OSPF Interface State Machine\n"
-       "ISM Status Information\n"
-       "ISM Event Information\n"
-       "ISM Timer Information\n")
 
 static int
 debug_ospf_nsm_common (struct vty *vty, int arg_base, int argc, struct cmd_token **argv)
@@ -1302,6 +1314,17 @@ debug_ospf_nsm_common (struct vty *vty, int arg_base, int argc, struct cmd_token
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf nsm (status|events|timers)",
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "OSPF Neighbor State Machine\n"
+ *     "NSM Status Information\n"
+ *     "NSM Event Information\n"
+ *     "NSM Timer Information\n"
+ *
+ */
 DEFUN (debug_ospf_nsm,
        debug_ospf_nsm_cmd,
        "debug ospf nsm",
@@ -1312,16 +1335,19 @@ DEFUN (debug_ospf_nsm,
   return debug_ospf_nsm_common (vty, 0, argc, argv);
 }
 
-ALIAS (debug_ospf_nsm,
-       debug_ospf_nsm_sub_cmd,
-       "debug ospf nsm (status|events|timers)",
-       DEBUG_STR
-       OSPF_STR
-       "OSPF Neighbor State Machine\n"
-       "NSM Status Information\n"
-       "NSM Event Information\n"
-       "NSM Timer Information\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf <1-65535> nsm (status|events|timers)",
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "Instance ID\n"
+ *     "OSPF Neighbor State Machine\n"
+ *     "NSM Status Information\n"
+ *     "NSM Event Information\n"
+ *     "NSM Timer Information\n"
+ *
+ */
 DEFUN (debug_ospf_instance_nsm,
        debug_ospf_instance_nsm_cmd,
        "debug ospf <1-65535> nsm",
@@ -1339,16 +1365,6 @@ DEFUN (debug_ospf_instance_nsm,
   return debug_ospf_nsm_common (vty, 1, argc, argv);
 }
 
-ALIAS (debug_ospf_instance_nsm,
-       debug_ospf_instance_nsm_sub_cmd,
-       "debug ospf <1-65535> nsm (status|events|timers)",
-       DEBUG_STR
-       OSPF_STR
-       "Instance ID\n"
-       "OSPF Neighbor State Machine\n"
-       "NSM Status Information\n"
-       "NSM Event Information\n"
-       "NSM Timer Information\n")
 
 static int
 no_debug_ospf_nsm_common (struct vty *vty, int arg_base, int argc, struct cmd_token **argv)
@@ -1386,6 +1402,18 @@ no_debug_ospf_nsm_common (struct vty *vty, int arg_base, int argc, struct cmd_to
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf nsm (status|events|timers)",
+ *     NO_STR
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "OSPF Interface State Machine\n"
+ *     "NSM Status Information\n"
+ *     "NSM Event Information\n"
+ *     "NSM Timer Information\n"
+ *
+ */
 DEFUN (no_debug_ospf_nsm,
        no_debug_ospf_nsm_cmd,
        "no debug ospf nsm",
@@ -1397,17 +1425,20 @@ DEFUN (no_debug_ospf_nsm,
   return no_debug_ospf_nsm_common(vty, 0, argc, argv);
 }
 
-ALIAS (no_debug_ospf_nsm,
-       no_debug_ospf_nsm_sub_cmd,
-       "no debug ospf nsm (status|events|timers)",
-       NO_STR
-       "Debugging functions\n"
-       "OSPF information\n"
-       "OSPF Interface State Machine\n"
-       "NSM Status Information\n"
-       "NSM Event Information\n"
-       "NSM Timer Information\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf <1-65535> nsm (status|events|timers)",
+ *     NO_STR
+ *     "Debugging functions\n"
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "OSPF Interface State Machine\n"
+ *     "NSM Status Information\n"
+ *     "NSM Event Information\n"
+ *     "NSM Timer Information\n"
+ *
+ */
 DEFUN (no_debug_ospf_instance_nsm,
        no_debug_ospf_instance_nsm_cmd,
        "no debug ospf <1-65535> nsm",
@@ -1426,17 +1457,6 @@ DEFUN (no_debug_ospf_instance_nsm,
   return no_debug_ospf_nsm_common(vty, 1, argc, argv);
 }
 
-ALIAS (no_debug_ospf_instance_nsm,
-       no_debug_ospf_instance_nsm_sub_cmd,
-       "no debug ospf <1-65535> nsm (status|events|timers)",
-       NO_STR
-       "Debugging functions\n"
-       "OSPF information\n"
-       "Instance ID\n"
-       "OSPF Interface State Machine\n"
-       "NSM Status Information\n"
-       "NSM Event Information\n"
-       "NSM Timer Information\n")
 
 
 static int
@@ -1479,6 +1499,18 @@ debug_ospf_lsa_common (struct vty *vty, int arg_base, int argc, struct cmd_token
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf lsa (generate|flooding|install|refresh)",
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "OSPF Link State Advertisement\n"
+ *     "LSA Generation\n"
+ *     "LSA Flooding\n"
+ *     "LSA Install/Delete\n"
+ *     "LSA Refresh\n"
+ *
+ */
 DEFUN (debug_ospf_lsa,
        debug_ospf_lsa_cmd,
        "debug ospf lsa",
@@ -1489,17 +1521,20 @@ DEFUN (debug_ospf_lsa,
   return debug_ospf_lsa_common(vty, 0, argc, argv);
 }
 
-ALIAS (debug_ospf_lsa,
-       debug_ospf_lsa_sub_cmd,
-       "debug ospf lsa (generate|flooding|install|refresh)",
-       DEBUG_STR
-       OSPF_STR
-       "OSPF Link State Advertisement\n"
-       "LSA Generation\n"
-       "LSA Flooding\n"
-       "LSA Install/Delete\n"
-       "LSA Refresh\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf <1-65535> lsa (generate|flooding|install|refresh)",
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "Instance ID\n"
+ *     "OSPF Link State Advertisement\n"
+ *     "LSA Generation\n"
+ *     "LSA Flooding\n"
+ *     "LSA Install/Delete\n"
+ *     "LSA Refresh\n"
+ *
+ */
 DEFUN (debug_ospf_instance_lsa,
        debug_ospf_instance_lsa_cmd,
        "debug ospf <1-65535> lsa",
@@ -1517,17 +1552,6 @@ DEFUN (debug_ospf_instance_lsa,
   return debug_ospf_lsa_common(vty, 1, argc, argv);
 }
 
-ALIAS (debug_ospf_instance_lsa,
-       debug_ospf_instance_lsa_sub_cmd,
-       "debug ospf <1-65535> lsa (generate|flooding|install|refresh)",
-       DEBUG_STR
-       OSPF_STR
-       "Instance ID\n"
-       "OSPF Link State Advertisement\n"
-       "LSA Generation\n"
-       "LSA Flooding\n"
-       "LSA Install/Delete\n"
-       "LSA Refresh\n")
 
 static int
 no_debug_ospf_lsa_common (struct vty *vty, int arg_base, int argc, struct cmd_token **argv)
@@ -1569,6 +1593,19 @@ no_debug_ospf_lsa_common (struct vty *vty, int arg_base, int argc, struct cmd_to
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf lsa (generate|flooding|install|refresh)",
+ *     NO_STR
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "OSPF Link State Advertisement\n"
+ *     "LSA Generation\n"
+ *     "LSA Flooding\n"
+ *     "LSA Install/Delete\n"
+ *     "LSA Refres\n"
+ *
+ */
 DEFUN (no_debug_ospf_lsa,
        no_debug_ospf_lsa_cmd,
        "no debug ospf lsa",
@@ -1580,18 +1617,21 @@ DEFUN (no_debug_ospf_lsa,
   return no_debug_ospf_lsa_common (vty, 0, argc, argv);
 }
 
-ALIAS (no_debug_ospf_lsa,
-       no_debug_ospf_lsa_sub_cmd,
-       "no debug ospf lsa (generate|flooding|install|refresh)",
-       NO_STR
-       DEBUG_STR
-       OSPF_STR
-       "OSPF Link State Advertisement\n"
-       "LSA Generation\n"
-       "LSA Flooding\n"
-       "LSA Install/Delete\n"
-       "LSA Refres\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf <1-65535> lsa (generate|flooding|install|refresh)",
+ *     NO_STR
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "Instance ID\n"
+ *     "OSPF Link State Advertisement\n"
+ *     "LSA Generation\n"
+ *     "LSA Flooding\n"
+ *     "LSA Install/Delete\n"
+ *     "LSA Refres\n"
+ *
+ */
 DEFUN (no_debug_ospf_instance_lsa,
        no_debug_ospf_instance_lsa_cmd,
        "no debug ospf <1-65535> lsa",
@@ -1610,18 +1650,6 @@ DEFUN (no_debug_ospf_instance_lsa,
   return no_debug_ospf_lsa_common (vty, 1, argc, argv);
 }
 
-ALIAS (no_debug_ospf_instance_lsa,
-       no_debug_ospf_instance_lsa_sub_cmd,
-       "no debug ospf <1-65535> lsa (generate|flooding|install|refresh)",
-       NO_STR
-       DEBUG_STR
-       OSPF_STR
-       "Instance ID\n"
-       "OSPF Link State Advertisement\n"
-       "LSA Generation\n"
-       "LSA Flooding\n"
-       "LSA Install/Delete\n"
-       "LSA Refres\n")
 
 
 static int
@@ -1656,6 +1684,16 @@ debug_ospf_zebra_common (struct vty *vty, int arg_base, int argc, struct cmd_tok
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf zebra (interface|redistribute)",
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "OSPF Zebra information\n"
+ *     "Zebra interface\n"
+ *     "Zebra redistribute\n"
+ *
+ */
 DEFUN (debug_ospf_zebra,
        debug_ospf_zebra_cmd,
        "debug ospf zebra",
@@ -1666,15 +1704,18 @@ DEFUN (debug_ospf_zebra,
   return debug_ospf_zebra_common(vty, 0, argc, argv);
 }
 
-ALIAS (debug_ospf_zebra,
-       debug_ospf_zebra_sub_cmd,
-       "debug ospf zebra (interface|redistribute)",
-       DEBUG_STR
-       OSPF_STR
-       "OSPF Zebra information\n"
-       "Zebra interface\n"
-       "Zebra redistribute\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "debug ospf <1-65535> zebra (interface|redistribute)",
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "Instance ID\n"
+ *     "OSPF Zebra information\n"
+ *     "Zebra interface\n"
+ *     "Zebra redistribute\n"
+ *
+ */
 DEFUN (debug_ospf_instance_zebra,
        debug_ospf_instance_zebra_cmd,
        "debug ospf <1-65535> zebra",
@@ -1692,15 +1733,6 @@ DEFUN (debug_ospf_instance_zebra,
   return debug_ospf_zebra_common(vty, 1, argc, argv);
 }
 
-ALIAS (debug_ospf_instance_zebra,
-       debug_ospf_instance_zebra_sub_cmd,
-       "debug ospf <1-65535> zebra (interface|redistribute)",
-       DEBUG_STR
-       OSPF_STR
-       "Instance ID\n"
-       "OSPF Zebra information\n"
-       "Zebra interface\n"
-       "Zebra redistribute\n")
 
 static int
 no_debug_ospf_zebra_common(struct vty *vty, int arg_base, int argc,
@@ -1735,6 +1767,17 @@ no_debug_ospf_zebra_common(struct vty *vty, int arg_base, int argc,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf zebra (interface|redistribute)",
+ *     NO_STR
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "OSPF Zebra information\n"
+ *     "Zebra interface\n"
+ *     "Zebra redistribute\n"
+ *
+ */
 DEFUN (no_debug_ospf_zebra,
        no_debug_ospf_zebra_cmd,
        "no debug ospf zebra",
@@ -1746,16 +1789,19 @@ DEFUN (no_debug_ospf_zebra,
   return no_debug_ospf_zebra_common(vty, 0, argc, argv);
 }
 
-ALIAS (no_debug_ospf_zebra,
-       no_debug_ospf_zebra_sub_cmd,
-       "no debug ospf zebra (interface|redistribute)",
-       NO_STR
-       DEBUG_STR
-       OSPF_STR
-       "OSPF Zebra information\n"
-       "Zebra interface\n"
-       "Zebra redistribute\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no debug ospf <1-65535> zebra (interface|redistribute)",
+ *     NO_STR
+ *     DEBUG_STR
+ *     OSPF_STR
+ *     "Instance ID\n"
+ *     "OSPF Zebra information\n"
+ *     "Zebra interface\n"
+ *     "Zebra redistribute\n"
+ *
+ */
 DEFUN (no_debug_ospf_instance_zebra,
        no_debug_ospf_instance_zebra_cmd,
        "no debug ospf <1-65535> zebra",
@@ -1774,16 +1820,6 @@ DEFUN (no_debug_ospf_instance_zebra,
   return no_debug_ospf_zebra_common(vty, 1, argc, argv);
 }
 
-ALIAS (no_debug_ospf_instance_zebra,
-       no_debug_ospf_instance_zebra_sub_cmd,
-       "no debug ospf <1-65535> zebra (interface|redistribute)",
-       NO_STR
-       DEBUG_STR
-       OSPF_STR
-       "Instance ID\n"
-       "OSPF Zebra information\n"
-       "Zebra interface\n"
-       "Zebra redistribute\n")
 
 
 DEFUN (debug_ospf_event,
@@ -2286,116 +2322,68 @@ debug_init ()
   install_node (&debug_node, config_write_debug);
 
   install_element (ENABLE_NODE, &show_debugging_ospf_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_packet_send_recv_detail_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_packet_send_recv_cmd);
   install_element (ENABLE_NODE, &debug_ospf_packet_all_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_ism_sub_cmd);
   install_element (ENABLE_NODE, &debug_ospf_ism_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_nsm_sub_cmd);
   install_element (ENABLE_NODE, &debug_ospf_nsm_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_lsa_sub_cmd);
   install_element (ENABLE_NODE, &debug_ospf_lsa_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_zebra_sub_cmd);
   install_element (ENABLE_NODE, &debug_ospf_zebra_cmd);
   install_element (ENABLE_NODE, &debug_ospf_event_cmd);
   install_element (ENABLE_NODE, &debug_ospf_nssa_cmd);
   install_element (ENABLE_NODE, &debug_ospf_te_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_packet_send_recv_detail_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_packet_send_recv_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_packet_all_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_ism_sub_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_ism_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_nsm_sub_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_nsm_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_lsa_sub_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_lsa_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_zebra_sub_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_zebra_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_event_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_nssa_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_te_cmd);
 
   install_element (ENABLE_NODE, &show_debugging_ospf_instance_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_instance_packet_send_recv_detail_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_instance_packet_send_recv_cmd);
   install_element (ENABLE_NODE, &debug_ospf_instance_packet_all_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_instance_ism_sub_cmd);
   install_element (ENABLE_NODE, &debug_ospf_instance_ism_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_instance_nsm_sub_cmd);
   install_element (ENABLE_NODE, &debug_ospf_instance_nsm_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_instance_lsa_sub_cmd);
   install_element (ENABLE_NODE, &debug_ospf_instance_lsa_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_instance_zebra_sub_cmd);
   install_element (ENABLE_NODE, &debug_ospf_instance_zebra_cmd);
   install_element (ENABLE_NODE, &debug_ospf_instance_event_cmd);
   install_element (ENABLE_NODE, &debug_ospf_instance_nssa_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_instance_packet_send_recv_detail_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_instance_packet_send_recv_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_instance_packet_all_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_instance_ism_sub_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_instance_ism_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_instance_nsm_sub_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_instance_nsm_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_instance_lsa_sub_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_instance_lsa_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_instance_zebra_sub_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_instance_zebra_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_instance_event_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_instance_nssa_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_cmd);
 
-  install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_detail_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_cmd);
   install_element (CONFIG_NODE, &debug_ospf_packet_all_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_ism_sub_cmd);
   install_element (CONFIG_NODE, &debug_ospf_ism_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_nsm_sub_cmd);
   install_element (CONFIG_NODE, &debug_ospf_nsm_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_lsa_sub_cmd);
   install_element (CONFIG_NODE, &debug_ospf_lsa_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_zebra_sub_cmd);
   install_element (CONFIG_NODE, &debug_ospf_zebra_cmd);
   install_element (CONFIG_NODE, &debug_ospf_event_cmd);
   install_element (CONFIG_NODE, &debug_ospf_nssa_cmd);
   install_element (CONFIG_NODE, &debug_ospf_te_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_packet_send_recv_detail_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_packet_send_recv_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_packet_all_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_ism_sub_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_ism_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_nsm_sub_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_nsm_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_lsa_sub_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_lsa_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_zebra_sub_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_zebra_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_event_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_nssa_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_te_cmd);
 
-  install_element (CONFIG_NODE, &debug_ospf_instance_packet_send_recv_detail_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_instance_packet_send_recv_cmd);
   install_element (CONFIG_NODE, &debug_ospf_instance_packet_all_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_instance_ism_sub_cmd);
   install_element (CONFIG_NODE, &debug_ospf_instance_ism_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_instance_nsm_sub_cmd);
   install_element (CONFIG_NODE, &debug_ospf_instance_nsm_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_instance_lsa_sub_cmd);
   install_element (CONFIG_NODE, &debug_ospf_instance_lsa_cmd);
-  install_element (CONFIG_NODE, &debug_ospf_instance_zebra_sub_cmd);
   install_element (CONFIG_NODE, &debug_ospf_instance_zebra_cmd);
   install_element (CONFIG_NODE, &debug_ospf_instance_event_cmd);
   install_element (CONFIG_NODE, &debug_ospf_instance_nssa_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_instance_packet_send_recv_detail_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_instance_packet_send_recv_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_instance_packet_all_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_instance_ism_sub_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_instance_ism_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_instance_nsm_sub_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_instance_nsm_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_instance_lsa_sub_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_instance_lsa_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_instance_zebra_sub_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_instance_zebra_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_instance_event_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_instance_nssa_cmd);
index 33980b35c61b75b361a5ca16dbbb60350a57186e..9ffb50896f6d7caaf3d2a86f34e055433895121c 100644 (file)
@@ -763,6 +763,13 @@ out:
  * Followings are (vty) configuration functions for Opaque-LSAs handling.
  *------------------------------------------------------------------------*/
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ospf opaque-lsa",
+ *     "OSPF specific commands\n"
+ *     "Enable the Opaque-LSA capability (rfc2370)\n"
+ *
+ */
 DEFUN (capability_opaque,
        capability_opaque_cmd,
        "capability opaque",
@@ -786,12 +793,15 @@ DEFUN (capability_opaque,
   return CMD_SUCCESS;
 }
 
-ALIAS (capability_opaque,
-       ospf_opaque_capable_cmd,
-       "ospf opaque-lsa",
-       "OSPF specific commands\n"
-       "Enable the Opaque-LSA capability (rfc2370)\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ospf opaque-lsa",
+ *     NO_STR
+ *     "OSPF specific commands\n"
+ *     "Disable the Opaque-LSA capability (rfc2370)\n"
+ *
+ */
 DEFUN (no_capability_opaque,
        no_capability_opaque_cmd,
        "no capability opaque",
@@ -816,20 +826,12 @@ DEFUN (no_capability_opaque,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_capability_opaque,
-       no_ospf_opaque_capable_cmd,
-       "no ospf opaque-lsa",
-       NO_STR
-       "OSPF specific commands\n"
-       "Disable the Opaque-LSA capability (rfc2370)\n")
 
 static void
 ospf_opaque_register_vty (void)
 {
   install_element (OSPF_NODE, &capability_opaque_cmd);
   install_element (OSPF_NODE, &no_capability_opaque_cmd);
-  install_element (OSPF_NODE, &ospf_opaque_capable_cmd);
-  install_element (OSPF_NODE, &no_ospf_opaque_capable_cmd);
   return;
 }
 
index 0ea25ceb947cdf0cbd0f55ebde5621eb245554ae..04601b994d44d36e45ecae1b5b563bd6f0451e1f 100644 (file)
@@ -1174,6 +1174,13 @@ ospf_router_info_config_write_router (struct vty *vty)
  * Followings are vty command functions.
  *------------------------------------------------------------------------*/
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "router-info as",
+ *     OSPF_RI_STR
+ *     "Enable the Router Information functionality with AS flooding scope\n"
+ *
+ */
 DEFUN (router_info,
        router_info_area_cmd,
        "router-info area A.B.C.D",
@@ -1236,11 +1243,6 @@ DEFUN (router_info,
 
 }
 
-ALIAS (router_info,
-       router_info_as_cmd,
-       "router-info as",
-       OSPF_RI_STR
-       "Enable the Router Information functionality with AS flooding scope\n")
 
 DEFUN (no_router_info,
        no_router_info_cmd,
@@ -1625,7 +1627,6 @@ ospf_router_info_register_vty (void)
   install_element (ENABLE_NODE, &show_ip_ospf_router_info_pce_cmd);
 
   install_element (OSPF_NODE, &router_info_area_cmd);
-  install_element (OSPF_NODE, &router_info_as_cmd);
   install_element (OSPF_NODE, &no_router_info_cmd);
   install_element (OSPF_NODE, &pce_address_cmd);
   install_element (OSPF_NODE, &pce_path_scope_cmd);
index 1836660844c773bedfbb0e1bbbba40553682eaa6..f38e45e426a605cfb5d271aff6d0f5eaf0039e4f 100644 (file)
@@ -703,6 +703,18 @@ DEFUN (match_ip_nexthop,
   return ospf_route_match_add (vty, vty->index, "ip next-hop", argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip next-hop (<1-199>|<1300-2699>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match next-hop address of route\n"
+ *     "IP access-list number\n"
+ *     "IP access-list number (expanded range)\n"
+ *     "IP access-list name\n"
+ *
+ */
 DEFUN (no_match_ip_nexthop,
        no_match_ip_nexthop_cmd,
        "no match ip next-hop",
@@ -714,16 +726,6 @@ DEFUN (no_match_ip_nexthop,
   return ospf_route_match_delete (vty, vty->index, "ip next-hop", argv[4]->arg);
 }
 
-ALIAS (no_match_ip_nexthop,
-       no_match_ip_nexthop_val_cmd,
-       "no match ip next-hop (<1-199>|<1300-2699>|WORD)",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match next-hop address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP access-list name\n")
 
 DEFUN (match_ip_next_hop_prefix_list,
        match_ip_next_hop_prefix_list_cmd,
@@ -738,6 +740,17 @@ DEFUN (match_ip_next_hop_prefix_list,
                               argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip next-hop prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match next-hop address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_next_hop_prefix_list,
        no_match_ip_next_hop_prefix_list_cmd,
        "no match ip next-hop prefix-list",
@@ -751,15 +764,6 @@ DEFUN (no_match_ip_next_hop_prefix_list,
                                  argv[5]->arg);
 }
 
-ALIAS (no_match_ip_next_hop_prefix_list,
-       no_match_ip_next_hop_prefix_list_val_cmd,
-       "no match ip next-hop prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match next-hop address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
 DEFUN (match_ip_address,
        match_ip_address_cmd,
@@ -774,6 +778,18 @@ DEFUN (match_ip_address,
   return ospf_route_match_add (vty, vty->index, "ip address", argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address (<1-199>|<1300-2699>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *     "IP access-list number\n"
+ *     "IP access-list number (expanded range)\n"
+ *     "IP access-list name\n"
+ *
+ */
 DEFUN (no_match_ip_address,
        no_match_ip_address_cmd,
        "no match ip address",
@@ -785,16 +801,6 @@ DEFUN (no_match_ip_address,
   return ospf_route_match_delete (vty, vty->index, "ip address", argv[4]->arg);
 }
 
-ALIAS (no_match_ip_address,
-       no_match_ip_address_val_cmd,
-       "no match ip address (<1-199>|<1300-2699>|WORD)",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP access-list name\n")
 
 DEFUN (match_ip_address_prefix_list,
        match_ip_address_prefix_list_cmd,
@@ -809,6 +815,17 @@ DEFUN (match_ip_address_prefix_list,
                               argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_address_prefix_list,
        no_match_ip_address_prefix_list_cmd,
        "no match ip address prefix-list",
@@ -822,15 +839,6 @@ DEFUN (no_match_ip_address_prefix_list,
                                  argv[5]->arg);
 }
 
-ALIAS (no_match_ip_address_prefix_list,
-       no_match_ip_address_prefix_list_val_cmd,
-       "no match ip address prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
 DEFUN (match_interface,
        match_interface_cmd,
@@ -842,6 +850,15 @@ DEFUN (match_interface,
   return ospf_route_match_add (vty, vty->index, "interface", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match interface WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match first hop interface of route\n"
+ *     "Interface name\n"
+ *
+ */
 DEFUN (no_match_interface,
        no_match_interface_cmd,
        "no match interface",
@@ -852,13 +869,6 @@ DEFUN (no_match_interface,
   return ospf_route_match_delete (vty, vty->index, "interface", argv[3]->arg);
 }
 
-ALIAS (no_match_interface,
-       no_match_interface_val_cmd,
-       "no match interface WORD",
-       NO_STR
-       MATCH_STR
-       "Match first hop interface of route\n"
-       "Interface name\n")
 
 DEFUN (match_tag,
        match_tag_cmd,
@@ -870,6 +880,15 @@ DEFUN (match_tag,
   return ospf_route_match_add (vty, vty->index, "tag", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match tag <1-65535>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match tag of route\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (no_match_tag,
        no_match_tag_cmd,
        "no match tag",
@@ -880,13 +899,6 @@ DEFUN (no_match_tag,
   return ospf_route_match_delete (vty, vty->index, "tag", argv[3]->arg);
 }
 
-ALIAS (no_match_tag,
-       no_match_tag_val_cmd,
-       "no match tag <1-65535>",
-       NO_STR
-       MATCH_STR
-       "Match tag of route\n"
-       "Tag value\n")
 
 DEFUN (set_metric,
        set_metric_cmd,
@@ -898,6 +910,15 @@ DEFUN (set_metric,
   return ospf_route_set_add (vty, vty->index, "metric", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set metric <0-4294967295>",
+ *     NO_STR
+ *     SET_STR
+ *     "Metric value for destination routing protocol\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_set_metric,
        no_set_metric_cmd,
        "no set metric",
@@ -908,13 +929,6 @@ DEFUN (no_set_metric,
   return ospf_route_set_delete (vty, vty->index, "metric", argv[3]->arg);
 }
 
-ALIAS (no_set_metric,
-       no_set_metric_val_cmd,
-       "no set metric <0-4294967295>",
-       NO_STR
-       SET_STR
-       "Metric value for destination routing protocol\n"
-       "Metric value\n")
 
 DEFUN (set_metric_type,
        set_metric_type_cmd,
@@ -932,6 +946,16 @@ DEFUN (set_metric_type,
   return ospf_route_set_add (vty, vty->index, "metric-type", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set metric-type (type-1|type-2)",
+ *     NO_STR
+ *     SET_STR
+ *     "Type of metric for destination routing protocol\n"
+ *     "OSPF[6] external type 1 metric\n"
+ *     "OSPF[6] external type 2 metric\n"
+ *
+ */
 DEFUN (no_set_metric_type,
        no_set_metric_type_cmd,
        "no set metric-type",
@@ -942,14 +966,6 @@ DEFUN (no_set_metric_type,
   return ospf_route_set_delete (vty, vty->index, "metric-type", argv[3]->arg);
 }
 
-ALIAS (no_set_metric_type,
-       no_set_metric_type_val_cmd,
-       "no set metric-type (type-1|type-2)",
-       NO_STR
-       SET_STR
-       "Type of metric for destination routing protocol\n"
-       "OSPF[6] external type 1 metric\n"
-       "OSPF[6] external type 2 metric\n")
 
 DEFUN (set_tag,
        set_tag_cmd,
@@ -961,6 +977,15 @@ DEFUN (set_tag,
   return ospf_route_set_add (vty, vty->index, "tag", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set tag <1-65535>",
+ *     NO_STR
+ *     SET_STR
+ *     "Tag value for routing protocol\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (no_set_tag,
        no_set_tag_cmd,
        "no set tag",
@@ -971,13 +996,6 @@ DEFUN (no_set_tag,
   return ospf_route_set_delete (vty, vty->index, "tag", argv[3]->arg);
 }
 
-ALIAS (no_set_tag,
-       no_set_tag_val_cmd,
-       "no set tag <1-65535>",
-       NO_STR
-       SET_STR
-       "Tag value for routing protocol\n"
-       "Tag value\n")
 
 /* Route-map init */
 void
@@ -1003,30 +1021,21 @@ ospf_route_map_init (void)
 
   install_element (RMAP_NODE, &match_ip_nexthop_cmd);
   install_element (RMAP_NODE, &no_match_ip_nexthop_cmd);
-  install_element (RMAP_NODE, &no_match_ip_nexthop_val_cmd);
   install_element (RMAP_NODE, &match_ip_next_hop_prefix_list_cmd);
   install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_cmd);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_val_cmd);
   install_element (RMAP_NODE, &match_ip_address_cmd);
   install_element (RMAP_NODE, &no_match_ip_address_cmd);
-  install_element (RMAP_NODE, &no_match_ip_address_val_cmd);
   install_element (RMAP_NODE, &match_ip_address_prefix_list_cmd);
   install_element (RMAP_NODE, &no_match_ip_address_prefix_list_cmd);
-  install_element (RMAP_NODE, &no_match_ip_address_prefix_list_val_cmd);
   install_element (RMAP_NODE, &match_interface_cmd);
   install_element (RMAP_NODE, &no_match_interface_cmd);
-  install_element (RMAP_NODE, &no_match_interface_val_cmd);
   install_element (RMAP_NODE, &match_tag_cmd);
   install_element (RMAP_NODE, &no_match_tag_cmd);
-  install_element (RMAP_NODE, &no_match_tag_val_cmd);
 
   install_element (RMAP_NODE, &set_metric_cmd);
   install_element (RMAP_NODE, &no_set_metric_cmd);
-  install_element (RMAP_NODE, &no_set_metric_val_cmd);
   install_element (RMAP_NODE, &set_metric_type_cmd);
   install_element (RMAP_NODE, &no_set_metric_type_cmd);
-  install_element (RMAP_NODE, &no_set_metric_type_val_cmd);
   install_element (RMAP_NODE, &set_tag_cmd);
   install_element (RMAP_NODE, &no_set_tag_cmd);
-  install_element (RMAP_NODE, &no_set_tag_val_cmd);
 }
index 4b0247526777ee05fab2b8c0ee0755c9ec292db2..4505fb3c47e618bf4345ef55747ecbce20b8fdff 100644 (file)
@@ -2297,6 +2297,14 @@ DEFUN (ospf_mpls_te_on,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no mpls-te on",
+ *     NO_STR
+ *     MPLS_TE_STR
+ *     "Disable the MPLS-TE functionality\n"
+ *
+ */
 DEFUN (no_ospf_mpls_te,
        no_ospf_mpls_te_cmd,
        "no mpls-te",
@@ -2325,12 +2333,6 @@ DEFUN (no_ospf_mpls_te,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_mpls_te,
-       no_ospf_mpls_te_val_cmd,
-       "no mpls-te on",
-       NO_STR
-       MPLS_TE_STR
-       "Disable the MPLS-TE functionality\n")
 
 DEFUN (ospf_mpls_te_router_addr,
        ospf_mpls_te_router_addr_cmd,
@@ -2655,7 +2657,6 @@ ospf_mpls_te_register_vty (void)
 
   install_element (OSPF_NODE, &ospf_mpls_te_on_cmd);
   install_element (OSPF_NODE, &no_ospf_mpls_te_cmd);
-  install_element (OSPF_NODE, &no_ospf_mpls_te_val_cmd);
   install_element (OSPF_NODE, &ospf_mpls_te_router_addr_cmd);
   install_element (OSPF_NODE, &ospf_mpls_te_inter_as_cmd);
   install_element (OSPF_NODE, &ospf_mpls_te_inter_as_area_cmd);
index 30c63ea353c4ee36252814f6b1cdf6f9bf3062b8..e88f9789e06573843acf9c59796e759589cd2b57 100644 (file)
@@ -144,6 +144,14 @@ ospf_oi_count (struct interface *ifp)
 }
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "router ospf <1-65535>",
+ *     "Enable a routing process\n"
+ *     "Start OSPF configuration\n"
+ *     "Instance ID\n"
+ *
+ */
 DEFUN (router_ospf,
        router_ospf_cmd,
        "router ospf",
@@ -181,13 +189,16 @@ DEFUN (router_ospf,
   return CMD_SUCCESS;
 }
 
-ALIAS (router_ospf,
-       router_ospf_instance_cmd,
-       "router ospf <1-65535>",
-       "Enable a routing process\n"
-       "Start OSPF configuration\n"
-       "Instance ID\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no router ospf <1-65535>",
+ *     NO_STR
+ *     "Enable a routing process\n"
+ *     "Start OSPF configuration\n"
+ *     "Instance ID\n"
+ *
+ */
 DEFUN (no_router_ospf,
        no_router_ospf_cmd,
        "no router ospf",
@@ -209,13 +220,6 @@ DEFUN (no_router_ospf,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_router_ospf,
-       no_router_ospf_instance_cmd,
-       "no router ospf <1-65535>",
-       NO_STR
-       "Enable a routing process\n"
-       "Start OSPF configuration\n"
-       "Instance ID\n")
 
 DEFUN (ospf_router_id,
        ospf_router_id_cmd,
@@ -261,6 +265,15 @@ ALIAS_HIDDEN (ospf_router_id,
               "router-id for the OSPF process\n"
               "OSPF router-id in IP address format\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ospf router-id A.B.C.D",
+ *     NO_STR
+ *     "OSPF specific commands\n"
+ *     "router-id for the OSPF process\n"
+ *     "OSPF router-id in IP address format\n"
+ *
+ */
 DEFUN (no_ospf_router_id,
        no_ospf_router_id_cmd,
        "no ospf router-id",
@@ -290,13 +303,6 @@ DEFUN (no_ospf_router_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_router_id,
-       no_ospf_router_id_val_cmd,
-       "no ospf router-id A.B.C.D",
-       NO_STR
-       "OSPF specific commands\n"
-       "router-id for the OSPF process\n"
-       "OSPF router-id in IP address format\n")
 
 static void
 ospf_passive_interface_default (struct ospf *ospf, u_char newval)
@@ -361,6 +367,17 @@ ospf_passive_interface_update (struct ospf *ospf, struct interface *ifp,
     }
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "passive-interface IFNAME",
+ *     "Suppress routing updates on an interface\n"
+ *     "Interface's name\n"
+ *
+ * "passive-interface default",
+ *     "Suppress routing updates on an interface\n"
+ *     "Suppress routing updates on interfaces by default\n"
+ *
+ */
 DEFUN (ospf_passive_interface,
        ospf_passive_interface_addr_cmd,
        "passive-interface IFNAME A.B.C.D",
@@ -430,18 +447,21 @@ DEFUN (ospf_passive_interface,
  return CMD_SUCCESS;
 }
 
-ALIAS (ospf_passive_interface,
-       ospf_passive_interface_cmd,
-       "passive-interface IFNAME",
-       "Suppress routing updates on an interface\n"
-       "Interface's name\n")
 
-ALIAS (ospf_passive_interface,
-       ospf_passive_interface_default_cmd,
-       "passive-interface default",
-       "Suppress routing updates on an interface\n"
-       "Suppress routing updates on interfaces by default\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no passive-interface default",
+ *     NO_STR
+ *     "Allow routing updates on an interface\n"
+ *     "Allow routing updates on interfaces by default\n"
+ *
+ * "no passive-interface IFNAME",
+ *     NO_STR
+ *     "Allow routing updates on an interface\n"
+ *     "Interface's name\n"
+ *
+ */
 DEFUN (no_ospf_passive_interface,
        no_ospf_passive_interface_addr_cmd,
        "no passive-interface IFNAME A.B.C.D",
@@ -505,19 +525,7 @@ DEFUN (no_ospf_passive_interface,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_passive_interface,
-       no_ospf_passive_interface_cmd,
-       "no passive-interface IFNAME",
-       NO_STR
-       "Allow routing updates on an interface\n"
-       "Interface's name\n")
 
-ALIAS (no_ospf_passive_interface,
-       no_ospf_passive_interface_default_cmd,
-       "no passive-interface default",
-       NO_STR
-       "Allow routing updates on an interface\n"
-       "Allow routing updates on interfaces by default\n")
        
 DEFUN (ospf_network_area,
        ospf_network_area_cmd,
@@ -605,6 +613,36 @@ DEFUN (no_ospf_network_area,
 }
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise",
+ *     "OSPF area parameters\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *     "OSPF area range for route advertise (default)\n"
+ *     "Area range prefix\n"
+ *     "Advertise this range (default)\n"
+ *
+ * "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M cost <0-16777215>",
+ *     "OSPF area parameters\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *     "Summarize routes matching address/mask (border routers only)\n"
+ *     "Area range prefix\n"
+ *     "User specified metric for this range\n"
+ *     "Advertised metric for this range\n"
+ *
+ * "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise cost <0-16777215>",
+ *     "OSPF area parameters\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *     "Summarize routes matching address/mask (border routers only)\n"
+ *     "Area range prefix\n"
+ *     "Advertise this range (default)\n"
+ *     "User specified metric for this range\n"
+ *     "Advertised metric for this range\n"
+ *
+ */
 DEFUN (ospf_area_range,
        ospf_area_range_cmd,
        "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M",
@@ -636,38 +674,8 @@ DEFUN (ospf_area_range,
   return CMD_SUCCESS;
 }
 
-ALIAS (ospf_area_range,
-       ospf_area_range_advertise_cmd,
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise",
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "OSPF area range for route advertise (default)\n"
-       "Area range prefix\n"
-       "Advertise this range (default)\n")
 
-ALIAS (ospf_area_range,
-       ospf_area_range_cost_cmd,
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M cost <0-16777215>",
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
 
-ALIAS (ospf_area_range,
-       ospf_area_range_advertise_cost_cmd,
-       "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise cost <0-16777215>",
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "Advertise this range (default)\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
 
 DEFUN (ospf_area_range_not_advertise,
        ospf_area_range_not_advertise_cmd,
@@ -695,6 +703,40 @@ DEFUN (ospf_area_range_not_advertise,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M (advertise|not-advertise)",
+ *     NO_STR
+ *     "OSPF area parameters\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *     "Summarize routes matching address/mask (border routers only)\n"
+ *     "Area range prefix\n"
+ *     "Advertise this range (default)\n"
+ *     "DoNotAdvertise this range\n"
+ *
+ * "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise cost <0-16777215>",
+ *     NO_STR
+ *     "OSPF area parameters\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *     "Summarize routes matching address/mask (border routers only)\n"
+ *     "Area range prefix\n"
+ *     "Advertise this range (default)\n"
+ *     "User specified metric for this range\n"
+ *     "Advertised metric for this range\n"
+ *
+ * "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M cost <0-16777215>",
+ *     NO_STR
+ *     "OSPF area parameters\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *     "Summarize routes matching address/mask (border routers only)\n"
+ *     "Area range prefix\n"
+ *     "User specified metric for this range\n"
+ *     "Advertised metric for this range\n"
+ *
+ */
 DEFUN (no_ospf_area_range,
        no_ospf_area_range_cmd,
        "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M",
@@ -721,42 +763,8 @@ DEFUN (no_ospf_area_range,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_area_range,
-       no_ospf_area_range_advertise_cmd,
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M (advertise|not-advertise)",
-       NO_STR
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "Advertise this range (default)\n"
-       "DoNotAdvertise this range\n")
 
-ALIAS (no_ospf_area_range,
-       no_ospf_area_range_cost_cmd,
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M cost <0-16777215>",
-       NO_STR
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
 
-ALIAS (no_ospf_area_range,
-       no_ospf_area_range_advertise_cost_cmd,
-       "no area (A.B.C.D|<0-4294967295>) range A.B.C.D/M advertise cost <0-16777215>",
-       NO_STR
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Summarize routes matching address/mask (border routers only)\n"
-       "Area range prefix\n"
-       "Advertise this range (default)\n"
-       "User specified metric for this range\n"
-       "Advertised metric for this range\n")
 
 DEFUN (ospf_area_range_substitute,
        ospf_area_range_substitute_cmd,
@@ -1069,6 +1077,89 @@ ospf_vl_set (struct ospf *ospf, struct ospf_vl_config_data *vl_config)
        "Use MD5 algorithm\n" \
        "The OSPF password (key)"
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) (message-digest|null) "
+ *     "(authentication-key|) AUTH_KEY",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_ALL
+ *     VLINK_HELPSTR_AUTH_SIMPLE
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) "
+ *     "(authentication-key|) AUTH_KEY",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_SIMPLE
+ *     VLINK_HELPSTR_AUTH_SIMPLE
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_TIME_PARAM
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) (message-digest|null)",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_ALL
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(message-digest-key|) <1-255> md5 KEY",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTH_MD5
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) "
+ *     "(message-digest-key|) <1-255> md5 KEY",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_SIMPLE
+ *     VLINK_HELPSTR_AUTH_MD5
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) (message-digest|null) "
+ *     "(message-digest-key|) <1-255> md5 KEY",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_ALL
+ *     VLINK_HELPSTR_AUTH_MD5
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|)",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_SIMPLE
+ *
+ * "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication-key|) AUTH_KEY",
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTH_SIMPLE
+ *
+ */
 DEFUN (ospf_area_vlink,
        ospf_area_vlink_cmd,
        "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D",
@@ -1206,6 +1297,101 @@ DEFUN (ospf_area_vlink,
 
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) "
+ *     "(message-digest-key|) <1-255> md5 KEY",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_SIMPLE
+ *     VLINK_HELPSTR_AUTH_MD5
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *     VLINK_HELPSTR_TIME_PARAM
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_TIME_PARAM
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(message-digest-key|) <1-255> md5 KEY",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTH_MD5
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|)",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_SIMPLE
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) (message-digest|null) "
+ *     "(message-digest-key|) <1-255> md5 KEY",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_ALL
+ *     VLINK_HELPSTR_AUTH_MD5
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) "
+ *     "(authentication-key|) AUTH_KEY",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_SIMPLE
+ *     VLINK_HELPSTR_AUTH_SIMPLE
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication-key|) AUTH_KEY",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTH_SIMPLE
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) (message-digest|null)",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_ALL
+ *
+ * "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
+ *     "(authentication|) (message-digest|null) "
+ *     "(authentication-key|) AUTH_KEY",
+ *     NO_STR
+ *     VLINK_HELPSTR_IPADDR
+ *     VLINK_HELPSTR_AUTHTYPE_ALL
+ *     VLINK_HELPSTR_AUTH_SIMPLE
+ *
+ */
 DEFUN (no_ospf_area_vlink,
        no_ospf_area_vlink_cmd,
        "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D",
@@ -1325,225 +1511,29 @@ DEFUN (no_ospf_area_vlink,
   return ospf_vl_set (ospf, &vl_config);
 }
 
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_param1_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_TIME_PARAM)
 
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_param1_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_TIME_PARAM)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_param2_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_param2_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_param3_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_param3_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_param4_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_param4_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535> "
-       "(hello-interval|retransmit-interval|transmit-delay|dead-interval) <1-65535>",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM
-       VLINK_HELPSTR_TIME_PARAM)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_authtype_args_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null)",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_ALL)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_authtype_args_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null)",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_ALL)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_authtype_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|)",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_SIMPLE)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_authtype_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|)",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_SIMPLE)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_md5_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(message-digest-key|) <1-255> md5 KEY",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTH_MD5)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_md5_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(message-digest-key|) <1-255> md5 KEY",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTH_MD5)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_authkey_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication-key|) AUTH_KEY",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTH_SIMPLE)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_authkey_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication-key|) AUTH_KEY",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTH_SIMPLE)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_authtype_args_authkey_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null) "
-       "(authentication-key|) AUTH_KEY",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_ALL
-       VLINK_HELPSTR_AUTH_SIMPLE)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_authtype_args_authkey_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null) "
-       "(authentication-key|) AUTH_KEY",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_ALL
-       VLINK_HELPSTR_AUTH_SIMPLE)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_authtype_authkey_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(authentication-key|) AUTH_KEY",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_SIMPLE
-       VLINK_HELPSTR_AUTH_SIMPLE)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_authtype_authkey_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(authentication-key|) AUTH_KEY",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_SIMPLE
-       VLINK_HELPSTR_AUTH_SIMPLE)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_authtype_args_md5_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null) "
-       "(message-digest-key|) <1-255> md5 KEY",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_ALL
-       VLINK_HELPSTR_AUTH_MD5)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_authtype_args_md5_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) (message-digest|null) "
-       "(message-digest-key|) <1-255> md5 KEY",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_ALL
-       VLINK_HELPSTR_AUTH_MD5)
-
-ALIAS (ospf_area_vlink,
-       ospf_area_vlink_authtype_md5_cmd,
-       "area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(message-digest-key|) <1-255> md5 KEY",
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_SIMPLE
-       VLINK_HELPSTR_AUTH_MD5)
-
-ALIAS (no_ospf_area_vlink,
-       no_ospf_area_vlink_authtype_md5_cmd,
-       "no area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D "
-       "(authentication|) "
-       "(message-digest-key|) <1-255> md5 KEY",
-       NO_STR
-       VLINK_HELPSTR_IPADDR
-       VLINK_HELPSTR_AUTHTYPE_SIMPLE
-       VLINK_HELPSTR_AUTH_MD5)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 DEFUN (ospf_area_shortcut,
@@ -1829,6 +1819,20 @@ DEFUN (ospf_area_nssa_no_summary,
   return ospf_area_nssa_cmd_handler (vty, argc, argv, 1);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no area (A.B.C.D|<0-4294967295>) nssa (translate-candidate|translate-never|translate-always|) {no-summary}",
+ *     NO_STR
+ *     "OSPF area parameters\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *     "Configure OSPF area as nssa\n"
+ *     "Configure NSSA-ABR for translate election (default)\n"
+ *     "Configure NSSA-ABR to never translate\n"
+ *     "Configure NSSA-ABR to always translate\n"
+ *     "Do not inject inter-area routes into nssa\n"
+ *
+ */
 DEFUN (no_ospf_area_nssa,
        no_ospf_area_nssa_cmd,
        "no area (A.B.C.D|<0-4294967295>) nssa",
@@ -1855,18 +1859,6 @@ DEFUN (no_ospf_area_nssa,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_area_nssa,
-       no_ospf_area_nssa_no_summary_cmd,
-       "no area (A.B.C.D|<0-4294967295>) nssa (translate-candidate|translate-never|translate-always|) {no-summary}",
-       NO_STR
-       "OSPF area parameters\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n"
-       "Configure OSPF area as nssa\n"
-       "Configure NSSA-ABR for translate election (default)\n"
-       "Configure NSSA-ABR to never translate\n"
-       "Configure NSSA-ABR to always translate\n"
-       "Do not inject inter-area routes into nssa\n")
 
 DEFUN (ospf_area_default_cost,
        ospf_area_default_cost_cmd,
@@ -2394,6 +2386,13 @@ DEFUN (no_ospf_log_adjacency_changes_detail,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ospf rfc1583compatibility",
+ *     "OSPF specific commands\n"
+ *     "Enable the RFC1583Compatibility flag\n"
+ *
+ */
 DEFUN (ospf_compatible_rfc1583,
        ospf_compatible_rfc1583_cmd,
        "compatible rfc1583",
@@ -2413,6 +2412,14 @@ DEFUN (ospf_compatible_rfc1583,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ospf rfc1583compatibility",
+ *     NO_STR
+ *     "OSPF specific commands\n"
+ *     "Disable the RFC1583Compatibility flag\n"
+ *
+ */
 DEFUN (no_ospf_compatible_rfc1583,
        no_ospf_compatible_rfc1583_cmd,
        "no compatible rfc1583",
@@ -2433,18 +2440,7 @@ DEFUN (no_ospf_compatible_rfc1583,
   return CMD_SUCCESS;
 }
 
-ALIAS (ospf_compatible_rfc1583,
-       ospf_rfc1583_flag_cmd,
-       "ospf rfc1583compatibility",
-       "OSPF specific commands\n"
-       "Enable the RFC1583Compatibility flag\n")
 
-ALIAS (no_ospf_compatible_rfc1583,
-       no_ospf_rfc1583_flag_cmd,
-       "no ospf rfc1583compatibility",
-       NO_STR
-       "OSPF specific commands\n"
-       "Disable the RFC1583Compatibility flag\n")
 
 static int
 ospf_timers_spf_set (struct vty *vty, unsigned int delay,
@@ -2491,6 +2487,17 @@ DEFUN (ospf_timers_min_ls_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no timers throttle lsa all <0-5000>",
+ *     NO_STR
+ *     "Adjust routing timers\n"
+ *     "Throttling adaptive timer\n"
+ *     "LSA delay between transmissions\n"
+ *     "All LSA types\n"
+ *     "Delay (msec) between sending LSAs\n"
+ *
+ */
 DEFUN (no_ospf_timers_min_ls_interval,
        no_ospf_timers_min_ls_interval_cmd,
        "no timers throttle lsa all",
@@ -2506,15 +2513,6 @@ DEFUN (no_ospf_timers_min_ls_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_timers_min_ls_interval,
-       no_ospf_timers_min_ls_interval_val_cmd,
-       "no timers throttle lsa all <0-5000>",
-       NO_STR
-       "Adjust routing timers\n"
-       "Throttling adaptive timer\n"
-       "LSA delay between transmissions\n"
-       "All LSA types\n"
-       "Delay (msec) between sending LSAs\n")
 
 DEFUN (ospf_timers_min_ls_arrival,
        ospf_timers_min_ls_arrival_cmd,
@@ -2543,6 +2541,16 @@ DEFUN (ospf_timers_min_ls_arrival,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no timers lsa arrival <0-1000>",
+ *     NO_STR
+ *     "Adjust routing timers\n"
+ *     "Throttling link state advertisement delays\n"
+ *     "OSPF minimum arrival interval delay\n"
+ *     "Delay (msec) between accepted LSAs\n"
+ *
+ */
 DEFUN (no_ospf_timers_min_ls_arrival,
        no_ospf_timers_min_ls_arrival_cmd,
        "no timers lsa arrival",
@@ -2561,14 +2569,6 @@ DEFUN (no_ospf_timers_min_ls_arrival,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_timers_min_ls_arrival,
-       no_ospf_timers_min_ls_arrival_val_cmd,
-       "no timers lsa arrival <0-1000>",
-       NO_STR
-       "Adjust routing timers\n"
-       "Throttling link state advertisement delays\n"
-       "OSPF minimum arrival interval delay\n"
-       "Delay (msec) between accepted LSAs\n")
 
 DEFUN (ospf_timers_throttle_spf,
        ospf_timers_throttle_spf_cmd,
@@ -2595,6 +2595,18 @@ DEFUN (ospf_timers_throttle_spf,
   return ospf_timers_spf_set (vty, delay, hold, max);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no timers throttle spf <0-600000> <0-600000> <0-600000>",
+ *     NO_STR
+ *     "Adjust routing timers\n"
+ *     "Throttling adaptive timer\n"
+ *     "OSPF SPF timers\n"
+ *     "Delay (msec) from first change received till SPF calculation\n"
+ *     "Initial hold time (msec) between consecutive SPF calculations\n"
+ *     "Maximum hold time (msec)\n"
+ *
+ */
 DEFUN (no_ospf_timers_throttle_spf,
        no_ospf_timers_throttle_spf_cmd,
        "no timers throttle spf",
@@ -2609,16 +2621,6 @@ DEFUN (no_ospf_timers_throttle_spf,
                               OSPF_SPF_MAX_HOLDTIME_DEFAULT);
 }
 
-ALIAS (no_ospf_timers_throttle_spf,
-       no_ospf_timers_throttle_spf_val_cmd,
-       "no timers throttle spf <0-600000> <0-600000> <0-600000>",
-       NO_STR
-       "Adjust routing timers\n"
-       "Throttling adaptive timer\n"
-       "OSPF SPF timers\n"
-       "Delay (msec) from first change received till SPF calculation\n"
-       "Initial hold time (msec) between consecutive SPF calculations\n"
-       "Maximum hold time (msec)\n")
 
 DEFUN (ospf_timers_lsa,
        ospf_timers_lsa_cmd,
@@ -2647,6 +2649,16 @@ DEFUN (ospf_timers_lsa,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no timers lsa min-arrival <0-600000>",
+ *     NO_STR
+ *     "Adjust routing timers\n"
+ *     "OSPF LSA timers\n"
+ *     "Minimum delay in receiving new version of a LSA\n"
+ *     "Delay in milliseconds\n"
+ *
+ */
 DEFUN (no_ospf_timers_lsa,
        no_ospf_timers_lsa_cmd,
        "no timers lsa min-arrival",
@@ -2675,16 +2687,25 @@ DEFUN (no_ospf_timers_lsa,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_timers_lsa,
-       no_ospf_timers_lsa_val_cmd,
-       "no timers lsa min-arrival <0-600000>",
-       NO_STR
-       "Adjust routing timers\n"
-       "OSPF LSA timers\n"
-       "Minimum delay in receiving new version of a LSA\n"
-       "Delay in milliseconds\n")
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "neighbor A.B.C.D priority <0-255> poll-interval <1-65535>",
+ *     NEIGHBOR_STR
+ *     "Neighbor IP address\n"
+ *     "Neighbor Priority\n"
+ *     "Priority\n"
+ *     "Dead Neighbor Polling interval\n"
+ *     "Seconds\n"
+ *
+ * "neighbor A.B.C.D priority <0-255>",
+ *     NEIGHBOR_STR
+ *     "Neighbor IP address\n"
+ *     "Neighbor Priority\n"
+ *     "Seconds\n"
+ *
+ */
 DEFUN (ospf_neighbor,
        ospf_neighbor_cmd,
        "neighbor A.B.C.D",
@@ -2716,24 +2737,19 @@ DEFUN (ospf_neighbor,
   return CMD_SUCCESS;
 }
 
-ALIAS (ospf_neighbor,
-       ospf_neighbor_priority_poll_interval_cmd,
-       "neighbor A.B.C.D priority <0-255> poll-interval <1-65535>",
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Priority\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n")
 
-ALIAS (ospf_neighbor,
-       ospf_neighbor_priority_cmd,
-       "neighbor A.B.C.D priority <0-255>",
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Seconds\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "neighbor A.B.C.D poll-interval <1-65535> priority <0-255>",
+ *     NEIGHBOR_STR
+ *     "Neighbor address\n"
+ *     "OSPF dead-router polling interval\n"
+ *     "Seconds\n"
+ *     "OSPF priority of non-broadcast neighbor\n"
+ *     "Priority\n"
+ *
+ */
 DEFUN (ospf_neighbor_poll_interval,
        ospf_neighbor_poll_interval_cmd,
        "neighbor A.B.C.D poll-interval <1-65535>",
@@ -2767,16 +2783,42 @@ DEFUN (ospf_neighbor_poll_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (ospf_neighbor_poll_interval,
-       ospf_neighbor_poll_interval_priority_cmd,
-       "neighbor A.B.C.D poll-interval <1-65535> priority <0-255>",
-       NEIGHBOR_STR
-       "Neighbor address\n"
-       "OSPF dead-router polling interval\n"
-       "Seconds\n"
-       "OSPF priority of non-broadcast neighbor\n"
-       "Priority\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no neighbor A.B.C.D priority <0-255> poll-interval <1-65535>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     "Neighbor IP address\n"
+ *     "Neighbor Priority\n"
+ *     "Priority\n"
+ *     "Dead Neighbor Polling interval\n"
+ *     "Seconds\n"
+ *
+ * "no neighbor A.B.C.D priority <0-255>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     "Neighbor IP address\n"
+ *     "Neighbor Priority\n"
+ *     "Priority\n"
+ *
+ * "no neighbor A.B.C.D poll-interval <1-65535>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     "Neighbor IP address\n"
+ *     "Dead Neighbor Polling interval\n"
+ *     "Seconds\n"
+ *
+ * "no neighbor A.B.C.D poll-interval <1-65535> priority <0-255>",
+ *     NO_STR
+ *     NEIGHBOR_STR
+ *     "Neighbor IP address\n"
+ *     "Dead Neighbor Polling interval\n"
+ *     "Seconds\n"
+ *     "OSPF priority of non-broadcast neighbor\n"
+ *     "Priority\n"
+ *
+ */
 DEFUN (no_ospf_neighbor,
        no_ospf_neighbor_cmd,
        "no neighbor A.B.C.D",
@@ -2797,45 +2839,9 @@ DEFUN (no_ospf_neighbor,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_neighbor,
-       no_ospf_neighbor_priority_cmd,
-       "no neighbor A.B.C.D priority <0-255>",
-       NO_STR
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Priority\n")
 
-ALIAS (no_ospf_neighbor,
-       no_ospf_neighbor_poll_interval_cmd,
-       "no neighbor A.B.C.D poll-interval <1-65535>",
-       NO_STR
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n")
 
-ALIAS (no_ospf_neighbor,
-       no_ospf_neighbor_poll_interval_priority_cmd,
-       "no neighbor A.B.C.D poll-interval <1-65535> priority <0-255>",
-       NO_STR
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n"
-       "OSPF priority of non-broadcast neighbor\n"
-       "Priority\n")
 
-ALIAS (no_ospf_neighbor,
-       no_ospf_neighbor_priority_pollinterval_cmd,
-       "no neighbor A.B.C.D priority <0-255> poll-interval <1-65535>",
-       NO_STR
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Priority\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n")
 
 DEFUN (ospf_refresh_timer,
        ospf_refresh_timer_cmd,
@@ -2858,6 +2864,13 @@ DEFUN (ospf_refresh_timer,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no refresh timer",
+ *     "Adjust refresh parameters\n"
+ *     "Unset refresh timer\n"
+ *
+ */
 DEFUN (no_ospf_refresh_timer,
        no_ospf_refresh_timer_val_cmd,
        "no refresh timer <10-1800>",
@@ -2885,11 +2898,6 @@ DEFUN (no_ospf_refresh_timer,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_refresh_timer,
-       no_ospf_refresh_timer_cmd,
-       "no refresh timer",
-       "Adjust refresh parameters\n"
-       "Unset refresh timer\n")
 
 DEFUN (ospf_auto_cost_reference_bandwidth,
        ospf_auto_cost_reference_bandwidth_cmd,
@@ -2924,6 +2932,15 @@ DEFUN (ospf_auto_cost_reference_bandwidth,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no auto-cost reference-bandwidth <1-4294967>",
+ *     NO_STR
+ *     "Calculate OSPF interface cost according to bandwidth\n"
+ *     "Use reference bandwidth method to assign OSPF cost\n"
+ *     "The reference bandwidth in terms of Mbits per second\n"
+ *
+ */
 DEFUN (no_ospf_auto_cost_reference_bandwidth,
        no_ospf_auto_cost_reference_bandwidth_cmd,
        "no auto-cost reference-bandwidth",
@@ -2951,14 +2968,14 @@ DEFUN (no_ospf_auto_cost_reference_bandwidth,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_auto_cost_reference_bandwidth,
-       no_ospf_auto_cost_reference_bandwidth_val_cmd,
-       "no auto-cost reference-bandwidth <1-4294967>",
-       NO_STR
-       "Calculate OSPF interface cost according to bandwidth\n"
-       "Use reference bandwidth method to assign OSPF cost\n"
-       "The reference bandwidth in terms of Mbits per second\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "write-multiplier <1-100>",
+ *     "Write multiplier\n"
+ *     "Maximum number of interface serviced per write\n"
+ *
+ */
 DEFUN (ospf_write_multiplier,
        ospf_write_multiplier_cmd,
        "ospf write-multiplier <1-100>",
@@ -2983,12 +3000,19 @@ DEFUN (ospf_write_multiplier,
   return CMD_SUCCESS;
 }
 
-ALIAS (ospf_write_multiplier,
-       write_multiplier_cmd,
-       "write-multiplier <1-100>",
-       "Write multiplier\n"
-       "Maximum number of interface serviced per write\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no write-multiplier",
+ *     NO_STR
+ *     "Write multiplier\n"
+ *
+ * "no write-multiplier <1-100>",
+ *     NO_STR
+ *     "Write multiplier\n"
+ *     "Maximum number of interface serviced per write\n"
+ *
+ */
 DEFUN (no_ospf_write_multiplier,
        no_ospf_write_multiplier_cmd,
        "no ospf write-multiplier <1-100>",
@@ -3006,18 +3030,7 @@ DEFUN (no_ospf_write_multiplier,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_write_multiplier,
-       no_write_multiplier_cmd,
-       "no write-multiplier",
-       NO_STR
-       "Write multiplier\n")
 
-ALIAS (no_ospf_write_multiplier,
-       no_write_multiplier_val_cmd,
-       "no write-multiplier <1-100>",
-       NO_STR
-       "Write multiplier\n"
-       "Maximum number of interface serviced per write\n")
 
 const char *ospf_abr_type_descr_str[] = 
 {
@@ -5770,6 +5783,46 @@ show_ip_ospf_database_common (struct vty *vty, struct ospf *ospf,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "Link State ID (as an IP address)\n"
+ *
+ * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D (self-originate|)",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "Link State ID (as an IP address)\n"
+ *     "Self-originated link states\n"
+ *     "\n"
+ *
+ * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D adv-router A.B.C.D",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "Link State ID (as an IP address)\n"
+ *     "Advertising Router link states\n"
+ *     "Advertising Router (as an IP address)\n"
+ *
+ * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR "|max-age|self-originate)",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "LSAs in MaxAge list\n"
+ *     "Self-originated link states\n"
+ *
+ */
 DEFUN (show_ip_ospf_database,
        show_ip_ospf_database_cmd,
        "show ip ospf database",
@@ -5786,54 +5839,57 @@ DEFUN (show_ip_ospf_database,
   return (show_ip_ospf_database_common(vty, ospf, 0, argc, argv));
 }
 
-ALIAS (show_ip_ospf_database,
-       show_ip_ospf_database_type_cmd,
-       "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR "|max-age|self-originate)",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "LSAs in MaxAge list\n"
-       "Self-originated link states\n")
-
-ALIAS (show_ip_ospf_database,
-       show_ip_ospf_database_type_id_cmd,
-       "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "Link State ID (as an IP address)\n")
-
-ALIAS (show_ip_ospf_database,
-       show_ip_ospf_database_type_id_adv_router_cmd,
-       "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D adv-router A.B.C.D",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "Link State ID (as an IP address)\n"
-       "Advertising Router link states\n"
-       "Advertising Router (as an IP address)\n")
-
-ALIAS (show_ip_ospf_database,
-       show_ip_ospf_database_type_id_self_cmd,
-       "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D (self-originate|)",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "Link State ID (as an IP address)\n"
-       "Self-originated link states\n"
-       "\n")
-
-DEFUN (show_ip_ospf_instance_database,
-       show_ip_ospf_instance_database_cmd,
-       "show ip ospf <1-65535> database",
+
+
+
+
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D adv-router A.B.C.D",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "Link State ID (as an IP address)\n"
+ *     "Advertising Router link states\n"
+ *     "Advertising Router (as an IP address)\n"
+ *
+ * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "Link State ID (as an IP address)\n"
+ *
+ * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D (self-originate|)",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "Link State ID (as an IP address)\n"
+ *     "Self-originated link states\n"
+ *     "\n"
+ *
+ * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR "|max-age|self-originate)",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "LSAs in MaxAge list\n"
+ *     "Self-originated link states\n"
+ *
+ */
+DEFUN (show_ip_ospf_instance_database,
+       show_ip_ospf_instance_database_cmd,
+       "show ip ospf <1-65535> database",
        SHOW_STR
        IP_STR
        "OSPF information\n"
@@ -5851,54 +5907,9 @@ DEFUN (show_ip_ospf_instance_database,
   return (show_ip_ospf_database_common(vty, ospf, 1, argc, argv));
 }
 
-ALIAS (show_ip_ospf_instance_database,
-       show_ip_ospf_instance_database_type_cmd,
-       "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR "|max-age|self-originate)",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Instance ID\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "LSAs in MaxAge list\n"
-       "Self-originated link states\n")
 
-ALIAS (show_ip_ospf_instance_database,
-       show_ip_ospf_instance_database_type_id_cmd,
-       "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Instance ID\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "Link State ID (as an IP address)\n")
 
-ALIAS (show_ip_ospf_instance_database,
-       show_ip_ospf_instance_database_type_id_adv_router_cmd,
-       "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D adv-router A.B.C.D",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Instance ID\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "Link State ID (as an IP address)\n"
-       "Advertising Router link states\n"
-       "Advertising Router (as an IP address)\n")
 
-ALIAS (show_ip_ospf_instance_database,
-       show_ip_ospf_instance_database_type_id_self_cmd,
-       "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") A.B.C.D (self-originate|)",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Instance ID\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "Link State ID (as an IP address)\n"
-       "Self-originated link states\n"
-       "\n")
 
 
 static int
@@ -5955,6 +5966,17 @@ show_ip_ospf_database_type_adv_router_common (struct vty *vty, struct ospf *ospf
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") (self-originate|)",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "Self-originated link states\n"
+ *
+ */
 DEFUN (show_ip_ospf_database_type_adv_router,
        show_ip_ospf_database_type_adv_router_cmd,
        "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") adv-router A.B.C.D",
@@ -5974,16 +5996,19 @@ DEFUN (show_ip_ospf_database_type_adv_router,
   return (show_ip_ospf_database_type_adv_router_common(vty, ospf, 0, argc, argv));
 }
 
-ALIAS (show_ip_ospf_database_type_adv_router,
-       show_ip_ospf_database_type_self_cmd,
-       "show ip ospf database (" OSPF_LSA_TYPES_CMD_STR ") (self-originate|)",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "Self-originated link states\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") (self-originate|)",
+ *     SHOW_STR
+ *     IP_STR
+ *     "OSPF information\n"
+ *     "Instance ID\n"
+ *     "Database summary\n"
+ *     OSPF_LSA_TYPES_DESC
+ *     "Self-originated link states\n"
+ *
+ */
 DEFUN (show_ip_ospf_instance_database_type_adv_router,
        show_ip_ospf_instance_database_type_adv_router_cmd,
        "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") adv-router A.B.C.D",
@@ -6007,17 +6032,17 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
   return (show_ip_ospf_database_type_adv_router_common(vty, ospf, 1, argc, argv));
 }
 
-ALIAS (show_ip_ospf_instance_database_type_adv_router,
-       show_ip_ospf_instance_database_type_self_cmd,
-       "show ip ospf <1-65535> database (" OSPF_LSA_TYPES_CMD_STR ") (self-originate|)",
-       SHOW_STR
-       IP_STR
-       "OSPF information\n"
-       "Instance ID\n"
-       "Database summary\n"
-       OSPF_LSA_TYPES_DESC
-       "Self-originated link states\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf authentication (null|message-digest)",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Enable authentication on this interface\n"
+ *     "Use null authentication\n"
+ *     "Use message-digest authentication\n"
+ *
+ */
 DEFUN (ip_ospf_authentication_args,
        ip_ospf_authentication_args_addr_cmd,
        "ip ospf authentication (null|message-digest) A.B.C.D",
@@ -6070,15 +6095,15 @@ DEFUN (ip_ospf_authentication_args,
   return CMD_WARNING;
 }
 
-ALIAS (ip_ospf_authentication_args,
-       ip_ospf_authentication_args_cmd,
-       "ip ospf authentication (null|message-digest)",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n"
-       "Use null authentication\n"
-       "Use message-digest authentication\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf authentication",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Enable authentication on this interface\n"
+ *
+ */
 DEFUN (ip_ospf_authentication,
        ip_ospf_authentication_addr_cmd,
        "ip ospf authentication A.B.C.D",
@@ -6115,13 +6140,18 @@ DEFUN (ip_ospf_authentication,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_authentication,
-       ip_ospf_authentication_cmd,
-       "ip ospf authentication",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf authentication (null|message-digest)",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Enable authentication on this interface\n"
+ *     "Use null authentication\n"
+ *     "Use message-digest authentication\n"
+ *
+ */
 DEFUN (no_ip_ospf_authentication_args,
        no_ip_ospf_authentication_args_addr_cmd,
        "no ip ospf authentication (null|message-digest) A.B.C.D",
@@ -6215,16 +6245,16 @@ DEFUN (no_ip_ospf_authentication_args,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_authentication_args,
-       no_ip_ospf_authentication_args_cmd,
-       "no ip ospf authentication (null|message-digest)",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n"
-       "Use null authentication\n"
-       "Use message-digest authentication\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf authentication",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Enable authentication on this interface\n"
+ *
+ */
 DEFUN (no_ip_ospf_authentication,
        no_ip_ospf_authentication_addr_cmd,
        "no ip ospf authentication A.B.C.D",
@@ -6307,14 +6337,16 @@ DEFUN (no_ip_ospf_authentication,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_authentication,
-       no_ip_ospf_authentication_cmd,
-       "no ip ospf authentication",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Enable authentication on this interface\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf authentication-key AUTH_KEY",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Authentication password (key)\n"
+ *     "The OSPF password (key)"
+ *
+ */
 DEFUN (ip_ospf_authentication_key,
        ip_ospf_authentication_key_addr_cmd,
        "ip ospf authentication-key AUTH_KEY A.B.C.D",
@@ -6353,13 +6385,6 @@ DEFUN (ip_ospf_authentication_key,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_authentication_key,
-       ip_ospf_authentication_key_cmd,
-       "ip ospf authentication-key AUTH_KEY",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Authentication password (key)\n"
-       "The OSPF password (key)")
 
 ALIAS_HIDDEN (ip_ospf_authentication_key,
               ospf_authentication_key_cmd,
@@ -6368,6 +6393,39 @@ ALIAS_HIDDEN (ip_ospf_authentication_key,
               "Authentication password (key)\n"
               "The OSPF password (key)")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ospf authentication-key AUTH_KEY A.B.C.D",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Authentication password (key)\n"
+ *     "The OSPF password (key)\n"
+ *     "Address of interface"
+ *
+ * "no ospf authentication-key AUTH_KEY",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Authentication password (key)\n"
+ *     "The OSPF password (key)\n"
+ *
+ * "no ip ospf authentication-key",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Authentication password (key)\n"
+ *
+ * "no ip ospf authentication-key AUTH_KEY",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Authentication password (key)\n"
+ *
+ * "no ospf authentication-key",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Authentication password (key)\n"
+ *
+ */
 DEFUN (no_ip_ospf_authentication_key,
        no_ip_ospf_authentication_key_authkey_addr_cmd,
        "no ip ospf authentication-key AUTH_KEY A.B.C.D",
@@ -6412,46 +6470,22 @@ DEFUN (no_ip_ospf_authentication_key,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_authentication_key,
-       no_ip_ospf_authentication_key_authkey_cmd,
-       "no ip ospf authentication-key AUTH_KEY",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Authentication password (key)\n")
 
-ALIAS (no_ip_ospf_authentication_key,
-       no_ip_ospf_authentication_key_cmd,
-       "no ip ospf authentication-key",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Authentication password (key)\n")
 
-ALIAS (no_ip_ospf_authentication_key,
-       no_ospf_authentication_key_cmd,
-       "no ospf authentication-key",
-       NO_STR
-       "OSPF interface commands\n"
-       "Authentication password (key)\n")
 
-ALIAS (no_ip_ospf_authentication_key,
-       no_ospf_authentication_key_authkey_cmd,
-       "no ospf authentication-key AUTH_KEY",
-       NO_STR
-       "OSPF interface commands\n"
-       "Authentication password (key)\n"
-       "The OSPF password (key)\n")
 
-ALIAS (no_ip_ospf_authentication_key,
-       no_ospf_authentication_key_authkey_ip_cmd,
-       "no ospf authentication-key AUTH_KEY A.B.C.D",
-       NO_STR
-       "OSPF interface commands\n"
-       "Authentication password (key)\n"
-       "The OSPF password (key)\n"
-       "Address of interface")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf message-digest-key <1-255> md5 KEY",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Message digest authentication password (key)\n"
+ *     "Key ID\n"
+ *     "Use MD5 algorithm\n"
+ *     "The OSPF password (key)"
+ *
+ */
 DEFUN (ip_ospf_message_digest_key,
        ip_ospf_message_digest_key_addr_cmd,
        "ip ospf message-digest-key <1-255> md5 KEY A.B.C.D",
@@ -6505,15 +6539,6 @@ DEFUN (ip_ospf_message_digest_key,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_message_digest_key,
-       ip_ospf_message_digest_key_cmd,
-       "ip ospf message-digest-key <1-255> md5 KEY",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n"
-       "Use MD5 algorithm\n"
-       "The OSPF password (key)")
 
 ALIAS_HIDDEN (ip_ospf_message_digest_key,
               ospf_message_digest_key_cmd,
@@ -6524,6 +6549,18 @@ ALIAS_HIDDEN (ip_ospf_message_digest_key,
               "Use MD5 algorithm\n"
               "The OSPF password (key)")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf message-digest-key <1-255> md5 KEY",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Message digest authentication password (key)\n"
+ *     "Key ID\n"
+ *     "Use MD5 algorithm\n"
+ *     "The OSPF password (key)"
+ *
+ */
 DEFUN (no_ip_ospf_message_digest_key_md5,
        no_ip_ospf_message_digest_key_md5_addr_cmd,
        "no ip ospf message-digest-key <1-255> md5 KEY A.B.C.D",
@@ -6580,17 +6617,23 @@ DEFUN (no_ip_ospf_message_digest_key_md5,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_message_digest_key_md5,
-       no_ip_ospf_message_digest_key_md5_cmd,
-       "no ip ospf message-digest-key <1-255> md5 KEY",
-        NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n"
-       "Use MD5 algorithm\n"
-       "The OSPF password (key)")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf message-digest-key <1-255>",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Message digest authentication password (key)\n"
+ *     "Key ID\n"
+ *
+ * "no ospf message-digest-key <1-255>",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Message digest authentication password (key)\n"
+ *     "Key ID\n"
+ *
+ */
 DEFUN (no_ip_ospf_message_digest_key,
        no_ip_ospf_message_digest_key_addr_cmd,
        "no ip ospf message-digest-key <1-255> A.B.C.D",
@@ -6645,23 +6688,17 @@ DEFUN (no_ip_ospf_message_digest_key,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_message_digest_key,
-       no_ip_ospf_message_digest_key_cmd,
-       "no ip ospf message-digest-key <1-255>",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n")
      
-ALIAS (no_ip_ospf_message_digest_key,
-       no_ospf_message_digest_key_cmd,
-       "no ospf message-digest-key <1-255>",
-       NO_STR
-       "OSPF interface commands\n"
-       "Message digest authentication password (key)\n"
-       "Key ID\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf cost <1-65535>",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Interface cost\n"
+ *     "Cost"
+ *
+ */
 DEFUN (ip_ospf_cost,
        ip_ospf_cost_u32_inet4_cmd,
        "ip ospf cost <1-65535> A.B.C.D",
@@ -6710,13 +6747,6 @@ DEFUN (ip_ospf_cost,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_cost,
-       ip_ospf_cost_u32_cmd,
-       "ip ospf cost <1-65535>",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Cost")
 
 ALIAS_HIDDEN (ip_ospf_cost,
               ospf_cost_u32_cmd,
@@ -6733,6 +6763,26 @@ ALIAS_HIDDEN (ip_ospf_cost,
               "Cost\n"
               "Address of interface")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ospf cost A.B.C.D",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Interface cost\n"
+ *     "Address of interface"
+ *
+ * "no ospf cost",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Interface cost\n"
+ *
+ * "no ip ospf cost",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Interface cost\n"
+ *
+ */
 DEFUN (no_ip_ospf_cost,
        no_ip_ospf_cost_inet4_cmd,
        "no ip ospf cost A.B.C.D",
@@ -6778,29 +6828,33 @@ DEFUN (no_ip_ospf_cost,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_cost,
-       no_ip_ospf_cost_cmd,
-       "no ip ospf cost",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interface cost\n")
 
-ALIAS (no_ip_ospf_cost,
-       no_ospf_cost_cmd,
-       "no ospf cost",
-       NO_STR
-       "OSPF interface commands\n"
-       "Interface cost\n")
 
-ALIAS (no_ip_ospf_cost,
-       no_ospf_cost_inet4_cmd,
-       "no ospf cost A.B.C.D",
-       NO_STR
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Address of interface")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ospf cost <1-65535>",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Interface cost\n"
+ *     "Cost"
+ *
+ * "no ospf cost <1-65535> A.B.C.D",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Interface cost\n"
+ *     "Cost\n"
+ *     "Address of interface"
+ *
+ * "no ip ospf cost <1-65535> A.B.C.D",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Interface cost\n"
+ *     "Cost\n"
+ *     "Address of interface"
+ *
+ */
 DEFUN (no_ip_ospf_cost2,
        no_ip_ospf_cost_u32_cmd,
        "no ip ospf cost <1-65535>",
@@ -6859,32 +6913,8 @@ DEFUN (no_ip_ospf_cost2,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_cost2,
-       no_ospf_cost_u32_cmd,
-       "no ospf cost <1-65535>",
-       NO_STR
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Cost")
 
-ALIAS (no_ip_ospf_cost2,
-       no_ip_ospf_cost_u32_inet4_cmd,
-       "no ip ospf cost <1-65535> A.B.C.D",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Cost\n"
-       "Address of interface")
 
-ALIAS (no_ip_ospf_cost2,
-       no_ospf_cost_u32_inet4_cmd,
-       "no ospf cost <1-65535> A.B.C.D",
-       NO_STR
-       "OSPF interface commands\n"
-       "Interface cost\n"
-       "Cost\n"
-       "Address of interface")
 
 static void
 ospf_nbr_timer_update (struct ospf_interface *oi)
@@ -6982,6 +7012,15 @@ ospf_vty_dead_interval_set (struct vty *vty, const char *interval_str,
 }
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf dead-interval <1-65535>",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Interval after which a neighbor is declared dead\n"
+ *     "Seconds\n"
+ *
+ */
 DEFUN (ip_ospf_dead_interval,
        ip_ospf_dead_interval_addr_cmd,
        "ip ospf dead-interval <1-65535> A.B.C.D",
@@ -6997,13 +7036,6 @@ DEFUN (ip_ospf_dead_interval,
     return ospf_vty_dead_interval_set (vty, argv[3]->arg, NULL, NULL);
 }
 
-ALIAS (ip_ospf_dead_interval,
-       ip_ospf_dead_interval_cmd,
-       "ip ospf dead-interval <1-65535>",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
-       "Seconds\n")
 
 ALIAS_HIDDEN (ip_ospf_dead_interval,
               ospf_dead_interval_cmd,
@@ -7012,6 +7044,17 @@ ALIAS_HIDDEN (ip_ospf_dead_interval,
               "Interval after which a neighbor is declared dead\n"
               "Seconds\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf dead-interval minimal hello-multiplier <1-10>",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Interval after which a neighbor is declared dead\n"
+ *     "Minimal 1s dead-interval with fast sub-second hellos\n"
+ *     "Hello multiplier factor\n"
+ *     "Number of Hellos to send each second\n"
+ *
+ */
 DEFUN (ip_ospf_dead_interval_minimal,
        ip_ospf_dead_interval_minimal_addr_cmd,
        "ip ospf dead-interval minimal hello-multiplier <1-10> A.B.C.D",
@@ -7029,16 +7072,47 @@ DEFUN (ip_ospf_dead_interval_minimal,
     return ospf_vty_dead_interval_set (vty, NULL, NULL, argv[5]->arg);
 }
 
-ALIAS (ip_ospf_dead_interval_minimal,
-       ip_ospf_dead_interval_minimal_cmd,
-       "ip ospf dead-interval minimal hello-multiplier <1-10>",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
-       "Minimal 1s dead-interval with fast sub-second hellos\n"
-       "Hello multiplier factor\n"
-       "Number of Hellos to send each second\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ospf dead-interval",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Interval after which a neighbor is declared dead\n"
+ *
+ * "no ip ospf dead-interval minimal hello-multiplier <1-10>",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Interval after which a neighbor is declared dead\n"
+ *     "Minimal 1s dead-interval with fast sub-second hellos\n"
+ *     "Hello multiplier factor\n"
+ *     "Number of Hellos to send each second\n"
+ *
+ * "no ip ospf dead-interval <1-65535>",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Interval after which a neighbor is declared dead\n"
+ *     "Seconds\n"
+ *
+ * "no ip ospf dead-interval",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Interval after which a neighbor is declared dead\n"
+ *
+ * "no ip ospf dead-interval minimal hello-multiplier <1-10> A.B.C.D",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Interval after which a neighbor is declared dead\n"
+ *     "Minimal 1s dead-interval with fast sub-second hellos\n"
+ *     "Hello multiplier factor\n"
+ *     "Number of Hellos to send each second\n"
+ *     "Address of interface\n"
+ *
+ */
 DEFUN (no_ip_ospf_dead_interval,
        no_ip_ospf_dead_interval_addr_cmd,
        "no ip ospf dead-interval <1-65535> A.B.C.D",
@@ -7108,53 +7182,20 @@ DEFUN (no_ip_ospf_dead_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_dead_interval,
-       no_ip_ospf_dead_interval_seconds_cmd,
-       "no ip ospf dead-interval <1-65535>",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
-       "Seconds\n")
 
-ALIAS (no_ip_ospf_dead_interval,
-       no_ip_ospf_dead_interval_cmd,
-       "no ip ospf dead-interval",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n")
 
-ALIAS (no_ip_ospf_dead_interval,
-       no_ospf_dead_interval_cmd,
-       "no ospf dead-interval",
-       NO_STR
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n")
 
-ALIAS (no_ip_ospf_dead_interval,
-       no_ip_ospf_dead_interval_minimal_addr_cmd,
-       "no ip ospf dead-interval minimal hello-multiplier <1-10> A.B.C.D",
-        NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
-       "Minimal 1s dead-interval with fast sub-second hellos\n"
-       "Hello multiplier factor\n"
-       "Number of Hellos to send each second\n"
-       "Address of interface\n")
 
-ALIAS (no_ip_ospf_dead_interval,
-       no_ip_ospf_dead_interval_minimal_cmd,
-       "no ip ospf dead-interval minimal hello-multiplier <1-10>",
-        NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Interval after which a neighbor is declared dead\n"
-       "Minimal 1s dead-interval with fast sub-second hellos\n"
-       "Hello multiplier factor\n"
-       "Number of Hellos to send each second\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf hello-interval <1-65535>",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Time between HELLO packets\n"
+ *     "Seconds\n"
+ *
+ */
 DEFUN (ip_ospf_hello_interval,
        ip_ospf_hello_interval_addr_cmd,
        "ip ospf hello-interval <1-65535> A.B.C.D",
@@ -7201,13 +7242,6 @@ DEFUN (ip_ospf_hello_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_hello_interval,
-       ip_ospf_hello_interval_cmd,
-       "ip ospf hello-interval <1-65535>",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between HELLO packets\n"
-       "Seconds\n")
 
 ALIAS_HIDDEN (ip_ospf_hello_interval,
               ospf_hello_interval_cmd,
@@ -7216,6 +7250,28 @@ ALIAS_HIDDEN (ip_ospf_hello_interval,
               "Time between HELLO packets\n"
               "Seconds\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf hello-interval <1-65535>",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Time between HELLO packets\n"
+ *     "Seconds\n"
+ *
+ * "no ip ospf hello-interval",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Time between HELLO packets\n"
+ *
+ * "no ospf hello-interval <1-65535>",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Time between HELLO packets\n"
+ *     "Seconds\n"
+ *
+ */
 DEFUN (no_ip_ospf_hello_interval,
        no_ip_ospf_hello_interval_addr_cmd,
        "no ip ospf hello-interval <1-65535> A.B.C.D",
@@ -7261,30 +7317,8 @@ DEFUN (no_ip_ospf_hello_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_hello_interval,
-       no_ip_ospf_hello_interval_seconds_cmd,
-       "no ip ospf hello-interval <1-65535>",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between HELLO packets\n"
-       "Seconds\n")
 
-ALIAS (no_ip_ospf_hello_interval,
-       no_ip_ospf_hello_interval_cmd,
-       "no ip ospf hello-interval",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between HELLO packets\n")
 
-ALIAS (no_ip_ospf_hello_interval,
-       no_ospf_hello_interval_cmd,
-       "no ospf hello-interval <1-65535>",
-       NO_STR
-       "OSPF interface commands\n"
-       "Time between HELLO packets\n"
-       "Seconds\n")
 
 DEFUN (ip_ospf_network,
        ip_ospf_network_cmd,
@@ -7350,6 +7384,33 @@ ALIAS_HIDDEN (ip_ospf_network,
               "Specify OSPF point-to-multipoint network\n"
               "Specify OSPF point-to-point network\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Network type\n"
+ *     "Specify OSPF broadcast multi-access network\n"
+ *     "Specify OSPF NBMA network\n"
+ *     "Specify OSPF point-to-multipoint network\n"
+ *     "Specify OSPF point-to-point network\n"
+ *
+ * "no ospf network",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Network type\n"
+ *
+ * "no ip ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Network type\n"
+ *     "Specify OSPF broadcast multi-access network\n"
+ *     "Specify OSPF NBMA network\n"
+ *     "Specify OSPF point-to-multipoint network\n"
+ *     "Specify OSPF point-to-point network\n"
+ *
+ */
 DEFUN (no_ip_ospf_network,
        no_ip_ospf_network_cmd,
        "no ip ospf network",
@@ -7386,36 +7447,18 @@ DEFUN (no_ip_ospf_network,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_network,
-       no_ip_ospf_network_val_cmd,
-       "no ip ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Network type\n"
-       "Specify OSPF broadcast multi-access network\n"
-       "Specify OSPF NBMA network\n"
-       "Specify OSPF point-to-multipoint network\n"
-       "Specify OSPF point-to-point network\n")
 
-ALIAS (no_ip_ospf_network,
-       no_ospf_network_cmd,
-       "no ospf network",
-       NO_STR
-       "OSPF interface commands\n"
-       "Network type\n")
 
-ALIAS (no_ip_ospf_network,
-       no_ospf_network_val_cmd,
-       "no ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)",
-       NO_STR
-       "OSPF interface commands\n"
-       "Network type\n"
-       "Specify OSPF broadcast multi-access network\n"
-       "Specify OSPF NBMA network\n"
-       "Specify OSPF point-to-multipoint network\n"
-       "Specify OSPF point-to-point network\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf priority <0-255>",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Router priority\n"
+ *     "Priority\n"
+ *
+ */
 DEFUN (ip_ospf_priority,
        ip_ospf_priority_addr_cmd,
        "ip ospf priority <0-255> A.B.C.D",
@@ -7478,13 +7521,6 @@ DEFUN (ip_ospf_priority,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_priority,
-       ip_ospf_priority_cmd,
-       "ip ospf priority <0-255>",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Router priority\n"
-       "Priority\n")
 
 ALIAS_HIDDEN (ip_ospf_priority,
               ospf_priority_cmd,
@@ -7493,6 +7529,28 @@ ALIAS_HIDDEN (ip_ospf_priority,
               "Router priority\n"
               "Priority\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf priority",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Router priority\n"
+ *
+ * "no ip ospf priority <0-255>",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Router priority\n"
+ *     "Priority\n"
+ *
+ * "no ospf priority <0-255>",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Router priority\n"
+ *     "Priority\n"
+ *
+ */
 DEFUN (no_ip_ospf_priority,
        no_ip_ospf_priority_addr_cmd,
        "no ip ospf priority <0-255> A.B.C.D",
@@ -7554,32 +7612,19 @@ DEFUN (no_ip_ospf_priority,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_priority,
-       no_ip_ospf_priority_no_param_cmd,
-       "no ip ospf priority",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Router priority\n");
 
-ALIAS (no_ip_ospf_priority,
-       no_ip_ospf_priority_cmd,
-       "no ip ospf priority <0-255>",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Router priority\n"
-       "Priority\n")
 
-ALIAS (no_ip_ospf_priority,
-       no_ospf_priority_cmd,
-       "no ospf priority <0-255>",
-       NO_STR
-       "OSPF interface commands\n"
-       "Router priority\n"
-       "Priority\n")
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf retransmit-interval <3-65535>",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Time between retransmitting lost link state advertisements\n"
+ *     "Seconds\n"
+ *
+ */
 DEFUN (ip_ospf_retransmit_interval,
        ip_ospf_retransmit_interval_addr_cmd,
        "ip ospf retransmit-interval <3-65535> A.B.C.D",
@@ -7626,13 +7671,6 @@ DEFUN (ip_ospf_retransmit_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_retransmit_interval,
-       ip_ospf_retransmit_interval_cmd,
-       "ip ospf retransmit-interval <3-65535>",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n"
-       "Seconds\n")
 
 ALIAS_HIDDEN (ip_ospf_retransmit_interval,
               ospf_retransmit_interval_cmd,
@@ -7641,6 +7679,28 @@ ALIAS_HIDDEN (ip_ospf_retransmit_interval,
               "Time between retransmitting lost link state advertisements\n"
               "Seconds\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf retransmit-interval <3-65535> A.B.C.D",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Time between retransmitting lost link state advertisements\n"
+ *     "Seconds\n"
+ *     "Address of interface"
+ *
+ * "no ip ospf retransmit-interval",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Time between retransmitting lost link state advertisements\n"
+ *
+ * "no ospf retransmit-interval",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Time between retransmitting lost link state advertisements\n"
+ *
+ */
 DEFUN (no_ip_ospf_retransmit_interval,
        no_ip_ospf_retransmit_interval_addr_cmd,
        "no ip ospf retransmit-interval A.B.C.D",
@@ -7691,30 +7751,8 @@ DEFUN (no_ip_ospf_retransmit_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_retransmit_interval,
-       no_ip_ospf_retransmit_interval_sec_addr_cmd,
-       "no ip ospf retransmit-interval <3-65535> A.B.C.D",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n"
-       "Seconds\n"
-       "Address of interface")
 
-ALIAS (no_ip_ospf_retransmit_interval,
-       no_ip_ospf_retransmit_interval_cmd,
-       "no ip ospf retransmit-interval",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n")
 
-ALIAS (no_ip_ospf_retransmit_interval,
-       no_ospf_retransmit_interval_cmd,
-       "no ospf retransmit-interval",
-       NO_STR
-       "OSPF interface commands\n"
-       "Time between retransmitting lost link state advertisements\n")
 
 DEFUN (no_ip_ospf_retransmit_interval_sec,
        no_ip_ospf_retransmit_interval_sec_cmd,
@@ -7738,6 +7776,15 @@ DEFUN (no_ip_ospf_retransmit_interval_sec,
 }
 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf transmit-delay <1-65535>",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Link state transmit delay\n"
+ *     "Seconds\n"
+ *
+ */
 DEFUN (ip_ospf_transmit_delay,
        ip_ospf_transmit_delay_addr_cmd,
        "ip ospf transmit-delay <1-65535> A.B.C.D",
@@ -7783,13 +7830,6 @@ DEFUN (ip_ospf_transmit_delay,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_transmit_delay,
-       ip_ospf_transmit_delay_cmd,
-       "ip ospf transmit-delay <1-65535>",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Link state transmit delay\n"
-       "Seconds\n")
 
 ALIAS_HIDDEN (ip_ospf_transmit_delay,
               ospf_transmit_delay_cmd,
@@ -7798,6 +7838,28 @@ ALIAS_HIDDEN (ip_ospf_transmit_delay,
               "Link state transmit delay\n"
               "Seconds\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ospf transmit-delay",
+ *     NO_STR
+ *     "OSPF interface commands\n"
+ *     "Link state transmit delay\n"
+ *
+ * "no ip ospf transmit-delay",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Link state transmit delay\n"
+ *
+ * "no ip ospf transmit-delay <1-65535> A.B.C.D",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Link state transmit delay\n"
+ *     "Seconds\n"
+ *     "Address of interface"
+ *
+ */
 DEFUN (no_ip_ospf_transmit_delay,
        no_ip_ospf_transmit_delay_addr_cmd,
        "no ip ospf transmit-delay A.B.C.D",
@@ -7848,30 +7910,8 @@ DEFUN (no_ip_ospf_transmit_delay,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_transmit_delay,
-       no_ip_ospf_transmit_delay_sec_addr_cmd,
-       "no ip ospf transmit-delay <1-65535> A.B.C.D",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Link state transmit delay\n"
-       "Seconds\n"
-       "Address of interface")
 
-ALIAS (no_ip_ospf_transmit_delay,
-       no_ip_ospf_transmit_delay_cmd,
-       "no ip ospf transmit-delay",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Link state transmit delay\n")
 
-ALIAS (no_ip_ospf_transmit_delay,
-       no_ospf_transmit_delay_cmd,
-       "no ospf transmit-delay",
-       NO_STR
-       "OSPF interface commands\n"
-       "Link state transmit delay\n")
 
 DEFUN (no_ip_ospf_transmit_delay_sec,
        no_ip_ospf_transmit_delay_sec_cmd,
@@ -7895,6 +7935,17 @@ DEFUN (no_ip_ospf_transmit_delay_sec,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf <1-65535> area (A.B.C.D|<0-4294967295>)",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Instance ID\n"
+ *     "Enable OSPF on this interface\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *
+ */
 DEFUN (ip_ospf_area,
        ip_ospf_area_cmd,
        "ip ospf area (A.B.C.D|<0-4294967295>)",
@@ -7966,16 +8017,18 @@ DEFUN (ip_ospf_area,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_area,
-       ip_ospf_instance_area_cmd,
-       "ip ospf <1-65535> area (A.B.C.D|<0-4294967295>)",
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Instance ID\n"
-       "Enable OSPF on this interface\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf area (A.B.C.D|<0-4294967295>)",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Disable OSPF on this interface\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *
+ */
 DEFUN (no_ip_ospf_area,
        no_ip_ospf_area_cmd,
        "no ip ospf area",
@@ -8004,16 +8057,19 @@ DEFUN (no_ip_ospf_area,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_area,
-       no_ip_ospf_area_val_cmd,
-       "no ip ospf area (A.B.C.D|<0-4294967295>)",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Disable OSPF on this interface\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf <1-65535> area (A.B.C.D|<0-4294967295>)",
+ *     NO_STR
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Instance ID\n"
+ *     "Disable OSPF on this interface\n"
+ *     "OSPF area ID in IP address format\n"
+ *     "OSPF area ID as a decimal value\n"
+ *
+ */
 DEFUN (no_ip_ospf_instance_area,
        no_ip_ospf_instance_area_cmd,
        "no ip ospf <1-65535> area",
@@ -8045,16 +8101,6 @@ DEFUN (no_ip_ospf_instance_area,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_instance_area,
-       no_ip_ospf_instance_area_val_cmd,
-       "no ip ospf <1-65535> area (A.B.C.D|<0-4294967295>)",
-       NO_STR
-       "IP Information\n"
-       "OSPF interface commands\n"
-       "Instance ID\n"
-       "Disable OSPF on this interface\n"
-       "OSPF area ID in IP address format\n"
-       "OSPF area ID as a decimal value\n")
 
 DEFUN (ospf_redistribute_source,
        ospf_redistribute_source_cmd,
@@ -8421,6 +8467,14 @@ DEFUN (ospf_default_metric,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no default-metric <0-16777214>",
+ *     NO_STR
+ *     "Set metric of redistributed routes\n"
+ *     "Default metric\n"
+ *
+ */
 DEFUN (no_ospf_default_metric,
        no_ospf_default_metric_cmd,
        "no default-metric",
@@ -8437,12 +8491,6 @@ DEFUN (no_ospf_default_metric,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_default_metric,
-       no_ospf_default_metric_val_cmd,
-       "no default-metric <0-16777214>",
-       NO_STR
-       "Set metric of redistributed routes\n"
-       "Default metric\n")
 
 DEFUN (ospf_distance,
        ospf_distance_cmd,
@@ -8632,6 +8680,14 @@ DEFUN (no_ospf_distance_source_access_list,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip ospf mtu-ignore",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Disable mtu mismatch detection\n"
+ *
+ */
 DEFUN (ip_ospf_mtu_ignore,
        ip_ospf_mtu_ignore_addr_cmd,
        "ip ospf mtu-ignore A.B.C.D",
@@ -8674,14 +8730,16 @@ DEFUN (ip_ospf_mtu_ignore,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_ospf_mtu_ignore,
-      ip_ospf_mtu_ignore_cmd,
-      "ip ospf mtu-ignore",
-      "IP Information\n"
-      "OSPF interface commands\n"
-      "Disable mtu mismatch detection\n")
 
     
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip ospf mtu-ignore",
+ *     "IP Information\n"
+ *     "OSPF interface commands\n"
+ *     "Disable mtu mismatch detection\n"
+ *
+ */
 DEFUN (no_ip_ospf_mtu_ignore,
        no_ip_ospf_mtu_ignore_addr_cmd,
        "no ip ospf mtu-ignore A.B.C.D",
@@ -8724,12 +8782,6 @@ DEFUN (no_ip_ospf_mtu_ignore,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_ospf_mtu_ignore,
-       no_ip_ospf_mtu_ignore_cmd,
-      "no ip ospf mtu-ignore",
-      "IP Information\n"
-      "OSPF interface commands\n"
-      "Disable mtu mismatch detection\n")
 
 DEFUN (ospf_max_metric_router_lsa_admin,
        ospf_max_metric_router_lsa_admin_cmd,
@@ -8817,6 +8869,15 @@ DEFUN (ospf_max_metric_router_lsa_startup,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no max-metric router-lsa on-startup",
+ *     NO_STR
+ *     "OSPF maximum / infinite-distance metric\n"
+ *     "Advertise own Router-LSA with infinite distance (stub router)\n"
+ *     "Automatically advertise stub Router-LSA on startup of OSPF\n"
+ *
+ */
 DEFUN (no_ospf_max_metric_router_lsa_startup,
        no_ospf_max_metric_router_lsa_startup_cmd,
        "no max-metric router-lsa on-startup <5-86400>",
@@ -8850,13 +8911,6 @@ DEFUN (no_ospf_max_metric_router_lsa_startup,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_max_metric_router_lsa_startup,
-       no_ospf_max_metric_router_lsa_startup_no_param_cmd,
-       "no max-metric router-lsa on-startup",
-       NO_STR
-       "OSPF maximum / infinite-distance metric\n"
-       "Advertise own Router-LSA with infinite distance (stub router)\n"
-       "Automatically advertise stub Router-LSA on startup of OSPF\n");
 
 DEFUN (ospf_max_metric_router_lsa_shutdown,
        ospf_max_metric_router_lsa_shutdown_cmd,
@@ -8885,6 +8939,18 @@ DEFUN (ospf_max_metric_router_lsa_shutdown,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no max-metric router-lsa on-shutdown",
+ *     NO_STR
+ *     "OSPF maximum / infinite-distance metric\n"
+ *     "Advertise own Router-LSA with infinite distance (stub router)\n"
+ *     "Advertise stub-router prior to full shutdown of OSPF\n");
+ *     
+ *     static void
+ *     config_write_stub_router (struct vty *vty, struct ospf *ospf
+ *
+ */
 DEFUN (no_ospf_max_metric_router_lsa_shutdown,
        no_ospf_max_metric_router_lsa_shutdown_cmd,
        "no max-metric router-lsa on-shutdown <5-100>",
@@ -8904,16 +8970,6 @@ DEFUN (no_ospf_max_metric_router_lsa_shutdown,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ospf_max_metric_router_lsa_shutdown,
-       no_ospf_max_metric_router_lsa_shutdown_no_param_cmd,
-       "no max-metric router-lsa on-shutdown",
-       NO_STR
-       "OSPF maximum / infinite-distance metric\n"
-       "Advertise own Router-LSA with infinite distance (stub router)\n"
-       "Advertise stub-router prior to full shutdown of OSPF\n");
-
-static void
-config_write_stub_router (struct vty *vty, struct ospf *ospf)
 {
   struct listnode *ln;
   struct ospf_area *area;
@@ -9977,34 +10033,14 @@ ospf_vty_show_init (void)
   install_element (ENABLE_NODE, &show_ip_ospf_instance_cmd);
 
   /* "show ip ospf database" commands. */
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_cmd);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_id_cmd);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_id_adv_router_cmd);
   install_element (VIEW_NODE, &show_ip_ospf_database_type_adv_router_cmd);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_id_self_cmd);
-  install_element (VIEW_NODE, &show_ip_ospf_database_type_self_cmd);
   install_element (VIEW_NODE, &show_ip_ospf_database_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_adv_router_cmd);
   install_element (ENABLE_NODE, &show_ip_ospf_database_type_adv_router_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_self_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_database_type_self_cmd);
   install_element (ENABLE_NODE, &show_ip_ospf_database_cmd);
 
-  install_element (VIEW_NODE, &show_ip_ospf_instance_database_type_cmd);
-  install_element (VIEW_NODE, &show_ip_ospf_instance_database_type_id_cmd);
-  install_element (VIEW_NODE, &show_ip_ospf_instance_database_type_id_adv_router_cmd);
   install_element (VIEW_NODE, &show_ip_ospf_instance_database_type_adv_router_cmd);
-  install_element (VIEW_NODE, &show_ip_ospf_instance_database_type_id_self_cmd);
-  install_element (VIEW_NODE, &show_ip_ospf_instance_database_type_self_cmd);
   install_element (VIEW_NODE, &show_ip_ospf_instance_database_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_instance_database_type_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_instance_database_type_id_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_instance_database_type_id_adv_router_cmd);
   install_element (ENABLE_NODE, &show_ip_ospf_instance_database_type_adv_router_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_instance_database_type_id_self_cmd);
-  install_element (ENABLE_NODE, &show_ip_ospf_instance_database_type_self_cmd);
   install_element (ENABLE_NODE, &show_ip_ospf_instance_database_cmd);
 
   /* "show ip ospf interface" commands. */
@@ -10083,121 +10119,69 @@ ospf_vty_if_init (void)
 
   /* "ip ospf authentication" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_authentication_args_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_authentication_args_cmd);
   install_element (INTERFACE_NODE, &ip_ospf_authentication_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_authentication_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_authentication_args_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_args_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_authentication_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_cmd);
   install_element (INTERFACE_NODE, &ip_ospf_authentication_key_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_authentication_key_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_authentication_key_authkey_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_key_authkey_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_authentication_key_cmd);
 
   /* "ip ospf message-digest-key" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_message_digest_key_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_message_digest_key_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_message_digest_key_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_message_digest_key_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_message_digest_key_md5_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_message_digest_key_md5_cmd);
 
   /* "ip ospf cost" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_cost_u32_inet4_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_cost_u32_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_cost_u32_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_cost_u32_inet4_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_cost_inet4_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_cost_cmd);
 
   /* "ip ospf mtu-ignore" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_mtu_ignore_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_mtu_ignore_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_mtu_ignore_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_mtu_ignore_cmd);
 
   /* "ip ospf dead-interval" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_dead_interval_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_dead_interval_cmd);
   install_element (INTERFACE_NODE, &ip_ospf_dead_interval_minimal_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_dead_interval_minimal_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_seconds_cmd);
   
   /* "ip ospf hello-interval" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_hello_interval_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_hello_interval_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_seconds_cmd);
 
   /* "ip ospf network" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_network_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_network_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_network_val_cmd);
 
   /* "ip ospf priority" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_priority_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_priority_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_priority_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_priority_no_param_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_priority_addr_cmd);
 
   /* "ip ospf retransmit-interval" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_retransmit_interval_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_retransmit_interval_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_retransmit_interval_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_retransmit_interval_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_retransmit_interval_sec_addr_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_retransmit_interval_sec_cmd);
 
   /* "ip ospf transmit-delay" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_transmit_delay_addr_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_transmit_delay_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_transmit_delay_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_transmit_delay_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_transmit_delay_sec_addr_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_transmit_delay_sec_cmd);
 
   /* "ip ospf area" commands. */
   install_element (INTERFACE_NODE, &ip_ospf_area_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_area_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_area_val_cmd);
-  install_element (INTERFACE_NODE, &ip_ospf_instance_area_cmd);
   install_element (INTERFACE_NODE, &no_ip_ospf_instance_area_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_instance_area_val_cmd);
 
   /* These commands are compatibitliy for previous version. */
   install_element (INTERFACE_NODE, &ospf_authentication_key_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_authentication_key_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_authentication_key_authkey_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_authentication_key_authkey_ip_cmd);
   install_element (INTERFACE_NODE, &ospf_message_digest_key_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_message_digest_key_cmd);
   install_element (INTERFACE_NODE, &ospf_cost_u32_cmd);
   install_element (INTERFACE_NODE, &ospf_cost_u32_inet4_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_cost_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_cost_u32_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_cost_u32_inet4_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_cost_inet4_cmd);
   install_element (INTERFACE_NODE, &ospf_dead_interval_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_dead_interval_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_minimal_addr_cmd);
-  install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_minimal_cmd);
   install_element (INTERFACE_NODE, &ospf_hello_interval_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_hello_interval_cmd);
   install_element (INTERFACE_NODE, &ospf_network_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_network_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_network_val_cmd);
   install_element (INTERFACE_NODE, &ospf_priority_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_priority_cmd);
   install_element (INTERFACE_NODE, &ospf_retransmit_interval_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_retransmit_interval_cmd);
   install_element (INTERFACE_NODE, &ospf_transmit_delay_cmd);
-  install_element (INTERFACE_NODE, &no_ospf_transmit_delay_cmd);
 }
 
 static void
@@ -10216,7 +10200,6 @@ ospf_vty_zebra_init (void)
 
   install_element (OSPF_NODE, &ospf_default_metric_cmd);
   install_element (OSPF_NODE, &no_ospf_default_metric_cmd);
-  install_element (OSPF_NODE, &no_ospf_default_metric_val_cmd);
 
   install_element (OSPF_NODE, &ospf_distance_cmd);
   install_element (OSPF_NODE, &no_ospf_distance_cmd);
@@ -10294,8 +10277,6 @@ ospf_vty_init (void)
   install_element (CONFIG_NODE, &router_ospf_cmd);
   install_element (CONFIG_NODE, &no_router_ospf_cmd);
 
-  install_element (CONFIG_NODE, &router_ospf_instance_cmd);
-  install_element (CONFIG_NODE, &no_router_ospf_instance_cmd);
 
   install_default (OSPF_NODE);
 
@@ -10303,15 +10284,10 @@ ospf_vty_init (void)
   install_element (OSPF_NODE, &ospf_router_id_cmd);
   install_element (OSPF_NODE, &ospf_router_id_old_cmd);
   install_element (OSPF_NODE, &no_ospf_router_id_cmd);
-  install_element (OSPF_NODE, &no_ospf_router_id_val_cmd);
 
   /* "passive-interface" commands. */
   install_element (OSPF_NODE, &ospf_passive_interface_addr_cmd);
-  install_element (OSPF_NODE, &ospf_passive_interface_cmd);
-  install_element (OSPF_NODE, &ospf_passive_interface_default_cmd);
   install_element (OSPF_NODE, &no_ospf_passive_interface_addr_cmd);
-  install_element (OSPF_NODE, &no_ospf_passive_interface_cmd);
-  install_element (OSPF_NODE, &no_ospf_passive_interface_default_cmd);
 
   /* "ospf abr-type" commands. */
   install_element (OSPF_NODE, &ospf_abr_type_cmd);
@@ -10324,8 +10300,6 @@ ospf_vty_init (void)
   install_element (OSPF_NODE, &no_ospf_log_adjacency_changes_detail_cmd);
 
   /* "ospf rfc1583-compatible" commands. */
-  install_element (OSPF_NODE, &ospf_rfc1583_flag_cmd);
-  install_element (OSPF_NODE, &no_ospf_rfc1583_flag_cmd);
   install_element (OSPF_NODE, &ospf_compatible_rfc1583_cmd);
   install_element (OSPF_NODE, &no_ospf_compatible_rfc1583_cmd);
 
@@ -10340,14 +10314,8 @@ ospf_vty_init (void)
 
   /* "area range" commands.  */
   install_element (OSPF_NODE, &ospf_area_range_cmd);
-  install_element (OSPF_NODE, &ospf_area_range_advertise_cmd);
-  install_element (OSPF_NODE, &ospf_area_range_cost_cmd);
-  install_element (OSPF_NODE, &ospf_area_range_advertise_cost_cmd);
   install_element (OSPF_NODE, &ospf_area_range_not_advertise_cmd);
   install_element (OSPF_NODE, &no_ospf_area_range_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_range_advertise_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_range_cost_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_range_advertise_cost_cmd);
   install_element (OSPF_NODE, &ospf_area_range_substitute_cmd);
   install_element (OSPF_NODE, &no_ospf_area_range_substitute_cmd);
 
@@ -10355,38 +10323,14 @@ ospf_vty_init (void)
   install_element (OSPF_NODE, &ospf_area_vlink_cmd);
   install_element (OSPF_NODE, &no_ospf_area_vlink_cmd);
 
-  install_element (OSPF_NODE, &ospf_area_vlink_param1_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_param1_cmd);
 
-  install_element (OSPF_NODE, &ospf_area_vlink_param2_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_param2_cmd);
 
-  install_element (OSPF_NODE, &ospf_area_vlink_param3_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_param3_cmd);
 
-  install_element (OSPF_NODE, &ospf_area_vlink_param4_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_param4_cmd);
 
-  install_element (OSPF_NODE, &ospf_area_vlink_authtype_args_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_authtype_args_cmd);
-  install_element (OSPF_NODE, &ospf_area_vlink_authtype_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_authtype_cmd);
 
-  install_element (OSPF_NODE, &ospf_area_vlink_md5_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_md5_cmd);
 
-  install_element (OSPF_NODE, &ospf_area_vlink_authkey_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_authkey_cmd);
 
-  install_element (OSPF_NODE, &ospf_area_vlink_authtype_args_authkey_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_authtype_args_authkey_cmd);
-  install_element (OSPF_NODE, &ospf_area_vlink_authtype_authkey_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_authtype_authkey_cmd);
 
-  install_element (OSPF_NODE, &ospf_area_vlink_authtype_args_md5_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_authtype_args_md5_cmd);
-  install_element (OSPF_NODE, &ospf_area_vlink_authtype_md5_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_vlink_authtype_md5_cmd);
 
   /* "area stub" commands. */
   install_element (OSPF_NODE, &ospf_area_stub_no_summary_cmd);
@@ -10400,7 +10344,6 @@ ospf_vty_init (void)
   install_element (OSPF_NODE, &ospf_area_nssa_translate_cmd);
   install_element (OSPF_NODE, &ospf_area_nssa_no_summary_cmd);
   install_element (OSPF_NODE, &no_ospf_area_nssa_cmd);
-  install_element (OSPF_NODE, &no_ospf_area_nssa_no_summary_cmd);
 
   install_element (OSPF_NODE, &ospf_area_default_cost_cmd);
   install_element (OSPF_NODE, &no_ospf_area_default_cost_cmd);
@@ -10420,57 +10363,39 @@ ospf_vty_init (void)
   /* SPF timer commands */
   install_element (OSPF_NODE, &ospf_timers_throttle_spf_cmd);
   install_element (OSPF_NODE, &no_ospf_timers_throttle_spf_cmd);
-  install_element (OSPF_NODE, &no_ospf_timers_throttle_spf_val_cmd);
   
   /* LSA timers commands */
   install_element (OSPF_NODE, &ospf_timers_min_ls_interval_cmd);
   install_element (OSPF_NODE, &no_ospf_timers_min_ls_interval_cmd);
-  install_element (OSPF_NODE, &no_ospf_timers_min_ls_interval_val_cmd);
   install_element (OSPF_NODE, &ospf_timers_min_ls_arrival_cmd);
   install_element (OSPF_NODE, &no_ospf_timers_min_ls_arrival_cmd);
-  install_element (OSPF_NODE, &no_ospf_timers_min_ls_arrival_val_cmd);
   install_element (OSPF_NODE, &ospf_timers_lsa_cmd);
   install_element (OSPF_NODE, &no_ospf_timers_lsa_cmd);
-  install_element (OSPF_NODE, &no_ospf_timers_lsa_val_cmd);
 
   /* refresh timer commands */
   install_element (OSPF_NODE, &ospf_refresh_timer_cmd);
   install_element (OSPF_NODE, &no_ospf_refresh_timer_val_cmd);
-  install_element (OSPF_NODE, &no_ospf_refresh_timer_cmd);
   
   /* max-metric commands */
   install_element (OSPF_NODE, &ospf_max_metric_router_lsa_admin_cmd);
   install_element (OSPF_NODE, &no_ospf_max_metric_router_lsa_admin_cmd);
   install_element (OSPF_NODE, &ospf_max_metric_router_lsa_startup_cmd);
   install_element (OSPF_NODE, &no_ospf_max_metric_router_lsa_startup_cmd);
-  install_element (OSPF_NODE, &no_ospf_max_metric_router_lsa_startup_no_param_cmd);
   install_element (OSPF_NODE, &ospf_max_metric_router_lsa_shutdown_cmd);
   install_element (OSPF_NODE, &no_ospf_max_metric_router_lsa_shutdown_cmd);
-  install_element (OSPF_NODE, &no_ospf_max_metric_router_lsa_shutdown_no_param_cmd);
   
   /* reference bandwidth commands */
   install_element (OSPF_NODE, &ospf_auto_cost_reference_bandwidth_cmd);
   install_element (OSPF_NODE, &no_ospf_auto_cost_reference_bandwidth_cmd);
-  install_element (OSPF_NODE, &no_ospf_auto_cost_reference_bandwidth_val_cmd);
 
   /* "neighbor" commands. */
   install_element (OSPF_NODE, &ospf_neighbor_cmd);
-  install_element (OSPF_NODE, &ospf_neighbor_priority_poll_interval_cmd);
-  install_element (OSPF_NODE, &ospf_neighbor_priority_cmd);
   install_element (OSPF_NODE, &ospf_neighbor_poll_interval_cmd);
-  install_element (OSPF_NODE, &ospf_neighbor_poll_interval_priority_cmd);
   install_element (OSPF_NODE, &no_ospf_neighbor_cmd);
-  install_element (OSPF_NODE, &no_ospf_neighbor_priority_cmd);
-  install_element (OSPF_NODE, &no_ospf_neighbor_poll_interval_cmd);
-  install_element (OSPF_NODE, &no_ospf_neighbor_poll_interval_priority_cmd);
-  install_element (OSPF_NODE, &no_ospf_neighbor_priority_pollinterval_cmd);
 
   /* write multiplier commands */
   install_element (OSPF_NODE, &ospf_write_multiplier_cmd);
   install_element (OSPF_NODE, &no_ospf_write_multiplier_cmd);
-  install_element (OSPF_NODE, &write_multiplier_cmd);
-  install_element (OSPF_NODE, &no_write_multiplier_cmd);
-  install_element (OSPF_NODE, &no_write_multiplier_val_cmd);
 
   /* Init interface related vty commands. */
   ospf_vty_if_init ();
index 875310651541c80156d4a1eacf08c916d758bca9..62159ad08892a37265a7921c8218f75f7954c550 100644 (file)
@@ -3531,6 +3531,16 @@ DEFUN (interface_no_ip_mroute_source,
    return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip pim hello <1-180> <1-180>",
+ *     IP_STR
+ *     PIM_STR
+ *     IFACE_PIM_HELLO_STR
+ *     IFACE_PIM_HELLO_TIME_STR
+ *     IFACE_PIM_HELLO_HOLD_STR
+ *
+ */
 DEFUN (interface_ip_pim_hello,
        interface_ip_pim_hello_cmd,
        "ip pim hello <1-180>",
@@ -3558,14 +3568,6 @@ DEFUN (interface_ip_pim_hello,
   return CMD_SUCCESS;
 }
 
-ALIAS (interface_ip_pim_hello,
-       interface_ip_pim_hello_hold_cmd,
-       "ip pim hello <1-180> <1-180>",
-       IP_STR
-       PIM_STR
-       IFACE_PIM_HELLO_STR
-       IFACE_PIM_HELLO_TIME_STR
-       IFACE_PIM_HELLO_HOLD_STR)
 
 
 DEFUN (interface_no_ip_pim_hello,
@@ -3607,6 +3609,13 @@ DEFUN (debug_igmp,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug igmp",
+ *     UNDEBUG_STR
+ *     DEBUG_IGMP_STR
+ *
+ */
 DEFUN (no_debug_igmp,
        no_debug_igmp_cmd,
        "no debug igmp",
@@ -3620,11 +3629,6 @@ DEFUN (no_debug_igmp,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_igmp,
-       undebug_igmp_cmd,
-       "undebug igmp",
-       UNDEBUG_STR
-       DEBUG_IGMP_STR)
 
 DEFUN (debug_igmp_events,
        debug_igmp_events_cmd,
@@ -3637,6 +3641,14 @@ DEFUN (debug_igmp_events,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug igmp events",
+ *     UNDEBUG_STR
+ *     DEBUG_IGMP_STR
+ *     DEBUG_IGMP_EVENTS_STR
+ *
+ */
 DEFUN (no_debug_igmp_events,
        no_debug_igmp_events_cmd,
        "no debug igmp events",
@@ -3649,12 +3661,6 @@ DEFUN (no_debug_igmp_events,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_igmp_events,
-       undebug_igmp_events_cmd,
-       "undebug igmp events",
-       UNDEBUG_STR
-       DEBUG_IGMP_STR
-       DEBUG_IGMP_EVENTS_STR)
 
 DEFUN (debug_igmp_packets,
        debug_igmp_packets_cmd,
@@ -3667,6 +3673,14 @@ DEFUN (debug_igmp_packets,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug igmp packets",
+ *     UNDEBUG_STR
+ *     DEBUG_IGMP_STR
+ *     DEBUG_IGMP_PACKETS_STR
+ *
+ */
 DEFUN (no_debug_igmp_packets,
        no_debug_igmp_packets_cmd,
        "no debug igmp packets",
@@ -3679,12 +3693,6 @@ DEFUN (no_debug_igmp_packets,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_igmp_packets,
-       undebug_igmp_packets_cmd,
-       "undebug igmp packets",
-       UNDEBUG_STR
-       DEBUG_IGMP_STR
-       DEBUG_IGMP_PACKETS_STR)
 
 DEFUN (debug_igmp_trace,
        debug_igmp_trace_cmd,
@@ -3697,6 +3705,14 @@ DEFUN (debug_igmp_trace,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug igmp trace",
+ *     UNDEBUG_STR
+ *     DEBUG_IGMP_STR
+ *     DEBUG_IGMP_TRACE_STR
+ *
+ */
 DEFUN (no_debug_igmp_trace,
        no_debug_igmp_trace_cmd,
        "no debug igmp trace",
@@ -3709,12 +3725,6 @@ DEFUN (no_debug_igmp_trace,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_igmp_trace,
-       undebug_igmp_trace_cmd,
-       "undebug igmp trace",
-       UNDEBUG_STR
-       DEBUG_IGMP_STR
-       DEBUG_IGMP_TRACE_STR)
 
 DEFUN (debug_mroute,
        debug_mroute_cmd,
@@ -3726,6 +3736,13 @@ DEFUN (debug_mroute,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug mroute",
+ *     UNDEBUG_STR
+ *     DEBUG_MROUTE_STR
+ *
+ */
 DEFUN (no_debug_mroute,
        no_debug_mroute_cmd,
        "no debug mroute",
@@ -3737,11 +3754,6 @@ DEFUN (no_debug_mroute,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_mroute,
-       undebug_mroute_cmd,
-       "undebug mroute",
-       UNDEBUG_STR
-       DEBUG_MROUTE_STR)
 
 DEFUN (debug_static,
        debug_static_cmd,
@@ -3753,6 +3765,13 @@ DEFUN (debug_static,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug static",
+ *     UNDEBUG_STR
+ *     DEBUG_STATIC_STR
+ *
+ */
 DEFUN (no_debug_static,
        no_debug_static_cmd,
        "no debug static",
@@ -3764,11 +3783,6 @@ DEFUN (no_debug_static,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_static,
-       undebug_static_cmd,
-       "undebug static",
-       UNDEBUG_STR
-       DEBUG_STATIC_STR)
 
 DEFUN (debug_pim,
        debug_pim_cmd,
@@ -3782,6 +3796,13 @@ DEFUN (debug_pim,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug pim",
+ *     UNDEBUG_STR
+ *     DEBUG_PIM_STR
+ *
+ */
 DEFUN (no_debug_pim,
        no_debug_pim_cmd,
        "no debug pim",
@@ -3799,11 +3820,6 @@ DEFUN (no_debug_pim,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_pim,
-       undebug_pim_cmd,
-       "undebug pim",
-       UNDEBUG_STR
-       DEBUG_PIM_STR)
 
 DEFUN (debug_pim_events,
        debug_pim_events_cmd,
@@ -3816,6 +3832,14 @@ DEFUN (debug_pim_events,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug pim events",
+ *     UNDEBUG_STR
+ *     DEBUG_PIM_STR
+ *     DEBUG_PIM_EVENTS_STR
+ *
+ */
 DEFUN (no_debug_pim_events,
        no_debug_pim_events_cmd,
        "no debug pim events",
@@ -3828,12 +3852,6 @@ DEFUN (no_debug_pim_events,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_pim_events,
-       undebug_pim_events_cmd,
-       "undebug pim events",
-       UNDEBUG_STR
-       DEBUG_PIM_STR
-       DEBUG_PIM_EVENTS_STR)
 
 DEFUN (debug_pim_packets,
        debug_pim_packets_cmd,
@@ -3869,6 +3887,14 @@ DEFUN (debug_pim_packets_filter,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug pim packets",
+ *     UNDEBUG_STR
+ *     DEBUG_PIM_STR
+ *     DEBUG_PIM_PACKETS_STR
+ *
+ */
 DEFUN (no_debug_pim_packets,
        no_debug_pim_packets_cmd,
        "no debug pim packets",
@@ -3907,12 +3933,6 @@ DEFUN (no_debug_pim_packets_filter,
     return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_pim_packets,
-       undebug_pim_packets_cmd,
-       "undebug pim packets",
-       UNDEBUG_STR
-       DEBUG_PIM_STR
-       DEBUG_PIM_PACKETS_STR)
 
 DEFUN (debug_pim_packetdump_send,
        debug_pim_packetdump_send_cmd,
@@ -3926,6 +3946,15 @@ DEFUN (debug_pim_packetdump_send,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug pim packet-dump send",
+ *     UNDEBUG_STR
+ *     DEBUG_PIM_STR
+ *     DEBUG_PIM_PACKETDUMP_STR
+ *     DEBUG_PIM_PACKETDUMP_SEND_STR
+ *
+ */
 DEFUN (no_debug_pim_packetdump_send,
        no_debug_pim_packetdump_send_cmd,
        "no debug pim packet-dump send",
@@ -3939,13 +3968,6 @@ DEFUN (no_debug_pim_packetdump_send,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_pim_packetdump_send,
-       undebug_pim_packetdump_send_cmd,
-       "undebug pim packet-dump send",
-       UNDEBUG_STR
-       DEBUG_PIM_STR
-       DEBUG_PIM_PACKETDUMP_STR
-       DEBUG_PIM_PACKETDUMP_SEND_STR)
 
 DEFUN (debug_pim_packetdump_recv,
        debug_pim_packetdump_recv_cmd,
@@ -3959,6 +3981,15 @@ DEFUN (debug_pim_packetdump_recv,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug pim packet-dump receive",
+ *     UNDEBUG_STR
+ *     DEBUG_PIM_STR
+ *     DEBUG_PIM_PACKETDUMP_STR
+ *     DEBUG_PIM_PACKETDUMP_RECV_STR
+ *
+ */
 DEFUN (no_debug_pim_packetdump_recv,
        no_debug_pim_packetdump_recv_cmd,
        "no debug pim packet-dump receive",
@@ -3972,13 +4003,6 @@ DEFUN (no_debug_pim_packetdump_recv,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_pim_packetdump_recv,
-       undebug_pim_packetdump_recv_cmd,
-       "undebug pim packet-dump receive",
-       UNDEBUG_STR
-       DEBUG_PIM_STR
-       DEBUG_PIM_PACKETDUMP_STR
-       DEBUG_PIM_PACKETDUMP_RECV_STR)
 
 DEFUN (debug_pim_trace,
        debug_pim_trace_cmd,
@@ -3991,6 +4015,14 @@ DEFUN (debug_pim_trace,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug pim trace",
+ *     UNDEBUG_STR
+ *     DEBUG_PIM_STR
+ *     DEBUG_PIM_TRACE_STR
+ *
+ */
 DEFUN (no_debug_pim_trace,
        no_debug_pim_trace_cmd,
        "no debug pim trace",
@@ -4003,12 +4035,6 @@ DEFUN (no_debug_pim_trace,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_pim_trace,
-       undebug_pim_trace_cmd,
-       "undebug pim trace",
-       UNDEBUG_STR
-       DEBUG_PIM_STR
-       DEBUG_PIM_TRACE_STR)
 
 DEFUN (debug_ssmpingd,
        debug_ssmpingd_cmd,
@@ -4021,6 +4047,14 @@ DEFUN (debug_ssmpingd,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug ssmpingd",
+ *     UNDEBUG_STR
+ *     DEBUG_PIM_STR
+ *     DEBUG_SSMPINGD_STR
+ *
+ */
 DEFUN (no_debug_ssmpingd,
        no_debug_ssmpingd_cmd,
        "no debug ssmpingd",
@@ -4033,12 +4067,6 @@ DEFUN (no_debug_ssmpingd,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_ssmpingd,
-       undebug_ssmpingd_cmd,
-       "undebug ssmpingd",
-       UNDEBUG_STR
-       DEBUG_PIM_STR
-       DEBUG_SSMPINGD_STR)
 
 DEFUN (debug_pim_zebra,
        debug_pim_zebra_cmd,
@@ -4051,6 +4079,14 @@ DEFUN (debug_pim_zebra,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "undebug pim zebra",
+ *     UNDEBUG_STR
+ *     DEBUG_PIM_STR
+ *     DEBUG_PIM_ZEBRA_STR
+ *
+ */
 DEFUN (no_debug_pim_zebra,
        no_debug_pim_zebra_cmd,
        "no debug pim zebra",
@@ -4063,12 +4099,6 @@ DEFUN (no_debug_pim_zebra,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_pim_zebra,
-       undebug_pim_zebra_cmd,
-       "undebug pim zebra",
-       UNDEBUG_STR
-       DEBUG_PIM_STR
-       DEBUG_PIM_ZEBRA_STR)
 
 DEFUN (show_debugging_pim,
        show_debugging_pim_cmd,
@@ -4901,7 +4931,6 @@ void pim_cmd_init()
   install_element (INTERFACE_NODE, &interface_ip_pim_drprio_cmd);
   install_element (INTERFACE_NODE, &interface_no_ip_pim_drprio_cmd);
   install_element (INTERFACE_NODE, &interface_ip_pim_hello_cmd);
-  install_element (INTERFACE_NODE, &interface_ip_pim_hello_hold_cmd);
   install_element (INTERFACE_NODE, &interface_no_ip_pim_hello_cmd);
 
   // Static mroutes NEB
@@ -4991,81 +5020,59 @@ void pim_cmd_init()
 
   install_element (ENABLE_NODE, &debug_igmp_cmd);
   install_element (ENABLE_NODE, &no_debug_igmp_cmd);
-  install_element (ENABLE_NODE, &undebug_igmp_cmd);
   install_element (ENABLE_NODE, &debug_igmp_events_cmd);
   install_element (ENABLE_NODE, &no_debug_igmp_events_cmd);
-  install_element (ENABLE_NODE, &undebug_igmp_events_cmd);
   install_element (ENABLE_NODE, &debug_igmp_packets_cmd);
   install_element (ENABLE_NODE, &no_debug_igmp_packets_cmd);
-  install_element (ENABLE_NODE, &undebug_igmp_packets_cmd);
   install_element (ENABLE_NODE, &debug_igmp_trace_cmd);
   install_element (ENABLE_NODE, &no_debug_igmp_trace_cmd);
-  install_element (ENABLE_NODE, &undebug_igmp_trace_cmd);
   install_element (ENABLE_NODE, &debug_mroute_cmd);
   install_element (ENABLE_NODE, &no_debug_mroute_cmd);
   install_element (ENABLE_NODE, &debug_static_cmd);
   install_element (ENABLE_NODE, &no_debug_static_cmd);
   install_element (ENABLE_NODE, &debug_pim_cmd);
   install_element (ENABLE_NODE, &no_debug_pim_cmd);
-  install_element (ENABLE_NODE, &undebug_pim_cmd);
   install_element (ENABLE_NODE, &debug_pim_events_cmd);
   install_element (ENABLE_NODE, &no_debug_pim_events_cmd);
-  install_element (ENABLE_NODE, &undebug_pim_events_cmd);
   install_element (ENABLE_NODE, &debug_pim_packets_cmd);
   install_element (ENABLE_NODE, &debug_pim_packets_filter_cmd);
   install_element (ENABLE_NODE, &no_debug_pim_packets_cmd);
   install_element (ENABLE_NODE, &no_debug_pim_packets_filter_cmd);
-  install_element (ENABLE_NODE, &undebug_pim_packets_cmd);
   install_element (ENABLE_NODE, &debug_pim_packetdump_send_cmd);
   install_element (ENABLE_NODE, &no_debug_pim_packetdump_send_cmd);
-  install_element (ENABLE_NODE, &undebug_pim_packetdump_send_cmd);
   install_element (ENABLE_NODE, &debug_pim_packetdump_recv_cmd);
   install_element (ENABLE_NODE, &no_debug_pim_packetdump_recv_cmd);
-  install_element (ENABLE_NODE, &undebug_pim_packetdump_recv_cmd);
   install_element (ENABLE_NODE, &debug_pim_trace_cmd);
   install_element (ENABLE_NODE, &no_debug_pim_trace_cmd);
-  install_element (ENABLE_NODE, &undebug_pim_trace_cmd);
   install_element (ENABLE_NODE, &debug_ssmpingd_cmd);
   install_element (ENABLE_NODE, &no_debug_ssmpingd_cmd);
-  install_element (ENABLE_NODE, &undebug_ssmpingd_cmd);
   install_element (ENABLE_NODE, &debug_pim_zebra_cmd);
   install_element (ENABLE_NODE, &no_debug_pim_zebra_cmd);
-  install_element (ENABLE_NODE, &undebug_pim_zebra_cmd);
 
   install_element (CONFIG_NODE, &debug_igmp_cmd);
   install_element (CONFIG_NODE, &no_debug_igmp_cmd);
-  install_element (CONFIG_NODE, &undebug_igmp_cmd);
   install_element (CONFIG_NODE, &debug_igmp_events_cmd);
   install_element (CONFIG_NODE, &no_debug_igmp_events_cmd);
-  install_element (CONFIG_NODE, &undebug_igmp_events_cmd);
   install_element (CONFIG_NODE, &debug_igmp_packets_cmd);
   install_element (CONFIG_NODE, &no_debug_igmp_packets_cmd);
-  install_element (CONFIG_NODE, &undebug_igmp_packets_cmd);
   install_element (CONFIG_NODE, &debug_igmp_trace_cmd);
   install_element (CONFIG_NODE, &no_debug_igmp_trace_cmd);
-  install_element (CONFIG_NODE, &undebug_igmp_trace_cmd);
   install_element (CONFIG_NODE, &debug_mroute_cmd);
   install_element (CONFIG_NODE, &no_debug_mroute_cmd);
   install_element (CONFIG_NODE, &debug_static_cmd);
   install_element (CONFIG_NODE, &no_debug_static_cmd);
   install_element (CONFIG_NODE, &debug_pim_cmd);
   install_element (CONFIG_NODE, &no_debug_pim_cmd);
-  install_element (CONFIG_NODE, &undebug_pim_cmd);
   install_element (CONFIG_NODE, &debug_pim_events_cmd);
   install_element (CONFIG_NODE, &no_debug_pim_events_cmd);
-  install_element (CONFIG_NODE, &undebug_pim_events_cmd);
   install_element (CONFIG_NODE, &debug_pim_packets_cmd);
   install_element (CONFIG_NODE, &debug_pim_packets_filter_cmd);
   install_element (CONFIG_NODE, &no_debug_pim_packets_cmd);
   install_element (CONFIG_NODE, &no_debug_pim_packets_filter_cmd);
-  install_element (CONFIG_NODE, &undebug_pim_packets_cmd);
   install_element (CONFIG_NODE, &debug_pim_trace_cmd);
   install_element (CONFIG_NODE, &no_debug_pim_trace_cmd);
-  install_element (CONFIG_NODE, &undebug_pim_trace_cmd);
   install_element (CONFIG_NODE, &debug_ssmpingd_cmd);
   install_element (CONFIG_NODE, &no_debug_ssmpingd_cmd);
-  install_element (CONFIG_NODE, &undebug_ssmpingd_cmd);
   install_element (CONFIG_NODE, &debug_pim_zebra_cmd);
   install_element (CONFIG_NODE, &no_debug_pim_zebra_cmd);
-  install_element (CONFIG_NODE, &undebug_pim_zebra_cmd);
 }
index 749939da2edd7172484ec22883e01a445cfcb9f5..122a53eba096ac2d835492825d278c117f347511 100644 (file)
@@ -1393,6 +1393,18 @@ DEFUN (ip_rip_receive_version_2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip rip receive version (1|2)",
+ *     NO_STR
+ *     IP_STR
+ *     "Routing Information Protocol\n"
+ *     "Advertisement reception\n"
+ *     "Version control\n"
+ *     "Version 1\n"
+ *     "Version 2\n"
+ *
+ */
 DEFUN (no_ip_rip_receive_version,
        no_ip_rip_receive_version_cmd,
        "no ip rip receive version",
@@ -1412,16 +1424,6 @@ DEFUN (no_ip_rip_receive_version,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_rip_receive_version,
-       no_ip_rip_receive_version_num_cmd,
-       "no ip rip receive version (1|2)",
-       NO_STR
-       IP_STR
-       "Routing Information Protocol\n"
-       "Advertisement reception\n"
-       "Version control\n"
-       "Version 1\n"
-       "Version 2\n")
 
 DEFUN (ip_rip_send_version,
        ip_rip_send_version_cmd,
@@ -1495,6 +1497,18 @@ DEFUN (ip_rip_send_version_2,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip rip send version (1|2)",
+ *     NO_STR
+ *     IP_STR
+ *     "Routing Information Protocol\n"
+ *     "Advertisement transmission\n"
+ *     "Version control\n"
+ *     "Version 1\n"
+ *     "Version 2\n"
+ *
+ */
 DEFUN (no_ip_rip_send_version,
        no_ip_rip_send_version_cmd,
        "no ip rip send version",
@@ -1514,17 +1528,21 @@ DEFUN (no_ip_rip_send_version,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_rip_send_version,
-       no_ip_rip_send_version_num_cmd,
-       "no ip rip send version (1|2)",
-       NO_STR
-       IP_STR
-       "Routing Information Protocol\n"
-       "Advertisement transmission\n"
-       "Version control\n"
-       "Version 1\n"
-       "Version 2\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip rip authentication mode (md5|text) auth-length (rfc|old-ripd)",
+ *     IP_STR
+ *     "Routing Information Protocol\n"
+ *     "Authentication control\n"
+ *     "Authentication mode\n"
+ *     "Keyed message digest\n"
+ *     "Clear text authentication\n"
+ *     "MD5 authentication data length\n"
+ *     "RFC compatible\n"
+ *     "Old ripd compatible\n"
+ *
+ */
 DEFUN (ip_rip_authentication_mode,
        ip_rip_authentication_mode_cmd,
        "ip rip authentication mode (md5|text)",
@@ -1582,19 +1600,31 @@ DEFUN (ip_rip_authentication_mode,
   return CMD_SUCCESS;
 }
 
-ALIAS (ip_rip_authentication_mode,
-       ip_rip_authentication_mode_authlen_cmd,
-       "ip rip authentication mode (md5|text) auth-length (rfc|old-ripd)",
-       IP_STR
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication mode\n"
-       "Keyed message digest\n"
-       "Clear text authentication\n"
-       "MD5 authentication data length\n"
-       "RFC compatible\n"
-       "Old ripd compatible\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip rip authentication mode (md5|text)",
+ *     NO_STR
+ *     IP_STR
+ *     "Routing Information Protocol\n"
+ *     "Authentication control\n"
+ *     "Authentication mode\n"
+ *     "Keyed message digest\n"
+ *     "Clear text authentication\n"
+ *
+ * "no ip rip authentication mode (md5|text) auth-length (rfc|old-ripd)",
+ *     NO_STR
+ *     IP_STR
+ *     "Routing Information Protocol\n"
+ *     "Authentication control\n"
+ *     "Authentication mode\n"
+ *     "Keyed message digest\n"
+ *     "Clear text authentication\n"
+ *     "MD5 authentication data length\n"
+ *     "RFC compatible\n"
+ *     "Old ripd compatible\n"
+ *
+ */
 DEFUN (no_ip_rip_authentication_mode,
        no_ip_rip_authentication_mode_cmd,
        "no ip rip authentication mode",
@@ -1616,30 +1646,7 @@ DEFUN (no_ip_rip_authentication_mode,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_rip_authentication_mode,
-       no_ip_rip_authentication_mode_type_cmd,
-       "no ip rip authentication mode (md5|text)",
-       NO_STR
-       IP_STR
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication mode\n"
-       "Keyed message digest\n"
-       "Clear text authentication\n")
 
-ALIAS (no_ip_rip_authentication_mode,
-       no_ip_rip_authentication_mode_type_authlen_cmd,
-       "no ip rip authentication mode (md5|text) auth-length (rfc|old-ripd)",
-       NO_STR
-       IP_STR
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication mode\n"
-       "Keyed message digest\n"
-       "Clear text authentication\n"
-       "MD5 authentication data length\n"
-       "RFC compatible\n"
-       "Old ripd compatible\n")
 
 DEFUN (ip_rip_authentication_string,
        ip_rip_authentication_string_cmd,
@@ -1677,6 +1684,17 @@ DEFUN (ip_rip_authentication_string,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip rip authentication string LINE",
+ *     NO_STR
+ *     IP_STR
+ *     "Routing Information Protocol\n"
+ *     "Authentication control\n"
+ *     "Authentication string\n"
+ *     "Authentication string\n"
+ *
+ */
 DEFUN (no_ip_rip_authentication_string,
        no_ip_rip_authentication_string_cmd,
        "no ip rip authentication string",
@@ -1700,15 +1718,6 @@ DEFUN (no_ip_rip_authentication_string,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_rip_authentication_string,
-       no_ip_rip_authentication_string2_cmd,
-       "no ip rip authentication string LINE",
-       NO_STR
-       IP_STR
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication string\n"
-       "Authentication string\n")
 
 DEFUN (ip_rip_authentication_key_chain,
        ip_rip_authentication_key_chain_cmd,
@@ -1740,6 +1749,17 @@ DEFUN (ip_rip_authentication_key_chain,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip rip authentication key-chain LINE",
+ *     NO_STR
+ *     IP_STR
+ *     "Routing Information Protocol\n"
+ *     "Authentication control\n"
+ *     "Authentication key-chain\n"
+ *     "name of key-chain\n"
+ *
+ */
 DEFUN (no_ip_rip_authentication_key_chain,
        no_ip_rip_authentication_key_chain_cmd,
        "no ip rip authentication key-chain",
@@ -1763,15 +1783,6 @@ DEFUN (no_ip_rip_authentication_key_chain,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_rip_authentication_key_chain,
-       no_ip_rip_authentication_key_chain2_cmd,
-       "no ip rip authentication key-chain LINE",
-       NO_STR
-       IP_STR
-       "Routing Information Protocol\n"
-       "Authentication control\n"
-       "Authentication key-chain\n"
-       "name of key-chain\n")
 
 /* CHANGED: ip rip split-horizon
    Cisco and Zebra's command is
@@ -2098,27 +2109,20 @@ rip_if_init (void)
   install_element (INTERFACE_NODE, &ip_rip_send_version_1_cmd);
   install_element (INTERFACE_NODE, &ip_rip_send_version_2_cmd);
   install_element (INTERFACE_NODE, &no_ip_rip_send_version_cmd);
-  install_element (INTERFACE_NODE, &no_ip_rip_send_version_num_cmd);
 
   install_element (INTERFACE_NODE, &ip_rip_receive_version_cmd);
   install_element (INTERFACE_NODE, &ip_rip_receive_version_1_cmd);
   install_element (INTERFACE_NODE, &ip_rip_receive_version_2_cmd);
   install_element (INTERFACE_NODE, &no_ip_rip_receive_version_cmd);
-  install_element (INTERFACE_NODE, &no_ip_rip_receive_version_num_cmd);
 
   install_element (INTERFACE_NODE, &ip_rip_authentication_mode_cmd);
-  install_element (INTERFACE_NODE, &ip_rip_authentication_mode_authlen_cmd);
   install_element (INTERFACE_NODE, &no_ip_rip_authentication_mode_cmd);
-  install_element (INTERFACE_NODE, &no_ip_rip_authentication_mode_type_cmd);
-  install_element (INTERFACE_NODE, &no_ip_rip_authentication_mode_type_authlen_cmd);
 
   install_element (INTERFACE_NODE, &ip_rip_authentication_key_chain_cmd);
   install_element (INTERFACE_NODE, &no_ip_rip_authentication_key_chain_cmd);
-  install_element (INTERFACE_NODE, &no_ip_rip_authentication_key_chain2_cmd);
 
   install_element (INTERFACE_NODE, &ip_rip_authentication_string_cmd);
   install_element (INTERFACE_NODE, &no_ip_rip_authentication_string_cmd);
-  install_element (INTERFACE_NODE, &no_ip_rip_authentication_string2_cmd);
 
   install_element (INTERFACE_NODE, &ip_rip_split_horizon_cmd);
   install_element (INTERFACE_NODE, &ip_rip_split_horizon_poisoned_reverse_cmd);
index 76186cdf66c4252e14d340f033b4bbfb07e6049e..4bb5958e9d637ec47d455cb9910d748fc8dc35c8 100644 (file)
@@ -735,7 +735,7 @@ static struct route_map_rule_cmd route_set_tag_cmd =
 #define MATCH_STR "Match values from routing table\n"
 #define SET_STR "Set values in destination routing protocol\n"
 
-DEFUN (match_metric, 
+DEFUN (match_metric,
        match_metric_cmd,
        "match metric <0-4294967295>",
        MATCH_STR
@@ -745,6 +745,15 @@ DEFUN (match_metric,
   return rip_route_match_add (vty, vty->index, "metric", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match metric <0-4294967295>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match metric of route\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_match_metric,
        no_match_metric_cmd,
        "no match metric",
@@ -755,13 +764,6 @@ DEFUN (no_match_metric,
   return rip_route_match_delete (vty, vty->index, "metric", argv[3]->arg);
 }
 
-ALIAS (no_match_metric,
-       no_match_metric_val_cmd,
-       "no match metric <0-4294967295>",
-       NO_STR
-       MATCH_STR
-       "Match metric of route\n"
-       "Metric value\n")
 
 DEFUN (match_interface,
        match_interface_cmd,
@@ -773,6 +775,15 @@ DEFUN (match_interface,
   return rip_route_match_add (vty, vty->index, "interface", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match interface WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match first hop interface of route\n"
+ *     "Interface name\n"
+ *
+ */
 DEFUN (no_match_interface,
        no_match_interface_cmd,
        "no match interface",
@@ -783,13 +794,6 @@ DEFUN (no_match_interface,
   return rip_route_match_delete (vty, vty->index, "interface", argv[3]->arg);
 }
 
-ALIAS (no_match_interface,
-       no_match_interface_val_cmd,
-       "no match interface WORD",
-       NO_STR
-       MATCH_STR
-       "Match first hop interface of route\n"
-       "Interface name\n")
 
 DEFUN (match_ip_next_hop,
        match_ip_next_hop_cmd,
@@ -804,6 +808,18 @@ DEFUN (match_ip_next_hop,
   return rip_route_match_add (vty, vty->index, "ip next-hop", argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip next-hop (<1-199>|<1300-2699>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match next-hop address of route\n"
+ *     "IP access-list number\n"
+ *     "IP access-list number (expanded range)\n"
+ *     "IP Access-list name\n"
+ *
+ */
 DEFUN (no_match_ip_next_hop,
        no_match_ip_next_hop_cmd,
        "no match ip next-hop",
@@ -815,16 +831,6 @@ DEFUN (no_match_ip_next_hop,
   return rip_route_match_delete (vty, vty->index, "ip next-hop", argv[4]->arg);
 }
 
-ALIAS (no_match_ip_next_hop,
-       no_match_ip_next_hop_val_cmd,
-       "no match ip next-hop (<1-199>|<1300-2699>|WORD)",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match next-hop address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP Access-list name\n")
 
 DEFUN (match_ip_next_hop_prefix_list,
        match_ip_next_hop_prefix_list_cmd,
@@ -838,6 +844,17 @@ DEFUN (match_ip_next_hop_prefix_list,
   return rip_route_match_add (vty, vty->index, "ip next-hop prefix-list", argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip next-hop prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match next-hop address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_next_hop_prefix_list,
        no_match_ip_next_hop_prefix_list_cmd,
        "no match ip next-hop prefix-list",
@@ -850,15 +867,6 @@ DEFUN (no_match_ip_next_hop_prefix_list,
   return rip_route_match_delete (vty, vty->index, "ip next-hop prefix-list", argv[5]->arg);
 }
 
-ALIAS (no_match_ip_next_hop_prefix_list,
-       no_match_ip_next_hop_prefix_list_val_cmd,
-       "no match ip next-hop prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match next-hop address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
 DEFUN (match_ip_address,
        match_ip_address_cmd,
@@ -874,7 +882,19 @@ DEFUN (match_ip_address,
   return rip_route_match_add (vty, vty->index, "ip address", argv[3]->arg);
 }
 
-DEFUN (no_match_ip_address, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address (<1-199>|<1300-2699>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *     "IP access-list number\n"
+ *     "IP access-list number (expanded range)\n"
+ *     "IP Access-list name\n"
+ *
+ */
+DEFUN (no_match_ip_address,
        no_match_ip_address_cmd,
        "no match ip address",
        NO_STR
@@ -885,18 +905,8 @@ DEFUN (no_match_ip_address,
   return rip_route_match_delete (vty, vty->index, "ip address", argv[4]->arg);
 }
 
-ALIAS (no_match_ip_address,
-       no_match_ip_address_val_cmd,
-       "no match ip address (<1-199>|<1300-2699>|WORD)",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP Access-list name\n")
 
-DEFUN (match_ip_address_prefix_list, 
+DEFUN (match_ip_address_prefix_list,
        match_ip_address_prefix_list_cmd,
        "match ip address prefix-list WORD",
        MATCH_STR
@@ -908,6 +918,17 @@ DEFUN (match_ip_address_prefix_list,
   return rip_route_match_add (vty, vty->index, "ip address prefix-list", argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_address_prefix_list,
        no_match_ip_address_prefix_list_cmd,
        "no match ip address prefix-list",
@@ -920,17 +941,8 @@ DEFUN (no_match_ip_address_prefix_list,
   return rip_route_match_delete (vty, vty->index, "ip address prefix-list", argv[5]->arg);
 }
 
-ALIAS (no_match_ip_address_prefix_list,
-       no_match_ip_address_prefix_list_val_cmd,
-       "no match ip address prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
-DEFUN (match_tag, 
+DEFUN (match_tag,
        match_tag_cmd,
        "match tag <1-65535>",
        MATCH_STR
@@ -940,6 +952,15 @@ DEFUN (match_tag,
   return rip_route_match_add (vty, vty->index, "tag", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match tag <1-65535>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match tag of route\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_match_tag,
        no_match_tag_cmd,
        "no match tag",
@@ -950,16 +971,17 @@ DEFUN (no_match_tag,
   return rip_route_match_delete (vty, vty->index, "tag", argv[3]->arg);
 }
 
-ALIAS (no_match_tag,
-       no_match_tag_val_cmd,
-       "no match tag <1-65535>",
-       NO_STR
-       MATCH_STR
-       "Match tag of route\n"
-       "Metric value\n")
 
 /* set functions */
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "set metric <+/-metric>",
+ *     SET_STR
+ *     "Metric value for destination routing protocol\n"
+ *     "Add or subtract metric\n"
+ *
+ */
 DEFUN (set_metric,
        set_metric_cmd,
        "set metric <0-4294967295>",
@@ -970,13 +992,22 @@ DEFUN (set_metric,
   return rip_route_set_add (vty, vty->index, "metric", argv[2]->arg);
 }
 
-ALIAS (set_metric,
-       set_metric_addsub_cmd,
-       "set metric <+/-metric>",
-       SET_STR
-       "Metric value for destination routing protocol\n"
-       "Add or subtract metric\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set metric <+/-metric>",
+ *     NO_STR
+ *     SET_STR
+ *     "Metric value for destination routing protocol\n"
+ *     "Add or subtract metric\n"
+ *
+ * "no set metric <0-4294967295>",
+ *     NO_STR
+ *     SET_STR
+ *     "Metric value for destination routing protocol\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_set_metric,
        no_set_metric_cmd,
        "no set metric",
@@ -987,21 +1018,7 @@ DEFUN (no_set_metric,
   return rip_route_set_delete (vty, vty->index, "metric", argv[3]->arg);
 }
 
-ALIAS (no_set_metric,
-       no_set_metric_val_cmd,
-       "no set metric <0-4294967295>",
-       NO_STR
-       SET_STR
-       "Metric value for destination routing protocol\n"
-       "Metric value\n")
 
-ALIAS (no_set_metric,
-       no_set_metric_addsub_cmd,
-       "no set metric <+/-metric>",
-       NO_STR
-       SET_STR
-       "Metric value for destination routing protocol\n"
-       "Add or subtract metric\n")
 
 DEFUN (set_ip_nexthop,
        set_ip_nexthop_cmd,
@@ -1031,6 +1048,16 @@ DEFUN (set_ip_nexthop,
   return rip_route_set_add (vty, vty->index, "ip next-hop", argv[3]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set ip next-hop A.B.C.D",
+ *     NO_STR
+ *     SET_STR
+ *     IP_STR
+ *     "Next hop address\n"
+ *     "IP address of next hop\n"
+ *
+ */
 DEFUN (no_set_ip_nexthop,
        no_set_ip_nexthop_cmd,
        "no set ip next-hop",
@@ -1042,14 +1069,6 @@ DEFUN (no_set_ip_nexthop,
   return rip_route_set_delete (vty, vty->index, "ip next-hop", argv[4]->arg);
 }
 
-ALIAS (no_set_ip_nexthop,
-       no_set_ip_nexthop_val_cmd,
-       "no set ip next-hop A.B.C.D",
-       NO_STR
-       SET_STR
-       IP_STR
-       "Next hop address\n"
-       "IP address of next hop\n")
 
 DEFUN (set_tag,
        set_tag_cmd,
@@ -1061,6 +1080,15 @@ DEFUN (set_tag,
   return rip_route_set_add (vty, vty->index, "tag", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set tag <1-65535>",
+ *     NO_STR
+ *     SET_STR
+ *     "Tag value for routing protocol\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (no_set_tag,
        no_set_tag_cmd,
        "no set tag",
@@ -1071,13 +1099,6 @@ DEFUN (no_set_tag,
   return rip_route_set_delete (vty, vty->index, "tag", argv[3]->arg);
 }
 
-ALIAS (no_set_tag,
-       no_set_tag_val_cmd,
-       "no set tag <1-65535>",
-       NO_STR
-       SET_STR
-       "Tag value for routing protocol\n"
-       "Tag value\n")
 
 void
 rip_route_map_reset ()
@@ -1108,35 +1129,23 @@ rip_route_map_init ()
 
   install_element (RMAP_NODE, &match_metric_cmd);
   install_element (RMAP_NODE, &no_match_metric_cmd);
-  install_element (RMAP_NODE, &no_match_metric_val_cmd);
   install_element (RMAP_NODE, &match_interface_cmd);
   install_element (RMAP_NODE, &no_match_interface_cmd);
-  install_element (RMAP_NODE, &no_match_interface_val_cmd);
   install_element (RMAP_NODE, &match_ip_next_hop_cmd);
   install_element (RMAP_NODE, &no_match_ip_next_hop_cmd);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_val_cmd);
   install_element (RMAP_NODE, &match_ip_next_hop_prefix_list_cmd);
   install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_cmd);
-  install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_val_cmd);
   install_element (RMAP_NODE, &match_ip_address_cmd);
   install_element (RMAP_NODE, &no_match_ip_address_cmd);
-  install_element (RMAP_NODE, &no_match_ip_address_val_cmd);
   install_element (RMAP_NODE, &match_ip_address_prefix_list_cmd);
   install_element (RMAP_NODE, &no_match_ip_address_prefix_list_cmd);
-  install_element (RMAP_NODE, &no_match_ip_address_prefix_list_val_cmd);
   install_element (RMAP_NODE, &match_tag_cmd);
   install_element (RMAP_NODE, &no_match_tag_cmd);
-  install_element (RMAP_NODE, &no_match_tag_val_cmd);
 
   install_element (RMAP_NODE, &set_metric_cmd);
-  install_element (RMAP_NODE, &set_metric_addsub_cmd);
   install_element (RMAP_NODE, &no_set_metric_cmd);
-  install_element (RMAP_NODE, &no_set_metric_val_cmd);
-  install_element (RMAP_NODE, &no_set_metric_addsub_cmd);
   install_element (RMAP_NODE, &set_ip_nexthop_cmd);
   install_element (RMAP_NODE, &no_set_ip_nexthop_cmd);
-  install_element (RMAP_NODE, &no_set_ip_nexthop_val_cmd);
   install_element (RMAP_NODE, &set_tag_cmd);
   install_element (RMAP_NODE, &no_set_tag_cmd);
-  install_element (RMAP_NODE, &no_set_tag_val_cmd);
 }
index 3446bb579c2f7558347aba54dbb0629491758fb0..d483d1ef31e47c7df39e6634ee4c59d7e958c790 100644 (file)
@@ -2962,6 +2962,14 @@ DEFUN (rip_version,
   return CMD_SUCCESS;
 } 
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no version <1-2>",
+ *     NO_STR
+ *     "Set routing protocol version\n"
+ *     "version\n"
+ *
+ */
 DEFUN (no_rip_version,
        no_rip_version_cmd,
        "no version",
@@ -2975,12 +2983,6 @@ DEFUN (no_rip_version,
   return CMD_SUCCESS;
 } 
 
-ALIAS (no_rip_version,
-       no_rip_version_val_cmd,
-       "no version <1-2>",
-       NO_STR
-       "Set routing protocol version\n"
-       "version\n")
 
 DEFUN (rip_route,
        rip_route_cmd,
@@ -3085,6 +3087,14 @@ DEFUN (rip_default_metric,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no default-metric <1-16>",
+ *     NO_STR
+ *     "Set a metric of redistribute routes\n"
+ *     "Default metric\n"
+ *
+ */
 DEFUN (no_rip_default_metric,
        no_rip_default_metric_cmd,
        "no default-metric",
@@ -3100,12 +3110,6 @@ DEFUN (no_rip_default_metric,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_rip_default_metric,
-       no_rip_default_metric_val_cmd,
-       "no default-metric <1-16>",
-       NO_STR
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
 
 DEFUN (rip_timers,
        rip_timers_cmd,
@@ -3155,6 +3159,17 @@ DEFUN (rip_timers,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no timers basic <0-65535> <0-65535> <0-65535>",
+ *     NO_STR
+ *     "Adjust routing timers\n"
+ *     "Basic routing protocol update timers\n"
+ *     "Routing table update timer value in second. Default is 30.\n"
+ *     "Routing information timeout timer. Default is 180.\n"
+ *     "Garbage collection timer. Default is 120.\n"
+ *
+ */
 DEFUN (no_rip_timers,
        no_rip_timers_cmd,
        "no timers basic",
@@ -3173,15 +3188,6 @@ DEFUN (no_rip_timers,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_rip_timers,
-       no_rip_timers_val_cmd,
-       "no timers basic <0-65535> <0-65535> <0-65535>",
-       NO_STR
-       "Adjust routing timers\n"
-       "Basic routing protocol update timers\n"
-       "Routing table update timer value in second. Default is 30.\n"
-       "Routing information timeout timer. Default is 180.\n"
-       "Garbage collection timer. Default is 120.\n")
 
 
 struct route_table *rip_distance_table;
@@ -4156,13 +4162,10 @@ rip_init (void)
   install_default (RIP_NODE);
   install_element (RIP_NODE, &rip_version_cmd);
   install_element (RIP_NODE, &no_rip_version_cmd);
-  install_element (RIP_NODE, &no_rip_version_val_cmd);
   install_element (RIP_NODE, &rip_default_metric_cmd);
   install_element (RIP_NODE, &no_rip_default_metric_cmd);
-  install_element (RIP_NODE, &no_rip_default_metric_val_cmd);
   install_element (RIP_NODE, &rip_timers_cmd);
   install_element (RIP_NODE, &no_rip_timers_cmd);
-  install_element (RIP_NODE, &no_rip_timers_val_cmd);
   install_element (RIP_NODE, &rip_route_cmd);
   install_element (RIP_NODE, &no_rip_route_cmd);
   install_element (RIP_NODE, &rip_distance_cmd);
index c6167dad6db77ef5e2361a766b2f6c88e4b48d0d..930752abd0f2a62bdfd3413510e43459afcf64bc 100644 (file)
@@ -1038,6 +1038,16 @@ DEFUN (ipv6_ripng_split_horizon_poisoned_reverse,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 ripng split-horizon poisoned-reverse",
+ *     NO_STR
+ *     IPV6_STR
+ *     "Routing Information Protocol\n"
+ *     "Perform split horizon\n"
+ *     "With poisoned-reverse\n"
+ *
+ */
 DEFUN (no_ipv6_ripng_split_horizon,
        no_ipv6_ripng_split_horizon_cmd,
        "no ipv6 ripng split-horizon",
@@ -1056,14 +1066,6 @@ DEFUN (no_ipv6_ripng_split_horizon,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_ripng_split_horizon,
-       no_ipv6_ripng_split_horizon_poisoned_reverse_cmd,
-       "no ipv6 ripng split-horizon poisoned-reverse",
-       NO_STR
-       IPV6_STR
-       "Routing Information Protocol\n"
-       "Perform split horizon\n"
-       "With poisoned-reverse\n")
 
 DEFUN (ripng_passive_interface,
        ripng_passive_interface_cmd,
@@ -1210,5 +1212,4 @@ ripng_if_init ()
   install_element (INTERFACE_NODE, &ipv6_ripng_split_horizon_cmd);
   install_element (INTERFACE_NODE, &ipv6_ripng_split_horizon_poisoned_reverse_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_ripng_split_horizon_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_ripng_split_horizon_poisoned_reverse_cmd);
 }
index 52495aa3ff4aca1222586145144e00f231c59d7e..9c25d600332e9c291e120deb43f618cf23aeab96 100644 (file)
@@ -500,7 +500,7 @@ static struct route_map_rule_cmd route_set_tag_cmd =
 #define MATCH_STR "Match values from routing table\n"
 #define SET_STR "Set values in destination routing protocol\n"
 
-DEFUN (match_metric, 
+DEFUN (match_metric,
        match_metric_cmd,
        "match metric <0-4294967295>",
        MATCH_STR
@@ -510,6 +510,15 @@ DEFUN (match_metric,
   return ripng_route_match_add (vty, vty->index, "metric", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match metric <0-4294967295>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match metric of route\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_match_metric,
        no_match_metric_cmd,
        "no match metric",
@@ -520,13 +529,6 @@ DEFUN (no_match_metric,
   return ripng_route_match_delete (vty, vty->index, "metric", argv[3]->arg);
 }
 
-ALIAS (no_match_metric,
-       no_match_metric_val_cmd,
-       "no match metric <0-4294967295>",
-       NO_STR
-       MATCH_STR
-       "Match metric of route\n"
-       "Metric value\n")
 
 DEFUN (match_interface,
        match_interface_cmd,
@@ -538,6 +540,15 @@ DEFUN (match_interface,
   return ripng_route_match_add (vty, vty->index, "interface", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match interface WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match first hop interface of route\n"
+ *     "Interface name\n"
+ *
+ */
 DEFUN (no_match_interface,
        no_match_interface_cmd,
        "no match interface",
@@ -548,13 +559,6 @@ DEFUN (no_match_interface,
   return ripng_route_match_delete (vty, vty->index, "interface", argv[3]->arg);
 }
 
-ALIAS (no_match_interface,
-       no_match_interface_val_cmd,
-       "no match interface WORD",
-       NO_STR
-       MATCH_STR
-       "Match first hop interface of route\n"
-       "Interface name\n")
 
 DEFUN (match_tag,
        match_tag_cmd,
@@ -566,6 +570,15 @@ DEFUN (match_tag,
   return ripng_route_match_add (vty, vty->index, "tag", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match tag <1-65535>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match tag of route\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_match_tag,
        no_match_tag_cmd,
        "no match tag",
@@ -576,13 +589,6 @@ DEFUN (no_match_tag,
   return ripng_route_match_delete (vty, vty->index, "tag", argv[3]->arg);
 }
 
-ALIAS (no_match_tag,
-       no_match_tag_val_cmd,
-       "no match tag <1-65535>",
-       NO_STR
-       MATCH_STR
-       "Match tag of route\n"
-       "Metric value\n")
 
 /* set functions */
 
@@ -596,6 +602,15 @@ DEFUN (set_metric,
   return ripng_route_set_add (vty, vty->index, "metric", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set metric <0-4294967295>",
+ *     NO_STR
+ *     SET_STR
+ *     "Metric value for destination routing protocol\n"
+ *     "Metric value\n"
+ *
+ */
 DEFUN (no_set_metric,
        no_set_metric_cmd,
        "no set metric",
@@ -606,13 +621,6 @@ DEFUN (no_set_metric,
   return ripng_route_set_delete (vty, vty->index, "metric", argv[3]->arg);
 }
 
-ALIAS (no_set_metric,
-       no_set_metric_val_cmd,
-       "no set metric <0-4294967295>",
-       NO_STR
-       SET_STR
-       "Metric value for destination routing protocol\n"
-       "Metric value\n")
 
 DEFUN (set_ipv6_nexthop_local,
        set_ipv6_nexthop_local_cmd,
@@ -642,6 +650,17 @@ DEFUN (set_ipv6_nexthop_local,
   return ripng_route_set_add (vty, vty->index, "ipv6 next-hop local", argv[4]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set ipv6 next-hop local X:X::X:X",
+ *     NO_STR
+ *     SET_STR
+ *     IPV6_STR
+ *     "IPv6 next-hop address\n"
+ *     "IPv6 local address\n"
+ *     "IPv6 address of next hop\n"
+ *
+ */
 DEFUN (no_set_ipv6_nexthop_local,
        no_set_ipv6_nexthop_local_cmd,
        "no set ipv6 next-hop local",
@@ -654,15 +673,6 @@ DEFUN (no_set_ipv6_nexthop_local,
   return ripng_route_set_delete (vty, vty->index, "ipv6 next-hop local", argv[5]->arg);
 }
 
-ALIAS (no_set_ipv6_nexthop_local,
-       no_set_ipv6_nexthop_local_val_cmd,
-       "no set ipv6 next-hop local X:X::X:X",
-       NO_STR
-       SET_STR
-       IPV6_STR
-       "IPv6 next-hop address\n"
-       "IPv6 local address\n"
-       "IPv6 address of next hop\n")
 
 DEFUN (set_tag,
        set_tag_cmd,
@@ -674,6 +684,15 @@ DEFUN (set_tag,
   return ripng_route_set_add (vty, vty->index, "tag", argv[2]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no set tag <1-65535>",
+ *     NO_STR
+ *     SET_STR
+ *     "Tag value for routing protocol\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (no_set_tag,
        no_set_tag_cmd,
        "no set tag",
@@ -684,13 +703,6 @@ DEFUN (no_set_tag,
   return ripng_route_set_delete (vty, vty->index, "tag", argv[3]->arg);
 }
 
-ALIAS (no_set_tag,
-       no_set_tag_val_cmd,
-       "no set tag <1-65535>",
-       NO_STR
-       SET_STR
-       "Tag value for routing protocol\n"
-       "Tag value\n")
 
 void
 ripng_route_map_reset ()
@@ -715,21 +727,15 @@ ripng_route_map_init ()
 
   install_element (RMAP_NODE, &match_metric_cmd);
   install_element (RMAP_NODE, &no_match_metric_cmd);
-  install_element (RMAP_NODE, &no_match_metric_val_cmd);
   install_element (RMAP_NODE, &match_interface_cmd);
   install_element (RMAP_NODE, &no_match_interface_cmd);
-  install_element (RMAP_NODE, &no_match_interface_val_cmd);
   install_element (RMAP_NODE, &match_tag_cmd);
   install_element (RMAP_NODE, &no_match_tag_cmd);
-  install_element (RMAP_NODE, &no_match_tag_val_cmd);
 
   install_element (RMAP_NODE, &set_metric_cmd);
   install_element (RMAP_NODE, &no_set_metric_cmd);
-  install_element (RMAP_NODE, &no_set_metric_val_cmd);
   install_element (RMAP_NODE, &set_ipv6_nexthop_local_cmd);
   install_element (RMAP_NODE, &no_set_ipv6_nexthop_local_cmd);
-  install_element (RMAP_NODE, &no_set_ipv6_nexthop_local_val_cmd);
   install_element (RMAP_NODE, &set_tag_cmd);
   install_element (RMAP_NODE, &no_set_tag_cmd);
-  install_element (RMAP_NODE, &no_set_tag_val_cmd);
 }
index 06ff558ab6faa59743a5e6915b478948d0cdd327..055a074cc708df2ac334b6fb510da6352eec5ab7 100644 (file)
@@ -345,6 +345,30 @@ DEFUN (ripng_redistribute_type,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16> route-map WORD",
+ *     NO_STR
+ *     "Redistribute\n"
+ *     QUAGGA_REDIST_HELP_STR_RIPNGD
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *
+ * "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16>",
+ *     NO_STR
+ *     "Redistribute\n"
+ *     QUAGGA_REDIST_HELP_STR_RIPNGD
+ *     "Metric\n"
+ *     "Metric value\n"
+ *
+ * "no redistribute " QUAGGA_REDIST_STR_RIPNGD " route-map WORD",
+ *     NO_STR
+ *     "Redistribute\n"
+ *     QUAGGA_REDIST_HELP_STR_RIPNGD
+ *     "Route map reference\n"
+ *     "Pointer to route-map entries\n"
+ *
+ */
 DEFUN (no_ripng_redistribute_type,
        no_ripng_redistribute_type_cmd,
        "no redistribute " QUAGGA_REDIST_STR_RIPNGD,
@@ -394,14 +418,6 @@ DEFUN (ripng_redistribute_type_metric,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ripng_redistribute_type,
-       no_ripng_redistribute_type_metric_cmd,
-       "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16>",
-       NO_STR
-       "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_RIPNGD
-       "Metric\n"
-       "Metric value\n")
 
 DEFUN (ripng_redistribute_type_routemap,
        ripng_redistribute_type_routemap_cmd,
@@ -427,14 +443,6 @@ DEFUN (ripng_redistribute_type_routemap,
  return CMD_SUCCESS;
 }
 
-ALIAS (no_ripng_redistribute_type,
-       no_ripng_redistribute_type_routemap_cmd,
-       "no redistribute " QUAGGA_REDIST_STR_RIPNGD " route-map WORD",
-       NO_STR
-       "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_RIPNGD
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
 
 DEFUN (ripng_redistribute_type_metric_routemap,
        ripng_redistribute_type_metric_routemap_cmd,
@@ -464,14 +472,6 @@ DEFUN (ripng_redistribute_type_metric_routemap,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ripng_redistribute_type,
-       no_ripng_redistribute_type_metric_routemap_cmd,
-       "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16> route-map WORD",
-       NO_STR
-       "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_RIPNGD
-       "Route map reference\n"
-       "Pointer to route-map entries\n")
 
 void
 ripng_redistribute_write (struct vty *vty, int config_mode)
@@ -582,7 +582,4 @@ zebra_init (struct thread_master *master)
   install_element (RIPNG_NODE, &ripng_redistribute_type_metric_cmd);
   install_element (RIPNG_NODE, &ripng_redistribute_type_metric_routemap_cmd);
   install_element (RIPNG_NODE, &no_ripng_redistribute_type_cmd);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_type_routemap_cmd);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_type_metric_cmd);
-  install_element (RIPNG_NODE, &no_ripng_redistribute_type_metric_routemap_cmd);
 }
index dc00d96298ccd96fdcb507bede1240b885ad0bc8..dd8f1fc39a9d4345c6f84f72b433a44fc13a2fe6 100644 (file)
@@ -2400,6 +2400,14 @@ DEFUN (ripng_default_metric,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no default-metric <1-16>",
+ *     NO_STR
+ *     "Set a metric of redistribute routes\n"
+ *     "Default metric\n"
+ *
+ */
 DEFUN (no_ripng_default_metric,
        no_ripng_default_metric_cmd,
        "no default-metric",
@@ -2414,12 +2422,6 @@ DEFUN (no_ripng_default_metric,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ripng_default_metric,
-       no_ripng_default_metric_val_cmd,
-       "no default-metric <1-16>",
-       NO_STR
-       "Set a metric of redistribute routes\n"
-       "Default metric\n")
 
 #if 0
 /* RIPng update timer setup. */
@@ -2552,6 +2554,17 @@ DEFUN (ripng_timers,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no timers basic <0-65535> <0-65535> <0-65535>",
+ *     NO_STR
+ *     "RIPng timers setup\n"
+ *     "Basic timer\n"
+ *     "Routing table update timer value in second. Default is 30.\n"
+ *     "Routing information timeout timer. Default is 180.\n"
+ *     "Garbage collection timer. Default is 120.\n"
+ *
+ */
 DEFUN (no_ripng_timers,
        no_ripng_timers_cmd,
        "no timers basic",
@@ -2570,15 +2583,6 @@ DEFUN (no_ripng_timers,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ripng_timers,
-       no_ripng_timers_val_cmd,
-       "no timers basic <0-65535> <0-65535> <0-65535>",
-       NO_STR
-       "RIPng timers setup\n"
-       "Basic timer\n"
-       "Routing table update timer value in second. Default is 30.\n"
-       "Routing information timeout timer. Default is 180.\n"
-       "Garbage collection timer. Default is 120.\n")
 
 DEFUN (show_ipv6_protocols,
        show_ipv6_protocols_cmd,
@@ -3110,11 +3114,9 @@ ripng_init ()
 
   install_element (RIPNG_NODE, &ripng_default_metric_cmd);
   install_element (RIPNG_NODE, &no_ripng_default_metric_cmd);
-  install_element (RIPNG_NODE, &no_ripng_default_metric_val_cmd);
 
   install_element (RIPNG_NODE, &ripng_timers_cmd);
   install_element (RIPNG_NODE, &no_ripng_timers_cmd);
-  install_element (RIPNG_NODE, &no_ripng_timers_val_cmd);
 #if 0
   install_element (RIPNG_NODE, &ripng_update_timer_cmd);
   install_element (RIPNG_NODE, &no_ripng_update_timer_cmd);
index 737bf9665e870e7c7e057384decd9d52c418b988..5e2f64b54488db500ae3e30dc146df67eb9dc549 100644 (file)
@@ -1249,13 +1249,6 @@ DEFUN_NOSH (zebra_interface,
   return ret;
 }
 
-ALIAS (zebra_interface,
-       zebra_interface_vrf_cmd,
-       "interface IFNAME " VRF_CMD_STR,
-       "Select an interface to configure\n"
-       "Interface's name\n"
-       VRF_CMD_HELP_STR)
-
 static void
 interface_update_stats (void)
 {
@@ -1305,6 +1298,14 @@ struct cmd_node vrf_node =
 };
 
 /* Show all interfaces to vty. */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show interface " VRF_CMD_STR,
+ *     SHOW_STR
+ *     "Interface status and configuration\n"
+ *     VRF_CMD_HELP_STR
+ *
+ */
 DEFUN (show_interface,
        show_interface_cmd,
        "show interface",
@@ -1327,12 +1328,6 @@ DEFUN (show_interface,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_interface,
-       show_interface_vrf_cmd,
-       "show interface " VRF_CMD_STR,
-       SHOW_STR
-       "Interface status and configuration\n"
-       VRF_CMD_HELP_STR)
 
 /* Show all interfaces to vty. */
 DEFUN (show_interface_vrf_all,
@@ -1388,6 +1383,14 @@ DEFUN (show_interface_name_vrf,
 }
 
 /* Show specified interface to vty. */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show interface IFNAME",
+ *     SHOW_STR
+ *     "Interface status and configuration\n"
+ *     "Interface name\n"
+ *
+ */
 DEFUN (show_interface_name_vrf_all,
        show_interface_name_vrf_all_cmd,
        "show interface IFNAME " VRF_ALL_CMD_STR,
@@ -1423,11 +1426,6 @@ DEFUN (show_interface_name_vrf_all,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_interface_name_vrf_all, show_interface_name_cmd,
-       "show interface IFNAME",
-       SHOW_STR
-       "Interface status and configuration\n"
-       "Interface name\n")
 
 static void
 if_show_description (struct vty *vty, vrf_id_t vrf_id)
@@ -1469,6 +1467,15 @@ if_show_description (struct vty *vty, vrf_id_t vrf_id)
     }
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show interface description " VRF_CMD_STR,
+ *     SHOW_STR
+ *     "Interface status and configuration\n"
+ *     "Interface description\n"
+ *     VRF_CMD_HELP_STR
+ *
+ */
 DEFUN (show_interface_desc,
        show_interface_desc_cmd,
        "show interface description",
@@ -1486,13 +1493,6 @@ DEFUN (show_interface_desc,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_interface_desc,
-       show_interface_desc_vrf_cmd,
-       "show interface description " VRF_CMD_STR,
-       SHOW_STR
-       "Interface status and configuration\n"
-       "Interface description\n"
-       VRF_CMD_HELP_STR)
 
 DEFUN (show_interface_desc_vrf_all,
        show_interface_desc_vrf_all_cmd,
@@ -1700,6 +1700,14 @@ DEFUN (bandwidth_if,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no bandwidth <1-100000>",
+ *     NO_STR
+ *     "Set bandwidth informational parameter\n"
+ *     "Bandwidth in megabits\n"
+ *
+ */
 DEFUN (no_bandwidth_if,
        no_bandwidth_if_cmd,
        "no bandwidth",
@@ -1719,12 +1727,6 @@ DEFUN (no_bandwidth_if,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_bandwidth_if,
-       no_bandwidth_if_val_cmd,
-       "no bandwidth <1-100000>",
-       NO_STR
-       "Set bandwidth informational parameter\n"
-       "Bandwidth in megabits\n")
 
 struct cmd_node link_params_node =
 {
@@ -2086,6 +2088,17 @@ DEFUN (no_link_params_inter_as,
 }
 
 /* RFC7471: OSPF Traffic Engineering (TE) Metric extensions & draft-ietf-isis-metric-extensions-07.txt */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "delay <0-16777215> min <0-16777215> max <0-16777215>",
+ *     "Unidirectional Average Link Delay (optionally Minimum and Maximum delays)\n"
+ *     "Average delay in micro-second as decimal (0...16777215)\n"
+ *     "Minimum delay\n"
+ *     "Minimum delay in micro-second as decimal (0...16777215)\n"
+ *     "Maximum delay\n"
+ *     "Maximum delay in micro-second as decimal (0...16777215)\n"
+ *
+ */
 DEFUN (link_params_delay,
        link_params_delay_cmd,
        "delay <0-16777215>",
@@ -2169,15 +2182,6 @@ DEFUN (link_params_delay,
   return CMD_SUCCESS;
 }
 
-ALIAS (link_params_delay,
-       link_params_delay_mm_cmd,
-       "delay <0-16777215> min <0-16777215> max <0-16777215>",
-       "Unidirectional Average Link Delay (optionally Minimum and Maximum delays)\n"
-       "Average delay in micro-second as decimal (0...16777215)\n"
-       "Minimum delay\n"
-       "Minimum delay in micro-second as decimal (0...16777215)\n"
-       "Maximum delay\n"
-       "Maximum delay in micro-second as decimal (0...16777215)\n")
 
 DEFUN (no_link_params_delay,
        no_link_params_delay_cmd,
@@ -2946,22 +2950,16 @@ zebra_if_init (void)
   install_node (&vrf_node, vrf_config_write);
 
   install_element (VIEW_NODE, &show_interface_cmd);
-  install_element (VIEW_NODE, &show_interface_vrf_cmd);
   install_element (VIEW_NODE, &show_interface_vrf_all_cmd);
-  install_element (VIEW_NODE, &show_interface_name_cmd);
   install_element (VIEW_NODE, &show_interface_name_vrf_cmd);
   install_element (VIEW_NODE, &show_interface_name_vrf_all_cmd);
   install_element (ENABLE_NODE, &show_interface_cmd);
-  install_element (ENABLE_NODE, &show_interface_vrf_cmd);
   install_element (ENABLE_NODE, &show_interface_vrf_all_cmd);
-  install_element (ENABLE_NODE, &show_interface_name_cmd);
   install_element (ENABLE_NODE, &show_interface_name_vrf_cmd);
   install_element (ENABLE_NODE, &show_interface_name_vrf_all_cmd);
   install_element (ENABLE_NODE, &show_interface_desc_cmd);
-  install_element (ENABLE_NODE, &show_interface_desc_vrf_cmd);
   install_element (ENABLE_NODE, &show_interface_desc_vrf_all_cmd);
   install_element (CONFIG_NODE, &zebra_interface_cmd);
-  install_element (CONFIG_NODE, &zebra_interface_vrf_cmd);
   install_element (CONFIG_NODE, &no_interface_cmd);
   install_element (CONFIG_NODE, &no_interface_vrf_cmd);
   install_default (INTERFACE_NODE);
@@ -2975,7 +2973,6 @@ zebra_if_init (void)
   install_element (INTERFACE_NODE, &no_shutdown_if_cmd);
   install_element (INTERFACE_NODE, &bandwidth_if_cmd);
   install_element (INTERFACE_NODE, &no_bandwidth_if_cmd);
-  install_element (INTERFACE_NODE, &no_bandwidth_if_val_cmd);
   install_element (INTERFACE_NODE, &ip_address_cmd);
   install_element (INTERFACE_NODE, &no_ip_address_cmd);
 #ifdef HAVE_IPV6
@@ -2998,7 +2995,6 @@ zebra_if_init (void)
   install_element(LINK_PARAMS_NODE, &link_params_inter_as_cmd);
   install_element(LINK_PARAMS_NODE, &no_link_params_inter_as_cmd);
   install_element(LINK_PARAMS_NODE, &link_params_delay_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_delay_mm_cmd);
   install_element(LINK_PARAMS_NODE, &link_params_delay_var_cmd);
   install_element(LINK_PARAMS_NODE, &link_params_pkt_loss_cmd);
   install_element(LINK_PARAMS_NODE, &link_params_ava_bw_cmd);
index fbd9e2b0cfd22b1b675664ebfa6c0669108a12d9..05eee8ad331fe828f4416cb5b5cd880e6b02aaac 100644 (file)
@@ -214,6 +214,14 @@ router_id_write (struct vty *vty)
         }
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "router-id A.B.C.D " VRF_CMD_STR,
+ *     "Manually set the router-id\n"
+ *     "IP address to use for router-id\n"
+ *     VRF_CMD_HELP_STR
+ *
+ */
 DEFUN (router_id,
        router_id_cmd,
        "router-id A.B.C.D",
@@ -238,13 +246,21 @@ DEFUN (router_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (router_id,
-       router_id_vrf_cmd,
-       "router-id A.B.C.D " VRF_CMD_STR,
-       "Manually set the router-id\n"
-       "IP address to use for router-id\n"
-       VRF_CMD_HELP_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no router-id A.B.C.D",
+ *     NO_STR
+ *     "Remove the manually configured router-id\n"
+ *     "IP address to use for router-id\n"
+ *
+ * "no router-id A.B.C.D " VRF_CMD_STR,
+ *     NO_STR
+ *     "Remove the manually configured router-id\n"
+ *     "IP address to use for router-id\n"
+ *     VRF_CMD_HELP_STR
+ *
+ */
 DEFUN (no_router_id,
        no_router_id_cmd,
        "no router-id",
@@ -266,20 +282,7 @@ DEFUN (no_router_id,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_router_id,
-       no_router_id_val_cmd,
-       "no router-id A.B.C.D",
-       NO_STR
-       "Remove the manually configured router-id\n"
-       "IP address to use for router-id\n")
 
-ALIAS (no_router_id,
-       no_router_id_vrf_cmd,
-       "no router-id A.B.C.D " VRF_CMD_STR,
-       NO_STR
-       "Remove the manually configured router-id\n"
-       "IP address to use for router-id\n"
-       VRF_CMD_HELP_STR)
 
 static int
 router_id_cmp (void *a, void *b)
@@ -295,9 +298,6 @@ router_id_cmd_init (void)
 {
   install_element (CONFIG_NODE, &router_id_cmd);
   install_element (CONFIG_NODE, &no_router_id_cmd);
-  install_element (CONFIG_NODE, &router_id_vrf_cmd);
-  install_element (CONFIG_NODE, &no_router_id_val_cmd);
-  install_element (CONFIG_NODE, &no_router_id_vrf_cmd);
 }
 
 void
index 331838e92a681017d046e596ec6a3cb12d604d77..d372c985f9e23c955fee388453a81cd75c73c3a8 100644 (file)
@@ -985,6 +985,22 @@ DEFUN (ipv6_nd_ra_interval,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 nd ra-interval <1-1800>",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Router Advertisement interval\n"
+ *
+ * "no ipv6 nd ra-interval msec <1-1800000>",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Router Advertisement interval\n"
+ *     "Router Advertisement interval in milliseconds\n"
+ *
+ */
 DEFUN (no_ipv6_nd_ra_interval,
        no_ipv6_nd_ra_interval_cmd,
        "no ipv6 nd ra-interval",
@@ -1013,22 +1029,7 @@ DEFUN (no_ipv6_nd_ra_interval,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_nd_ra_interval,
-       no_ipv6_nd_ra_interval_val_cmd,
-       "no ipv6 nd ra-interval <1-1800>",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Router Advertisement interval\n")
 
-ALIAS (no_ipv6_nd_ra_interval,
-       no_ipv6_nd_ra_interval_msec_val_cmd,
-       "no ipv6 nd ra-interval msec <1-1800000>",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Router Advertisement interval\n"
-       "Router Advertisement interval in milliseconds\n")
 
 DEFUN (ipv6_nd_ra_lifetime,
        ipv6_nd_ra_lifetime_cmd,
@@ -1062,6 +1063,16 @@ DEFUN (ipv6_nd_ra_lifetime,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 nd ra-lifetime <0-9000>",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Router lifetime\n"
+ *     "Router lifetime in seconds (0 stands for a non-default gw)\n"
+ *
+ */
 DEFUN (no_ipv6_nd_ra_lifetime,
        no_ipv6_nd_ra_lifetime_cmd,
        "no ipv6 nd ra-lifetime",
@@ -1081,14 +1092,6 @@ DEFUN (no_ipv6_nd_ra_lifetime,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_nd_ra_lifetime,
-       no_ipv6_nd_ra_lifetime_val_cmd,
-       "no ipv6 nd ra-lifetime <0-9000>",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Router lifetime\n"
-       "Router lifetime in seconds (0 stands for a non-default gw)\n")
 
 DEFUN (ipv6_nd_reachable_time,
        ipv6_nd_reachable_time_cmd,
@@ -1104,6 +1107,16 @@ DEFUN (ipv6_nd_reachable_time,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 nd reachable-time <1-3600000>",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Reachable time\n"
+ *     "Reachable time in milliseconds\n"
+ *
+ */
 DEFUN (no_ipv6_nd_reachable_time,
        no_ipv6_nd_reachable_time_cmd,
        "no ipv6 nd reachable-time",
@@ -1123,14 +1136,6 @@ DEFUN (no_ipv6_nd_reachable_time,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_nd_reachable_time,
-       no_ipv6_nd_reachable_time_val_cmd,
-       "no ipv6 nd reachable-time <1-3600000>",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Reachable time\n"
-       "Reachable time in milliseconds\n")
 
 DEFUN (ipv6_nd_homeagent_preference,
        ipv6_nd_homeagent_preference_cmd,
@@ -1146,6 +1151,16 @@ DEFUN (ipv6_nd_homeagent_preference,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 nd home-agent-preference <0-65535>",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Home Agent preference\n"
+ *     "preference value (default is 0, least preferred)\n"
+ *
+ */
 DEFUN (no_ipv6_nd_homeagent_preference,
        no_ipv6_nd_homeagent_preference_cmd,
        "no ipv6 nd home-agent-preference",
@@ -1165,14 +1180,6 @@ DEFUN (no_ipv6_nd_homeagent_preference,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_nd_homeagent_preference,
-       no_ipv6_nd_homeagent_preference_val_cmd,
-       "no ipv6 nd home-agent-preference <0-65535>",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Home Agent preference\n"
-       "preference value (default is 0, least preferred)\n")
 
 DEFUN (ipv6_nd_homeagent_lifetime,
        ipv6_nd_homeagent_lifetime_cmd,
@@ -1188,6 +1195,16 @@ DEFUN (ipv6_nd_homeagent_lifetime,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 nd home-agent-lifetime <0-65520>",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Home Agent lifetime\n"
+ *     "Home Agent lifetime in seconds (0 to track ra-lifetime)\n"
+ *
+ */
 DEFUN (no_ipv6_nd_homeagent_lifetime,
        no_ipv6_nd_homeagent_lifetime_cmd,
        "no ipv6 nd home-agent-lifetime",
@@ -1207,14 +1224,6 @@ DEFUN (no_ipv6_nd_homeagent_lifetime,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_nd_homeagent_lifetime,
-       no_ipv6_nd_homeagent_lifetime_val_cmd,
-       "no ipv6 nd home-agent-lifetime <0-65520>",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Home Agent lifetime\n"
-       "Home Agent lifetime in seconds (0 to track ra-lifetime)\n")
 
 DEFUN (ipv6_nd_managed_config_flag,
        ipv6_nd_managed_config_flag_cmd,
@@ -1364,6 +1373,139 @@ DEFUN (no_ipv6_nd_other_config_flag,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ipv6 nd prefix X:X::X:X/M (no-autoconfig|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+ *     "(<0-4294967295>|infinite)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (off-link|) (no-autoconfig|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Do not use prefix for onlink determination\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (router-address|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Set Router Address flag\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (no-autoconfig|) (off-link|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *     "Do not use prefix for onlink determination\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+ *     "(<0-4294967295>|infinite) (router-address|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Set Router Address flag\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+ *     "(<0-4294967295>|infinite) (off-link|) (no-autoconfig|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for onlink determination\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+ *     "(<0-4294967295>|infinite) (no-autoconfig|) (off-link|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *     "Do not use prefix for onlink determination\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (off-link|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Do not use prefix for onlink determination\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+ *     "(<0-4294967295>|infinite) (no-autoconfig|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for autoconfiguration"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+ *     "(<0-4294967295>|infinite) (off-link|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for onlink determination\n"
+ *
+ * "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
+ *     "(<0-4294967295>|infinite) (no-autoconfig|) (off-link|) (router-address|)",
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *     "Do not use prefix for onlink determination\n"
+ *     "Set Router Address flag\n"
+ *
+ */
 DEFUN (ipv6_nd_prefix,
        ipv6_nd_prefix_cmd,
        "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (off-link|) (no-autoconfig|) (router-address|)",
@@ -1445,162 +1587,152 @@ DEFUN (ipv6_nd_prefix,
   return CMD_SUCCESS;
 }
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_val_nortaddr_cmd,
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (off-link|) (no-autoconfig|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for onlink determination\n"
-       "Do not use prefix for autoconfiguration\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_val_rev_cmd,
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (no-autoconfig|) (off-link|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for autoconfiguration\n"
-       "Do not use prefix for onlink determination\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_val_rev_rtaddr_cmd,
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (no-autoconfig|) (off-link|) (router-address|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for autoconfiguration\n"
-       "Do not use prefix for onlink determination\n"
-       "Set Router Address flag\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_val_noauto_cmd,
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (no-autoconfig|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for autoconfiguration")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_val_offlink_cmd,
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (off-link|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for onlink determination\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_val_rtaddr_cmd,
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite) (router-address|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Set Router Address flag\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_val_cmd,
-       "ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) "
-       "(<0-4294967295>|infinite)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_noval_cmd,
-       "ipv6 nd prefix X:X::X:X/M (no-autoconfig|) (off-link|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Do not use prefix for autoconfiguration\n"
-       "Do not use prefix for onlink determination\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_noval_rev_cmd,
-       "ipv6 nd prefix X:X::X:X/M (off-link|) (no-autoconfig|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Do not use prefix for onlink determination\n"
-       "Do not use prefix for autoconfiguration\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_noval_noauto_cmd,
-       "ipv6 nd prefix X:X::X:X/M (no-autoconfig|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Do not use prefix for autoconfiguration\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_noval_offlink_cmd,
-       "ipv6 nd prefix X:X::X:X/M (off-link|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Do not use prefix for onlink determination\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_noval_rtaddr_cmd,
-       "ipv6 nd prefix X:X::X:X/M (router-address|)",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Set Router Address flag\n")
 
-ALIAS (ipv6_nd_prefix,
-       ipv6_nd_prefix_prefix_cmd,
-       "ipv6 nd prefix X:X::X:X/M",
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (no-autoconfig|) (off-link|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *     "Do not use prefix for onlink determination\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (no-autoconfig|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for autoconfiguration"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (off-link|) (no-autoconfig|) (router-address|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for onlink determination\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *     "Set Router Address flag\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (off-link|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for onlink determination\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (no-autoconfig|) (off-link|) (router-address|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *     "Do not use prefix for onlink determination\n"
+ *     "Set Router Address flag\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (router-address|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Set Router Address flag\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (off-link|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Do not use prefix for onlink determination\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (no-autoconfig|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (no-autoconfig|) (off-link|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *     "Do not use prefix for onlink determination\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (off-link|) (no-autoconfig|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Do not use prefix for onlink determination\n"
+ *     "Do not use prefix for autoconfiguration\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (router-address|)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *     "Set Router Address flag\n"
+ *
+ * "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Prefix information\n"
+ *     "IPv6 prefix\n"
+ *     "Valid lifetime in seconds\n"
+ *     "Infinite valid lifetime\n"
+ *     "Preferred lifetime in seconds\n"
+ *     "Infinite preferred lifetime\n"
+ *
+ */
 DEFUN (no_ipv6_nd_prefix,
        no_ipv6_nd_prefix_cmd,
        "no ipv6 nd prefix IPV6PREFIX",
@@ -1636,159 +1768,17 @@ DEFUN (no_ipv6_nd_prefix,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_val_nortaddr_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (off-link|) (no-autoconfig|) (router-address|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for onlink determination\n"
-       "Do not use prefix for autoconfiguration\n"
-       "Set Router Address flag\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_val_rev_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (no-autoconfig|) (off-link|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for autoconfiguration\n"
-       "Do not use prefix for onlink determination\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_val_rev_rtaddr_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (no-autoconfig|) (off-link|) (router-address|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for autoconfiguration\n"
-       "Do not use prefix for onlink determination\n"
-       "Set Router Address flag\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_val_noauto_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (no-autoconfig|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for autoconfiguration")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_val_offlink_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (off-link|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Do not use prefix for onlink determination\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_val_rtaddr_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite) (router-address|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n"
-       "Set Router Address flag\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_val_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (<0-4294967295>|infinite) (<0-4294967295>|infinite)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Valid lifetime in seconds\n"
-       "Infinite valid lifetime\n"
-       "Preferred lifetime in seconds\n"
-       "Infinite preferred lifetime\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_noval_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (no-autoconfig|) (off-link|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Do not use prefix for autoconfiguration\n"
-       "Do not use prefix for onlink determination\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_noval_rev_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (off-link|) (no-autoconfig|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Do not use prefix for onlink determination\n"
-       "Do not use prefix for autoconfiguration\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_noval_noauto_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (no-autoconfig|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Do not use prefix for autoconfiguration\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_noval_offlink_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (off-link|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Do not use prefix for onlink determination\n")
 
-ALIAS (no_ipv6_nd_prefix,
-       no_ipv6_nd_prefix_noval_rtaddr_cmd,
-       "no ipv6 nd prefix X:X::X:X/M (router-address|)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Prefix information\n"
-       "IPv6 prefix\n"
-       "Set Router Address flag\n")
 
 DEFUN (ipv6_nd_router_preference,
        ipv6_nd_router_preference_cmd,
@@ -1820,6 +1810,18 @@ DEFUN (ipv6_nd_router_preference,
   return CMD_ERR_NO_MATCH;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 nd router-preference (high|medium|low)",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Default router preference\n"
+ *     "High default router preference\n"
+ *     "Low default router preference\n"
+ *     "Medium default router preference (default)\n"
+ *
+ */
 DEFUN (no_ipv6_nd_router_preference,
        no_ipv6_nd_router_preference_cmd,
        "no ipv6 nd router-preference",
@@ -1839,16 +1841,6 @@ DEFUN (no_ipv6_nd_router_preference,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_nd_router_preference,
-       no_ipv6_nd_router_preference_val_cmd,
-       "no ipv6 nd router-preference (high|medium|low)",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Default router preference\n"
-       "High default router preference\n"
-       "Low default router preference\n"
-       "Medium default router preference (default)\n")
 
 DEFUN (ipv6_nd_mtu,
        ipv6_nd_mtu_cmd,
@@ -1864,6 +1856,16 @@ DEFUN (ipv6_nd_mtu,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 nd mtu <1-65535>",
+ *     NO_STR
+ *     "Interface IPv6 config commands\n"
+ *     "Neighbor discovery\n"
+ *     "Advertised MTU\n"
+ *     "MTU in bytes\n"
+ *
+ */
 DEFUN (no_ipv6_nd_mtu,
        no_ipv6_nd_mtu_cmd,
        "no ipv6 nd mtu",
@@ -1878,14 +1880,6 @@ DEFUN (no_ipv6_nd_mtu,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_nd_mtu,
-       no_ipv6_nd_mtu_val_cmd,
-       "no ipv6 nd mtu <1-65535>",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "Advertised MTU\n"
-       "MTU in bytes\n")
 
 /* Write configuration about router advertisement. */
 void
@@ -2052,14 +2046,10 @@ rtadv_cmd_init (void)
   install_element (INTERFACE_NODE, &ipv6_nd_ra_interval_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_ra_interval_msec_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_ra_interval_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_ra_interval_val_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_ra_interval_msec_val_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_ra_lifetime_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_ra_lifetime_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_ra_lifetime_val_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_reachable_time_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_reachable_time_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_reachable_time_val_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_managed_config_flag_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_managed_config_flag_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_other_config_flag_cmd);
@@ -2068,45 +2058,16 @@ rtadv_cmd_init (void)
   install_element (INTERFACE_NODE, &no_ipv6_nd_homeagent_config_flag_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_homeagent_preference_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_homeagent_preference_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_homeagent_preference_val_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_homeagent_lifetime_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_homeagent_lifetime_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_homeagent_lifetime_val_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_adv_interval_config_option_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_adv_interval_config_option_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_prefix_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_val_rev_rtaddr_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_val_nortaddr_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_val_rev_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_val_noauto_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_val_offlink_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_val_rtaddr_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_val_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_noval_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_noval_rev_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_noval_noauto_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_noval_offlink_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_noval_rtaddr_cmd);
-  install_element (INTERFACE_NODE, &ipv6_nd_prefix_prefix_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_val_rev_rtaddr_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_val_nortaddr_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_val_rev_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_val_noauto_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_val_offlink_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_val_rtaddr_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_val_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_noval_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_noval_rev_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_noval_noauto_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_noval_offlink_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_prefix_noval_rtaddr_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_router_preference_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_router_preference_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_router_preference_val_cmd);
   install_element (INTERFACE_NODE, &ipv6_nd_mtu_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_nd_mtu_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_nd_mtu_val_cmd);
 }
 
 static int
index c70b207d64e7d7177ef6cd01d01b30ccb9ac0368..88cc7977fae54334c356a0531ba7644b14b957fd 100644 (file)
@@ -305,6 +305,15 @@ DEFUN (match_interface,
                                RMAP_EVENT_MATCH_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match interface WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match first hop interface of route\n"
+ *     "Interface name\n"
+ *
+ */
 DEFUN (no_match_interface,
        no_match_interface_cmd,
        "no match interface",
@@ -318,13 +327,6 @@ DEFUN (no_match_interface,
   return zebra_route_match_delete (vty, vty->index, "interface", argv[0], RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_interface,
-       no_match_interface_val_cmd,
-       "no match interface WORD",
-       NO_STR
-       MATCH_STR
-       "Match first hop interface of route\n"
-       "Interface name\n")
 
 DEFUN (match_tag,
        match_tag_cmd,
@@ -337,6 +339,14 @@ DEFUN (match_tag,
                                 RMAP_EVENT_MATCH_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match tag <1-65535>",
+ *     NO_STR
+ *     MATCH_STR
+ *     "Match tag of route\n"
+ *
+ */
 DEFUN (no_match_tag,
        no_match_tag_cmd,
        "no match tag",
@@ -352,12 +362,6 @@ DEFUN (no_match_tag,
                                    RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_tag,
-       no_match_tag_val_cmd,
-       "no match tag <1-65535>",
-       NO_STR
-       MATCH_STR
-       "Match tag of route\n")
 
 DEFUN (match_ip_next_hop,
        match_ip_next_hop_cmd,
@@ -372,6 +376,18 @@ DEFUN (match_ip_next_hop,
   return zebra_route_match_add (vty, vty->index, "ip next-hop", argv[3]->arg, RMAP_EVENT_FILTER_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip next-hop (<1-199>|<1300-2699>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match next-hop address of route\n"
+ *     "IP access-list number\n"
+ *     "IP access-list number (expanded range)\n"
+ *     "IP Access-list name\n"
+ *
+ */
 DEFUN (no_match_ip_next_hop,
        no_match_ip_next_hop_cmd,
        "no match ip next-hop",
@@ -388,16 +404,6 @@ DEFUN (no_match_ip_next_hop,
                                   RMAP_EVENT_FILTER_DELETED);
 }
 
-ALIAS (no_match_ip_next_hop,
-       no_match_ip_next_hop_val_cmd,
-       "no match ip next-hop (<1-199>|<1300-2699>|WORD)",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match next-hop address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP Access-list name\n")
 
 DEFUN (match_ip_next_hop_prefix_list,
        match_ip_next_hop_prefix_list_cmd,
@@ -412,6 +418,17 @@ DEFUN (match_ip_next_hop_prefix_list,
                                argv[4]->arg, RMAP_EVENT_PLIST_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip next-hop prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match next-hop address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_next_hop_prefix_list,
        no_match_ip_next_hop_prefix_list_cmd,
        "no match ip next-hop prefix-list",
@@ -431,15 +448,6 @@ DEFUN (no_match_ip_next_hop_prefix_list,
                                   RMAP_EVENT_PLIST_DELETED);
 }
 
-ALIAS (no_match_ip_next_hop_prefix_list,
-       no_match_ip_next_hop_prefix_list_val_cmd,
-       "no match ip next-hop prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match next-hop address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
 DEFUN (match_ip_address,
        match_ip_address_cmd,
@@ -456,7 +464,19 @@ DEFUN (match_ip_address,
                                RMAP_EVENT_FILTER_ADDED);
 }
 
-DEFUN (no_match_ip_address, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address (<1-199>|<1300-2699>|WORD)",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *     "IP access-list number\n"
+ *     "IP access-list number (expanded range)\n"
+ *     "IP Access-list name\n"
+ *
+ */
+DEFUN (no_match_ip_address,
        no_match_ip_address_cmd,
        "no match ip address",
        NO_STR
@@ -472,18 +492,8 @@ DEFUN (no_match_ip_address,
                                   RMAP_EVENT_FILTER_DELETED);
 }
 
-ALIAS (no_match_ip_address,
-       no_match_ip_address_val_cmd,
-       "no match ip address (<1-199>|<1300-2699>|WORD)",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n"
-       "IP access-list number\n"
-       "IP access-list number (expanded range)\n"
-       "IP Access-list name\n")
 
-DEFUN (match_ip_address_prefix_list, 
+DEFUN (match_ip_address_prefix_list,
        match_ip_address_prefix_list_cmd,
        "match ip address prefix-list WORD",
        MATCH_STR
@@ -496,6 +506,17 @@ DEFUN (match_ip_address_prefix_list,
                                argv[4]->arg, RMAP_EVENT_PLIST_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address prefix-list WORD",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match address of route\n"
+ *     "Match entries of prefix-lists\n"
+ *     "IP prefix-list name\n"
+ *
+ */
 DEFUN (no_match_ip_address_prefix_list,
        no_match_ip_address_prefix_list_cmd,
        "no match ip address prefix-list",
@@ -515,15 +536,6 @@ DEFUN (no_match_ip_address_prefix_list,
                                   RMAP_EVENT_PLIST_DELETED);
 }
 
-ALIAS (no_match_ip_address_prefix_list,
-       no_match_ip_address_prefix_list_val_cmd,
-       "no match ip address prefix-list WORD",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match address of route\n"
-       "Match entries of prefix-lists\n"
-       "IP prefix-list name\n")
 
 DEFUN (match_ip_address_prefix_len,
        match_ip_address_prefix_len_cmd,
@@ -538,6 +550,16 @@ DEFUN (match_ip_address_prefix_len,
                                argv[0], RMAP_EVENT_MATCH_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip address prefix-len NUMBER",
+ *     NO_STR
+ *     MATCH_STR
+ *     IP_STR
+ *     "Match prefixlen of ip address of route\n"
+ *     "prefix length of ip address\n"
+ *
+ */
 DEFUN (no_match_ip_address_prefix_len,
        no_match_ip_address_prefix_len_cmd,
        "no match ip address prefix-len",
@@ -557,14 +579,6 @@ DEFUN (no_match_ip_address_prefix_len,
                                   RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_ip_address_prefix_len,
-       no_match_ip_address_prefix_len_val_cmd,
-       "no match ip address prefix-len NUMBER",
-       NO_STR
-       MATCH_STR
-       IP_STR
-       "Match prefixlen of ip address of route\n"
-       "prefix length of ip address\n")
 
 DEFUN (match_ip_nexthop_prefix_len,
        match_ip_nexthop_prefix_len_cmd,
@@ -579,6 +593,14 @@ DEFUN (match_ip_nexthop_prefix_len,
                                argv[0], RMAP_EVENT_MATCH_ADDED);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no match ip next-hop prefix-len NUMBER",
+ *     MATCH_STR
+ *     "Match prefixlen of ip address of route\n"
+ *     "prefix length of ip address\n"
+ *
+ */
 DEFUN (no_match_ip_nexthop_prefix_len,
        no_match_ip_nexthop_prefix_len_cmd,
        "no match ip next-hop prefix-len",
@@ -598,12 +620,6 @@ DEFUN (no_match_ip_nexthop_prefix_len,
                                   RMAP_EVENT_MATCH_DELETED);
 }
 
-ALIAS (no_match_ip_nexthop_prefix_len,
-       no_match_ip_nexthop_prefix_len_val_cmd,
-       "no match ip next-hop prefix-len NUMBER",
-       MATCH_STR
-       "Match prefixlen of ip address of route\n"
-       "prefix length of ip address\n")
 
 DEFUN (match_source_protocol,
        match_source_protocol_cmd,
@@ -736,6 +752,15 @@ DEFUN (zebra_route_map_timer,
   return (CMD_SUCCESS);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no zebra route-map delay-timer <0-600>",
+ *     NO_STR
+ *     "Time to wait before route-map updates are processed\n"
+ *     "Reset delay-timer to default value, 30 secs\n"
+ *     "0 means event-driven updates are disabled\n"
+ *
+ */
 DEFUN (no_zebra_route_map_timer,
        no_zebra_route_map_timer_cmd,
        "no zebra route-map delay-timer",
@@ -748,13 +773,6 @@ DEFUN (no_zebra_route_map_timer,
   return (CMD_SUCCESS);
 }
 
-ALIAS (no_zebra_route_map_timer,
-       no_zebra_route_map_timer_val_cmd,
-       "no zebra route-map delay-timer <0-600>",
-       NO_STR
-       "Time to wait before route-map updates are processed\n"
-       "Reset delay-timer to default value, 30 secs\n"
-       "0 means event-driven updates are disabled\n")
 
 DEFUN (ip_protocol,
        ip_protocol_cmd,
@@ -793,6 +811,16 @@ DEFUN (ip_protocol,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
+ *     NO_STR
+ *     IP_STR
+ *     "Stop filtering routing info between zebra and protocol\n"
+ *     QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
+ *     "route map name"
+ *
+ */
 DEFUN (no_ip_protocol,
        no_ip_protocol_cmd,
        "no ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA,
@@ -831,14 +859,6 @@ DEFUN (no_ip_protocol,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_protocol,
-       no_ip_protocol_val_cmd,
-       "no ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
-       NO_STR
-       IP_STR
-       "Stop filtering routing info between zebra and protocol\n"
-       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
-       "route map name")
 
 DEFUN (show_ip_protocol,
        show_ip_protocol_cmd,
@@ -906,6 +926,16 @@ DEFUN (ipv6_protocol,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
+ *     NO_STR
+ *     IP6_STR
+ *     "Stop filtering IPv6 routing info between zebra and protocol\n"
+ *     QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
+ *     "route map name"
+ *
+ */
 DEFUN (no_ipv6_protocol,
        no_ipv6_protocol_cmd,
        "no ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA,
@@ -945,14 +975,6 @@ DEFUN (no_ipv6_protocol,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_protocol,
-       no_ipv6_protocol_val_cmd,
-       "no ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
-       NO_STR
-       IP6_STR
-       "Stop filtering IPv6 routing info between zebra and protocol\n"
-       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
-       "route map name")
 
 DEFUN (show_ipv6_protocol,
        show_ipv6_protocol_cmd,
@@ -1017,6 +1039,15 @@ DEFUN (ip_protocol_nht_rmap,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
+ *     IP_STR
+ *     "Filter Next Hop tracking route resolution\n"
+ *     QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
+ *     "Route map name\n"
+ *
+ */
 DEFUN (no_ip_protocol_nht_rmap,
        no_ip_protocol_nht_rmap_cmd,
        "no ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA,
@@ -1050,13 +1081,6 @@ DEFUN (no_ip_protocol_nht_rmap,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_protocol_nht_rmap,
-       no_ip_protocol_nht_rmap_val_cmd,
-       "no ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
-       IP_STR
-       "Filter Next Hop tracking route resolution\n"
-       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
-       "Route map name\n")
 
 DEFUN (show_ip_protocol_nht,
        show_ip_protocol_nht_cmd,
@@ -1115,6 +1139,16 @@ DEFUN (ipv6_protocol_nht_rmap,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
+ *     NO_STR
+ *     IP6_STR
+ *     "Filter Next Hop tracking route resolution\n"
+ *     QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
+ *     "Route map name\n"
+ *
+ */
 DEFUN (no_ipv6_protocol_nht_rmap,
        no_ipv6_protocol_nht_rmap_cmd,
        "no ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA,
@@ -1153,14 +1187,6 @@ DEFUN (no_ipv6_protocol_nht_rmap,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ipv6_protocol_nht_rmap,
-       no_ipv6_protocol_nht_rmap_val_cmd,
-       "no ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",
-       NO_STR
-       IP6_STR
-       "Filter Next Hop tracking route resolution\n"
-       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
-       "Route map name\n")
 
 DEFUN (show_ipv6_protocol_nht,
        show_ipv6_protocol_nht_cmd,
@@ -1816,27 +1842,22 @@ zebra_route_map_init ()
 {
   install_element (CONFIG_NODE, &ip_protocol_cmd);
   install_element (CONFIG_NODE, &no_ip_protocol_cmd);
-  install_element (CONFIG_NODE, &no_ip_protocol_val_cmd);
   install_element (VIEW_NODE, &show_ip_protocol_cmd);
   install_element (ENABLE_NODE, &show_ip_protocol_cmd);
   install_element (CONFIG_NODE, &ipv6_protocol_cmd);
   install_element (CONFIG_NODE, &no_ipv6_protocol_cmd);
-  install_element (CONFIG_NODE, &no_ipv6_protocol_val_cmd);
   install_element (VIEW_NODE, &show_ipv6_protocol_cmd);
   install_element (ENABLE_NODE, &show_ipv6_protocol_cmd);
   install_element (CONFIG_NODE, &ip_protocol_nht_rmap_cmd);
   install_element (CONFIG_NODE, &no_ip_protocol_nht_rmap_cmd);
-  install_element (CONFIG_NODE, &no_ip_protocol_nht_rmap_val_cmd);
   install_element (VIEW_NODE, &show_ip_protocol_nht_cmd);
   install_element (ENABLE_NODE, &show_ip_protocol_nht_cmd);
   install_element (CONFIG_NODE, &ipv6_protocol_nht_rmap_cmd);
   install_element (CONFIG_NODE, &no_ipv6_protocol_nht_rmap_cmd);
-  install_element (CONFIG_NODE, &no_ipv6_protocol_nht_rmap_val_cmd);
   install_element (VIEW_NODE, &show_ipv6_protocol_nht_cmd);
   install_element (ENABLE_NODE, &show_ipv6_protocol_nht_cmd);
   install_element (CONFIG_NODE, &zebra_route_map_timer_cmd);
   install_element (CONFIG_NODE, &no_zebra_route_map_timer_cmd);
-  install_element (CONFIG_NODE, &no_zebra_route_map_timer_val_cmd);
 
   route_map_init ();
   route_map_init_vty ();
@@ -1859,28 +1880,20 @@ zebra_route_map_init ()
 /* */
   install_element (RMAP_NODE, &match_tag_cmd);
   install_element (RMAP_NODE, &no_match_tag_cmd);
-  install_element (RMAP_NODE, &no_match_tag_val_cmd);
   install_element (RMAP_NODE, &match_interface_cmd);
   install_element (RMAP_NODE, &no_match_interface_cmd); 
-  install_element (RMAP_NODE, &no_match_interface_val_cmd); 
   install_element (RMAP_NODE, &match_ip_next_hop_cmd); 
   install_element (RMAP_NODE, &no_match_ip_next_hop_cmd); 
-  install_element (RMAP_NODE, &no_match_ip_next_hop_val_cmd); 
   install_element (RMAP_NODE, &match_ip_next_hop_prefix_list_cmd); 
   install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_cmd); 
-  install_element (RMAP_NODE, &no_match_ip_next_hop_prefix_list_val_cmd); 
   install_element (RMAP_NODE, &match_ip_address_cmd); 
   install_element (RMAP_NODE, &no_match_ip_address_cmd); 
-  install_element (RMAP_NODE, &no_match_ip_address_val_cmd); 
   install_element (RMAP_NODE, &match_ip_address_prefix_list_cmd); 
   install_element (RMAP_NODE, &no_match_ip_address_prefix_list_cmd); 
-  install_element (RMAP_NODE, &no_match_ip_address_prefix_list_val_cmd);
   install_element (RMAP_NODE, &match_ip_nexthop_prefix_len_cmd);
   install_element (RMAP_NODE, &no_match_ip_nexthop_prefix_len_cmd);
-  install_element (RMAP_NODE, &no_match_ip_nexthop_prefix_len_val_cmd);
   install_element (RMAP_NODE, &match_ip_address_prefix_len_cmd);
   install_element (RMAP_NODE, &no_match_ip_address_prefix_len_cmd);
-  install_element (RMAP_NODE, &no_match_ip_address_prefix_len_val_cmd);
   install_element (RMAP_NODE, &match_source_protocol_cmd);
   install_element (RMAP_NODE, &no_match_source_protocol_cmd);
  /* */
index dfcf1829d162565d3fceebd564eea1f53bb80b23..491abbba4ab99bd400bf3b5a55a9cc1839e2631c 100644 (file)
@@ -181,6 +181,16 @@ zebra_static_ipv4 (struct vty *vty, safi_t safi, int add_cmd,
 }
 
 /* Static unicast routes for multicast RPF lookup. */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip mroute A.B.C.D/M (A.B.C.D|INTERFACE)",
+ *     IP_STR
+ *     "Configure static unicast route into MRIB for multicast RPF lookup\n"
+ *     "IP destination prefix (e.g. 10.0.0.0/8)\n"
+ *     "Nexthop address\n"
+ *     "Nexthop interface name\n"
+ *
+ */
 DEFUN (ip_mroute_dist,
        ip_mroute_dist_cmd,
        "ip mroute A.B.C.D/M (A.B.C.D|INTERFACE) <1-255>",
@@ -194,15 +204,18 @@ DEFUN (ip_mroute_dist,
   return zebra_static_ipv4 (vty, SAFI_MULTICAST, 1, argv[2]->arg, NULL, argv[3]->arg, NULL, NULL, argc > 2 ? argv[4]->arg : NULL, NULL);
 }
 
-ALIAS (ip_mroute_dist,
-       ip_mroute_cmd,
-       "ip mroute A.B.C.D/M (A.B.C.D|INTERFACE)",
-       IP_STR
-       "Configure static unicast route into MRIB for multicast RPF lookup\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "Nexthop address\n"
-       "Nexthop interface name\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip mroute A.B.C.D/M (A.B.C.D|INTERFACE)",
+ *     NO_STR
+ *     IP_STR
+ *     "Configure static unicast route into MRIB for multicast RPF lookup\n"
+ *     "IP destination prefix (e.g. 10.0.0.0/8)\n"
+ *     "Nexthop address\n"
+ *     "Nexthop interface name\n"
+ *
+ */
 DEFUN (no_ip_mroute_dist,
        no_ip_mroute_dist_cmd,
        "no ip mroute A.B.C.D/M (A.B.C.D|INTERFACE) <1-255>",
@@ -216,15 +229,6 @@ DEFUN (no_ip_mroute_dist,
   return zebra_static_ipv4 (vty, SAFI_MULTICAST, 0, argv[3]->arg, NULL, argv[4]->arg, NULL, NULL, argc > 2 ? argv[5]->arg : NULL, NULL);
 }
 
-ALIAS (no_ip_mroute_dist,
-       no_ip_mroute_cmd,
-       "no ip mroute A.B.C.D/M (A.B.C.D|INTERFACE)",
-       NO_STR
-       IP_STR
-       "Configure static unicast route into MRIB for multicast RPF lookup\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "Nexthop address\n"
-       "Nexthop interface name\n")
 
 DEFUN (ip_multicast_mode,
        ip_multicast_mode_cmd,
@@ -258,6 +262,15 @@ DEFUN (ip_multicast_mode,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip multicast rpf-lookup-mode",
+ *     NO_STR
+ *     IP_STR
+ *     "Multicast options\n"
+ *     "RPF lookup behavior\n"
+ *
+ */
 DEFUN (no_ip_multicast_mode,
        no_ip_multicast_mode_cmd,
        "no ip multicast rpf-lookup-mode (urib-only|mrib-only|mrib-then-urib|lower-distance|longer-prefix)",
@@ -275,13 +288,6 @@ DEFUN (no_ip_multicast_mode,
   return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_multicast_mode,
-       no_ip_multicast_mode_noarg_cmd,
-       "no ip multicast rpf-lookup-mode",
-       NO_STR
-       IP_STR
-       "Multicast options\n"
-       "RPF lookup behavior\n")
 
 DEFUN (show_ip_rpf,
        show_ip_rpf_cmd,
@@ -324,7 +330,7 @@ DEFUN (show_ip_rpf_addr,
 }
 
 /* Static route configuration.  */
-DEFUN (ip_route, 
+DEFUN (ip_route,
        ip_route_cmd,
        "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0)",
        IP_STR
@@ -716,7 +722,20 @@ DEFUN (ip_route_mask_flags_tag_distance2,
                             argv[7]->arg, NULL);
 }
 
-DEFUN (no_ip_route, 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole)",
+ *     NO_STR
+ *     IP_STR
+ *     "Establish static routes\n"
+ *     "IP destination prefix (e.g. 10.0.0.0/8)\n"
+ *     "IP gateway address\n"
+ *     "IP gateway interface name\n"
+ *     "Emit an ICMP unreachable when matched\n"
+ *     "Silently discard pkts when matched\n"
+ *
+ */
+DEFUN (no_ip_route,
        no_ip_route_cmd,
        "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0)",
        NO_STR
@@ -731,6 +750,21 @@ DEFUN (no_ip_route,
                             NULL, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535>",
+ *     NO_STR
+ *     IP_STR
+ *     "Establish static routes\n"
+ *     "IP destination prefix (e.g. 10.0.0.0/8)\n"
+ *     "IP gateway address\n"
+ *     "IP gateway interface name\n"
+ *     "Emit an ICMP unreachable when matched\n"
+ *     "Silently discard pkts when matched\n"
+ *     "Tag of this route\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (no_ip_route_tag,
        no_ip_route_tag_cmd,
        "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) tag <1-65535>",
@@ -748,31 +782,7 @@ DEFUN (no_ip_route_tag,
                             NULL, NULL);
 }
 
-ALIAS (no_ip_route,
-       no_ip_route_flags_cmd,
-       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole)",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n")
 
-ALIAS (no_ip_route_tag,
-       no_ip_route_flags_tag_cmd,
-       "no ip route A.B.C.D/M (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535>",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix (e.g. 10.0.0.0/8)\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
-       "Tag of this route\n"
-       "Tag value\n")
 
 DEFUN (no_ip_route_flags2,
        no_ip_route_flags2_cmd,
@@ -804,6 +814,20 @@ DEFUN (no_ip_route_flags2_tag,
                             NULL, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole)",
+ *     NO_STR
+ *     IP_STR
+ *     "Establish static routes\n"
+ *     "IP destination prefix\n"
+ *     "IP destination prefix mask\n"
+ *     "IP gateway address\n"
+ *     "IP gateway interface name\n"
+ *     "Emit an ICMP unreachable when matched\n"
+ *     "Silently discard pkts when matched\n"
+ *
+ */
 DEFUN (no_ip_route_mask,
        no_ip_route_mask_cmd,
        "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0)",
@@ -820,6 +844,22 @@ DEFUN (no_ip_route_mask,
                             NULL, NULL);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535>",
+ *     NO_STR
+ *     IP_STR
+ *     "Establish static routes\n"
+ *     "IP destination prefix\n"
+ *     "IP destination prefix mask\n"
+ *     "IP gateway address\n"
+ *     "IP gateway interface name\n"
+ *     "Emit an ICMP unreachable when matched\n"
+ *     "Silently discard pkts when matched\n"
+ *     "Tag of this route\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (no_ip_route_mask_tag,
        no_ip_route_mask_tag_cmd,
        "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE|null0) tag <1-65535>",
@@ -838,33 +878,7 @@ DEFUN (no_ip_route_mask_tag,
                             NULL, NULL);
 }
 
-ALIAS (no_ip_route_mask,
-       no_ip_route_mask_flags_cmd,
-       "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole)",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n")
 
-ALIAS (no_ip_route_mask_tag,
-       no_ip_route_mask_flags_tag_cmd,
-       "no ip route A.B.C.D A.B.C.D (A.B.C.D|INTERFACE) (reject|blackhole) tag <1-65535>",
-       NO_STR
-       IP_STR
-       "Establish static routes\n"
-       "IP destination prefix\n"
-       "IP destination prefix mask\n"
-       "IP gateway address\n"
-       "IP gateway interface name\n"
-       "Emit an ICMP unreachable when matched\n"
-       "Silently discard pkts when matched\n"
-       "Tag of this route\n"
-       "Tag value\n")
 
 DEFUN (no_ip_route_mask_flags2,
        no_ip_route_mask_flags2_cmd,
@@ -1109,7 +1123,7 @@ DEFUN (no_ip_route_mask_flags_tag_distance2,
 }
 
 /* Static route configuration.  */
-DEFUN (ip_route_vrf, 
+DEFUN (ip_route_vrf,
        ip_route_vrf_cmd,
        "ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) " VRF_CMD_STR,
        IP_STR
@@ -1501,7 +1515,7 @@ DEFUN (ip_route_mask_flags_tag_distance2_vrf,
   return zebra_static_ipv4 (vty, SAFI_UNICAST, 1, argv[2]->arg, argv[3]->arg, NULL, argv[4]->arg, argv[6]->arg, argv[7]->arg, argv[10]->arg);
 }
 
-DEFUN (no_ip_route_vrf, 
+DEFUN (no_ip_route_vrf,
        no_ip_route_vrf_cmd,
        "no ip route A.B.C.D/M (A.B.C.D|INTERFACE|null0) " VRF_CMD_STR,
        NO_STR
@@ -2436,6 +2450,15 @@ DEFUN (show_ip_route_vrf,
     return do_show_ip_route (vty, argv[5]->arg, SAFI_UNICAST, uj);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip nht " VRF_CMD_STR,
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP nexthop tracking table\n"
+ *     VRF_CMD_HELP_STR
+ *
+ */
 DEFUN (show_ip_nht,
        show_ip_nht_cmd,
        "show ip nht",
@@ -2452,13 +2475,6 @@ DEFUN (show_ip_nht,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_nht,
-       show_ip_nht_vrf_cmd,
-       "show ip nht " VRF_CMD_STR,
-       SHOW_STR
-       IP_STR
-       "IP nexthop tracking table\n"
-       VRF_CMD_HELP_STR)
 
 DEFUN (show_ip_nht_vrf_all,
        show_ip_nht_vrf_all_cmd,
@@ -2481,6 +2497,15 @@ DEFUN (show_ip_nht_vrf_all,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 nht " VRF_CMD_STR,
+ *     SHOW_STR
+ *     IPV6_STR
+ *     "IPv6 nexthop tracking table\n"
+ *     VRF_CMD_HELP_STR
+ *
+ */
 DEFUN (show_ipv6_nht,
        show_ipv6_nht_cmd,
        "show ipv6 nht",
@@ -2497,13 +2522,6 @@ DEFUN (show_ipv6_nht,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_nht,
-       show_ipv6_nht_vrf_cmd,
-       "show ipv6 nht " VRF_CMD_STR,
-       SHOW_STR
-       IPV6_STR
-       "IPv6 nexthop tracking table\n"
-       VRF_CMD_HELP_STR)
 
 DEFUN (show_ipv6_nht_vrf_all,
        show_ipv6_nht_vrf_all_cmd,
@@ -2588,6 +2606,17 @@ DEFUN (no_ipv6_nht_default_route,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip route " VRF_CMD_STR " tag <1-65535>",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "Show only routes with tag\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (show_ip_route_tag,
        show_ip_route_tag_cmd,
        "show ip route tag <1-65535>",
@@ -2633,16 +2662,18 @@ DEFUN (show_ip_route_tag,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_route_tag,
-       show_ip_route_vrf_tag_cmd,
-       "show ip route " VRF_CMD_STR " tag <1-65535>",
-       SHOW_STR
-       IP_STR
-       "IP routing table\n"
-       VRF_CMD_HELP_STR
-       "Show only routes with tag\n"
-       "Tag value\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip route " VRF_CMD_STR " A.B.C.D/M longer-prefixes",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
+ *     "Show route matching the specified Network/Mask pair only\n"
+ *
+ */
 DEFUN (show_ip_route_prefix_longer,
        show_ip_route_prefix_longer_cmd,
        "show ip route A.B.C.D/M longer-prefixes",
@@ -2693,16 +2724,17 @@ DEFUN (show_ip_route_prefix_longer,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_route_prefix_longer,
-       show_ip_route_vrf_prefix_longer_cmd,
-       "show ip route " VRF_CMD_STR " A.B.C.D/M longer-prefixes",
-       SHOW_STR
-       IP_STR
-       "IP routing table\n"
-       VRF_CMD_HELP_STR
-       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
-       "Show route matching the specified Network/Mask pair only\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip route " VRF_CMD_STR " supernets-only",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "Show supernet entries only\n"
+ *
+ */
 DEFUN (show_ip_route_supernets,
        show_ip_route_supernets_cmd,
        "show ip route supernets-only",
@@ -2746,15 +2778,17 @@ DEFUN (show_ip_route_supernets,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_route_supernets,
-       show_ip_route_vrf_supernets_cmd,
-       "show ip route " VRF_CMD_STR " supernets-only",
-       SHOW_STR
-       IP_STR
-       "IP routing table\n"
-       VRF_CMD_HELP_STR
-       "Show supernet entries only\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip route " VRF_CMD_STR "  " QUAGGA_IP_REDIST_STR_ZEBRA,
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     QUAGGA_IP_REDIST_HELP_STR_ZEBRA
+ *
+ */
 DEFUN (show_ip_route_protocol,
        show_ip_route_protocol_cmd,
        "show ip route " QUAGGA_IP_REDIST_STR_ZEBRA,
@@ -2803,14 +2837,6 @@ DEFUN (show_ip_route_protocol,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_route_protocol,
-       show_ip_route_vrf_protocol_cmd,
-       "show ip route " VRF_CMD_STR "  " QUAGGA_IP_REDIST_STR_ZEBRA,
-       SHOW_STR
-       IP_STR
-       "IP routing table\n"
-       VRF_CMD_HELP_STR
-       QUAGGA_IP_REDIST_HELP_STR_ZEBRA)
 
 DEFUN (show_ip_route_ospf_instance,
        show_ip_route_ospf_instance_cmd,
@@ -2848,6 +2874,16 @@ DEFUN (show_ip_route_ospf_instance,
   return CMD_SUCCESS;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip route "  VRF_CMD_STR " A.B.C.D",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "Network in the IP routing table to display\n"
+ *
+ */
 DEFUN (show_ip_route_addr,
        show_ip_route_addr_cmd,
        "show ip route A.B.C.D",
@@ -2894,15 +2930,17 @@ DEFUN (show_ip_route_addr,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_route_addr,
-       show_ip_route_vrf_addr_cmd,
-       "show ip route "  VRF_CMD_STR " A.B.C.D",
-       SHOW_STR
-       IP_STR
-       "IP routing table\n"
-       VRF_CMD_HELP_STR
-       "Network in the IP routing table to display\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip route " VRF_CMD_STR " A.B.C.D/M",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
+ *
+ */
 DEFUN (show_ip_route_prefix,
        show_ip_route_prefix_cmd,
        "show ip route A.B.C.D/M",
@@ -2949,14 +2987,6 @@ DEFUN (show_ip_route_prefix,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_route_prefix,
-       show_ip_route_vrf_prefix_cmd,
-       "show ip route " VRF_CMD_STR " A.B.C.D/M",
-       SHOW_STR
-       IP_STR
-       "IP routing table\n"
-       VRF_CMD_HELP_STR
-       "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
 
 static void
 vty_show_ip_route_summary (struct vty *vty, struct route_table *table)
@@ -3108,6 +3138,16 @@ vty_show_ip_route_summary_prefix (struct vty *vty, struct route_table *table)
 }
 
 /* Show route summary.  */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip route " VRF_CMD_STR " summary",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "Summary of all routes\n"
+ *
+ */
 DEFUN (show_ip_route_summary,
        show_ip_route_summary_cmd,
        "show ip route summary",
@@ -3131,16 +3171,19 @@ DEFUN (show_ip_route_summary,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_route_summary,
-       show_ip_route_vrf_summary_cmd,
-       "show ip route " VRF_CMD_STR " summary",
-       SHOW_STR
-       IP_STR
-       "IP routing table\n"
-       VRF_CMD_HELP_STR
-       "Summary of all routes\n")
 
 /* Show route summary prefix.  */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ip route " VRF_CMD_STR " summary prefix",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "Summary of all routes\n"
+ *     "Prefix routes\n"
+ *
+ */
 DEFUN (show_ip_route_summary_prefix,
        show_ip_route_summary_prefix_cmd,
        "show ip route summary prefix",
@@ -3165,15 +3208,6 @@ DEFUN (show_ip_route_summary_prefix,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ip_route_summary_prefix,
-       show_ip_route_vrf_summary_prefix_cmd,
-       "show ip route " VRF_CMD_STR " summary prefix",
-       SHOW_STR
-       IP_STR
-       "IP routing table\n"
-       VRF_CMD_HELP_STR
-       "Summary of all routes\n"
-       "Prefix routes\n")
 
 DEFUN (show_ip_route_vrf_all,
        show_ip_route_vrf_all_cmd,
@@ -4740,6 +4774,15 @@ DEFUN (no_ipv6_route_ifname_flags_pref_tag_vrf,
   return static_ipv6_func (vty, 0, argv[3]->arg, argv[4]->arg, argv[5]->arg, argv[6]->arg, argv[8]->arg, argv[9]->arg, argv[12]->arg);
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 route  " VRF_CMD_STR " {json}",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IPv6 routing table\n"
+ *     VRF_CMD_HELP_STR
+ *
+ */
 DEFUN (show_ipv6_route,
        show_ipv6_route_cmd,
        "show ipv6 route {json}",
@@ -4834,14 +4877,18 @@ DEFUN (show_ipv6_route,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_route,
-       show_ipv6_route_vrf_cmd,
-       "show ipv6 route  " VRF_CMD_STR " {json}",
-       SHOW_STR
-       IP_STR
-       "IPv6 routing table\n"
-       VRF_CMD_HELP_STR)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 route " VRF_CMD_STR " tag <1-65535>",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IPv6 routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "Show only routes with tag\n"
+ *     "Tag value\n"
+ *
+ */
 DEFUN (show_ipv6_route_tag,
        show_ipv6_route_tag_cmd,
        "show ipv6 route tag <1-65535>",
@@ -4887,16 +4934,18 @@ DEFUN (show_ipv6_route_tag,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_route_tag,
-       show_ipv6_route_vrf_tag_cmd,
-       "show ipv6 route " VRF_CMD_STR " tag <1-65535>",
-       SHOW_STR
-       IP_STR
-       "IPv6 routing table\n"
-       VRF_CMD_HELP_STR
-       "Show only routes with tag\n"
-       "Tag value\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 route " VRF_CMD_STR " X:X::X:X/M longer-prefixes",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IPv6 routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "IPv6 prefix\n"
+ *     "Show route matching the specified Network/Mask pair only\n"
+ *
+ */
 DEFUN (show_ipv6_route_prefix_longer,
        show_ipv6_route_prefix_longer_cmd,
        "show ipv6 route X:X::X:X/M longer-prefixes",
@@ -4947,16 +4996,17 @@ DEFUN (show_ipv6_route_prefix_longer,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_route_prefix_longer,
-       show_ipv6_route_vrf_prefix_longer_cmd,
-       "show ipv6 route " VRF_CMD_STR " X:X::X:X/M longer-prefixes",
-       SHOW_STR
-       IP_STR
-       "IPv6 routing table\n"
-       VRF_CMD_HELP_STR
-       "IPv6 prefix\n"
-       "Show route matching the specified Network/Mask pair only\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 route "  VRF_CMD_STR "  " QUAGGA_IP6_REDIST_STR_ZEBRA,
+ *     SHOW_STR
+ *     IP_STR
+ *     "IP routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     QUAGGA_IP6_REDIST_HELP_STR_ZEBRA
+ *
+ */
 DEFUN (show_ipv6_route_protocol,
        show_ipv6_route_protocol_cmd,
        "show ipv6 route " QUAGGA_IP6_REDIST_STR_ZEBRA,
@@ -5005,15 +5055,17 @@ DEFUN (show_ipv6_route_protocol,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_route_protocol,
-       show_ipv6_route_vrf_protocol_cmd,
-       "show ipv6 route "  VRF_CMD_STR "  " QUAGGA_IP6_REDIST_STR_ZEBRA,
-       SHOW_STR
-       IP_STR
-       "IP routing table\n"
-       VRF_CMD_HELP_STR
-       QUAGGA_IP6_REDIST_HELP_STR_ZEBRA)
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 route " VRF_CMD_STR " X:X::X:X",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IPv6 routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "IPv6 Address\n"
+ *
+ */
 DEFUN (show_ipv6_route_addr,
        show_ipv6_route_addr_cmd,
        "show ipv6 route X:X::X:X",
@@ -5060,15 +5112,17 @@ DEFUN (show_ipv6_route_addr,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_route_addr,
-       show_ipv6_route_vrf_addr_cmd,
-       "show ipv6 route " VRF_CMD_STR " X:X::X:X",
-       SHOW_STR
-       IP_STR
-       "IPv6 routing table\n"
-       VRF_CMD_HELP_STR
-       "IPv6 Address\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 route " VRF_CMD_STR " X:X::X:X/M ",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IPv6 routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "IPv6 prefix\n"
+ *
+ */
 DEFUN (show_ipv6_route_prefix,
        show_ipv6_route_prefix_cmd,
        "show ipv6 route X:X::X:X/M",
@@ -5115,16 +5169,18 @@ DEFUN (show_ipv6_route_prefix,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_route_prefix,
-       show_ipv6_route_vrf_prefix_cmd,
-       "show ipv6 route " VRF_CMD_STR " X:X::X:X/M ",
-       SHOW_STR
-       IP_STR
-       "IPv6 routing table\n"
-       VRF_CMD_HELP_STR
-       "IPv6 prefix\n")
 
 /* Show route summary.  */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 route " VRF_CMD_STR " summary",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IPv6 routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "Summary of all IPv6 routes\n"
+ *
+ */
 DEFUN (show_ipv6_route_summary,
        show_ipv6_route_summary_cmd,
        "show ipv6 route summary",
@@ -5148,16 +5204,19 @@ DEFUN (show_ipv6_route_summary,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_route_summary,
-       show_ipv6_route_vrf_summary_cmd,
-       "show ipv6 route " VRF_CMD_STR " summary",
-       SHOW_STR
-       IP_STR
-       "IPv6 routing table\n"
-       VRF_CMD_HELP_STR
-       "Summary of all IPv6 routes\n")
 
 /* Show ipv6 route summary prefix.  */
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 route " VRF_CMD_STR " summary prefix",
+ *     SHOW_STR
+ *     IP_STR
+ *     "IPv6 routing table\n"
+ *     VRF_CMD_HELP_STR
+ *     "Summary of all IPv6 routes\n"
+ *     "Prefix routes\n"
+ *
+ */
 DEFUN (show_ipv6_route_summary_prefix,
        show_ipv6_route_summary_prefix_cmd,
        "show ipv6 route summary prefix",
@@ -5182,21 +5241,21 @@ DEFUN (show_ipv6_route_summary_prefix,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_route_summary_prefix,
-       show_ipv6_route_vrf_summary_prefix_cmd,
-       "show ipv6 route " VRF_CMD_STR " summary prefix",
-       SHOW_STR
-       IP_STR
-       "IPv6 routing table\n"
-       VRF_CMD_HELP_STR
-       "Summary of all IPv6 routes\n"
-       "Prefix routes\n")
 
 /*
  * Show IPv6 mroute command.Used to dump
  * the Multicast routing table.
  */
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "show ipv6 mroute  " VRF_CMD_STR,
+ *     SHOW_STR
+ *     IP_STR
+ *     "IPv6 Multicast routing table\n"
+ *     VRF_CMD_HELP_STR
+ *
+ */
 DEFUN (show_ipv6_mroute,
        show_ipv6_mroute_cmd,
        "show ipv6 mroute",
@@ -5231,13 +5290,6 @@ DEFUN (show_ipv6_mroute,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_mroute,
-       show_ipv6_mroute_vrf_cmd,
-       "show ipv6 mroute  " VRF_CMD_STR,
-       SHOW_STR
-       IP_STR
-       "IPv6 Multicast routing table\n"
-       VRF_CMD_HELP_STR)
 
 DEFUN (show_ipv6_route_vrf_all,
        show_ipv6_route_vrf_all_cmd,
@@ -5738,6 +5790,14 @@ zebra_ip_config (struct vty *vty)
   return write;
 }
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip import-table <1-252>",
+ *     IP_STR
+ *     "import routes from non-main kernel table\n"
+ *     "kernel routing table id\n"
+ *
+ */
 DEFUN (ip_zebra_import_table_distance,
        ip_zebra_import_table_distance_cmd,
        "ip import-table <1-252> distance <1-255>",
@@ -5773,13 +5833,17 @@ DEFUN (ip_zebra_import_table_distance,
 
 }
 
-ALIAS (ip_zebra_import_table_distance,
-       ip_zebra_import_table_cmd,
-       "ip import-table <1-252>",
-       IP_STR
-       "import routes from non-main kernel table\n"
-       "kernel routing table id\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "ip import-table <1-252> route-map WORD",
+ *     IP_STR
+ *     "import routes from non-main kernel table\n"
+ *     "kernel routing table id\n"
+ *     "route-map for filtering\n"
+ *     "route-map name\n"
+ *
+ */
 DEFUN (ip_zebra_import_table_distance_routemap,
        ip_zebra_import_table_distance_routemap_cmd,
        "ip import-table <1-252> distance <1-255> route-map WORD",
@@ -5823,15 +5887,16 @@ DEFUN (ip_zebra_import_table_distance_routemap,
   return (zebra_import_table(AFI_IP, table_id, distance, rmap_name, 1));
 }
 
-ALIAS (ip_zebra_import_table_distance_routemap,
-       ip_zebra_import_table_routemap_cmd,
-       "ip import-table <1-252> route-map WORD",
-       IP_STR
-       "import routes from non-main kernel table\n"
-       "kernel routing table id\n"
-       "route-map for filtering\n"
-       "route-map name\n")
 
+/*
+ * CHECK ME - The following ALIASes need to be implemented in this DEFUN
+ * "no ip import-table <1-252> distance <1-255> {route-map NAME}",
+ *     IP_STR
+ *     "import routes from non-main kernel table to main table"
+ *     "kernel routing table id\n"
+ *     "distance to be used\n"
+ *
+ */
 DEFUN (no_ip_zebra_import_table,
        no_ip_zebra_import_table_cmd,
        "no ip import-table <1-252> {route-map NAME}",
@@ -5865,13 +5930,6 @@ DEFUN (no_ip_zebra_import_table,
   return (zebra_import_table(AFI_IP, table_id, 0, NULL, 0));
 }
 
-ALIAS (no_ip_zebra_import_table,
-       no_ip_zebra_import_table_distance_cmd,
-       "no ip import-table <1-252> distance <1-255> {route-map NAME}",
-       IP_STR
-       "import routes from non-main kernel table to main table"
-       "kernel routing table id\n"
-       "distance to be used\n")
 
 static int
 config_write_protocol (struct vty *vty)
@@ -5914,13 +5972,10 @@ zebra_vty_init (void)
 
   install_element (CONFIG_NODE, &allow_external_route_update_cmd);
   install_element (CONFIG_NODE, &no_allow_external_route_update_cmd);
-  install_element (CONFIG_NODE, &ip_mroute_cmd);
   install_element (CONFIG_NODE, &ip_mroute_dist_cmd);
-  install_element (CONFIG_NODE, &no_ip_mroute_cmd);
   install_element (CONFIG_NODE, &no_ip_mroute_dist_cmd);
   install_element (CONFIG_NODE, &ip_multicast_mode_cmd);
   install_element (CONFIG_NODE, &no_ip_multicast_mode_cmd);
-  install_element (CONFIG_NODE, &no_ip_multicast_mode_noarg_cmd);
   install_element (CONFIG_NODE, &ip_route_cmd);
   install_element (CONFIG_NODE, &ip_route_tag_cmd);
   install_element (CONFIG_NODE, &ip_route_flags_cmd);
@@ -5935,14 +5990,10 @@ zebra_vty_init (void)
   install_element (CONFIG_NODE, &ip_route_mask_flags2_tag_cmd);
   install_element (CONFIG_NODE, &no_ip_route_cmd);
   install_element (CONFIG_NODE, &no_ip_route_tag_cmd);
-  install_element (CONFIG_NODE, &no_ip_route_flags_cmd);
-  install_element (CONFIG_NODE, &no_ip_route_flags_tag_cmd);
   install_element (CONFIG_NODE, &no_ip_route_flags2_cmd);
   install_element (CONFIG_NODE, &no_ip_route_flags2_tag_cmd);
   install_element (CONFIG_NODE, &no_ip_route_mask_cmd);
   install_element (CONFIG_NODE, &no_ip_route_mask_tag_cmd);
-  install_element (CONFIG_NODE, &no_ip_route_mask_flags_cmd);
-  install_element (CONFIG_NODE, &no_ip_route_mask_flags_tag_cmd);
   install_element (CONFIG_NODE, &no_ip_route_mask_flags2_cmd);
   install_element (CONFIG_NODE, &no_ip_route_mask_flags2_tag_cmd);
   install_element (CONFIG_NODE, &ip_route_distance_cmd);
@@ -5969,22 +6020,17 @@ zebra_vty_init (void)
   install_element (CONFIG_NODE, &no_ip_route_mask_flags_tag_distance_cmd);
   install_element (CONFIG_NODE, &no_ip_route_mask_flags_distance2_cmd);
   install_element (CONFIG_NODE, &no_ip_route_mask_flags_tag_distance2_cmd);
-  install_element (CONFIG_NODE, &ip_zebra_import_table_cmd);
   install_element (CONFIG_NODE, &ip_zebra_import_table_distance_cmd);
-  install_element (CONFIG_NODE, &ip_zebra_import_table_routemap_cmd);
   install_element (CONFIG_NODE, &ip_zebra_import_table_distance_routemap_cmd);
   install_element (CONFIG_NODE, &no_ip_zebra_import_table_cmd);
-  install_element (CONFIG_NODE, &no_ip_zebra_import_table_distance_cmd);
 
   install_element (VIEW_NODE, &show_vrf_cmd);
   install_element (VIEW_NODE, &show_ip_route_cmd);
   install_element (VIEW_NODE, &show_ip_route_ospf_instance_cmd);
   install_element (VIEW_NODE, &show_ip_route_tag_cmd);
   install_element (VIEW_NODE, &show_ip_nht_cmd);
-  install_element (VIEW_NODE, &show_ip_nht_vrf_cmd);
   install_element (VIEW_NODE, &show_ip_nht_vrf_all_cmd);
   install_element (VIEW_NODE, &show_ipv6_nht_cmd);
-  install_element (VIEW_NODE, &show_ipv6_nht_vrf_cmd);
   install_element (VIEW_NODE, &show_ipv6_nht_vrf_all_cmd);
   install_element (VIEW_NODE, &show_ip_route_addr_cmd);
   install_element (VIEW_NODE, &show_ip_route_prefix_cmd);
@@ -5998,10 +6044,8 @@ zebra_vty_init (void)
   install_element (ENABLE_NODE, &show_ip_route_ospf_instance_cmd);
   install_element (ENABLE_NODE, &show_ip_route_tag_cmd);
   install_element (ENABLE_NODE, &show_ip_nht_cmd);
-  install_element (ENABLE_NODE, &show_ip_nht_vrf_cmd);
   install_element (ENABLE_NODE, &show_ip_nht_vrf_all_cmd);
   install_element (ENABLE_NODE, &show_ipv6_nht_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_nht_vrf_cmd);
   install_element (ENABLE_NODE, &show_ipv6_nht_vrf_all_cmd);
   install_element (ENABLE_NODE, &show_ip_route_addr_cmd);
   install_element (ENABLE_NODE, &show_ip_route_prefix_cmd);
@@ -6068,23 +6112,7 @@ zebra_vty_init (void)
   install_element (CONFIG_NODE, &no_ip_route_mask_flags_tag_distance2_vrf_cmd);
 
   install_element (VIEW_NODE, &show_ip_route_vrf_cmd);
-  install_element (VIEW_NODE, &show_ip_route_vrf_addr_cmd);
-  install_element (VIEW_NODE, &show_ip_route_vrf_tag_cmd);
-  install_element (VIEW_NODE, &show_ip_route_vrf_prefix_cmd);
-  install_element (VIEW_NODE, &show_ip_route_vrf_prefix_longer_cmd);
-  install_element (VIEW_NODE, &show_ip_route_vrf_protocol_cmd);
-  install_element (VIEW_NODE, &show_ip_route_vrf_supernets_cmd);
-  install_element (VIEW_NODE, &show_ip_route_vrf_summary_cmd);
-  install_element (VIEW_NODE, &show_ip_route_vrf_summary_prefix_cmd);
   install_element (ENABLE_NODE, &show_ip_route_vrf_cmd);
-  install_element (ENABLE_NODE, &show_ip_route_vrf_addr_cmd);
-  install_element (ENABLE_NODE, &show_ip_route_vrf_tag_cmd);
-  install_element (ENABLE_NODE, &show_ip_route_vrf_prefix_cmd);
-  install_element (ENABLE_NODE, &show_ip_route_vrf_prefix_longer_cmd);
-  install_element (ENABLE_NODE, &show_ip_route_vrf_protocol_cmd);
-  install_element (ENABLE_NODE, &show_ip_route_vrf_supernets_cmd);
-  install_element (ENABLE_NODE, &show_ip_route_vrf_summary_cmd);
-  install_element (ENABLE_NODE, &show_ip_route_vrf_summary_prefix_cmd);
 
   install_element (VIEW_NODE, &show_ip_route_vrf_all_cmd);
   install_element (VIEW_NODE, &show_ip_route_vrf_all_tag_cmd);
@@ -6198,22 +6226,6 @@ zebra_vty_init (void)
   install_element (CONFIG_NODE, &no_ipv6_route_ifname_flags_pref_tag_vrf_cmd);
 
 
-  install_element (VIEW_NODE, &show_ipv6_route_vrf_cmd);
-  install_element (VIEW_NODE, &show_ipv6_route_vrf_tag_cmd);
-  install_element (VIEW_NODE, &show_ipv6_route_vrf_summary_cmd);
-  install_element (VIEW_NODE, &show_ipv6_route_vrf_summary_prefix_cmd);
-  install_element (VIEW_NODE, &show_ipv6_route_vrf_protocol_cmd);
-  install_element (VIEW_NODE, &show_ipv6_route_vrf_addr_cmd);
-  install_element (VIEW_NODE, &show_ipv6_route_vrf_prefix_cmd);
-  install_element (VIEW_NODE, &show_ipv6_route_vrf_prefix_longer_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_route_vrf_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_route_vrf_tag_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_route_vrf_protocol_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_route_vrf_addr_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_route_vrf_prefix_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_route_vrf_prefix_longer_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_route_vrf_summary_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_route_vrf_summary_prefix_cmd);
 
   install_element (VIEW_NODE, &show_ipv6_route_vrf_all_cmd);
   install_element (VIEW_NODE, &show_ipv6_route_vrf_all_tag_cmd);
@@ -6232,8 +6244,6 @@ zebra_vty_init (void)
   install_element (ENABLE_NODE, &show_ipv6_route_vrf_all_summary_cmd);
   install_element (ENABLE_NODE, &show_ipv6_route_vrf_all_summary_prefix_cmd);
 
-  install_element (VIEW_NODE, &show_ipv6_mroute_vrf_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_mroute_vrf_cmd);
 
   install_element (VIEW_NODE, &show_ipv6_mroute_vrf_all_cmd);
   install_element (ENABLE_NODE, &show_ipv6_mroute_vrf_all_cmd);