ALIAS removal for bgp, ospf, pim, isis, rip, ripng, lib and zebra

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

10 files changed, 803 insertions, 921 deletions

diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c
index cd11cd2a8..4863342ef 100644
--- a/ospf6d/ospf6_area.c
+++ b/ospf6d/ospf6_area.c
@@ -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);
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index f513e68f7..696f18f03 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -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);
-}
-
-
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index e53fb2180..66cc59bc3 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -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 */
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index fbc72d6fe..d58ab567b 100644
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -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
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index adaef2f9f..e8f4990c9 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -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);
 }
 
 
diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index 3e0977162..fbf0efed8 100644
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -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);
 }
 
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index fe5006b24..6511d0b36 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -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);
 }
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index e04f22fd0..8ddc6cfc8 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -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);
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 1e22a3517..f172b50f0 100644
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -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);
 }
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index ecd0c0471..74ca444d4 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -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);
-}