*: Fix duplicate commands from view/enable node consolidation

This commit is contained in:
Paul Jakma 2016-06-16 16:06:13 +01:00 committed by Donald Sharp
parent 274f29b2f4
commit e95c4d17a7
4 changed files with 0 additions and 45 deletions

View File

@ -1848,43 +1848,6 @@ ospf6_init (void)
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);

View File

@ -449,7 +449,6 @@ zebra_debug_init (void)
install_element (VIEW_NODE, &show_debugging_zebra_cmd);
install_element (ENABLE_NODE, &show_debugging_zebra_cmd);
install_element (ENABLE_NODE, &debug_zebra_events_cmd);
install_element (ENABLE_NODE, &debug_zebra_nht_cmd);
install_element (ENABLE_NODE, &debug_zebra_mpls_cmd);

View File

@ -828,7 +828,6 @@ void
zebra_mpls_vty_init (void)
{
install_element (VIEW_NODE, &show_mpls_status_cmd);
install_element (ENABLE_NODE, &show_mpls_status_cmd);
if (! mpls_enabled)
return;
@ -875,7 +874,5 @@ zebra_mpls_vty_init (void)
install_element (CONFIG_NODE, &no_mpls_transit_lsp_all_cmd);
install_element (VIEW_NODE, &show_mpls_table_cmd);
install_element (ENABLE_NODE, &show_mpls_table_cmd);
install_element (VIEW_NODE, &show_mpls_table_lsp_cmd);
install_element (ENABLE_NODE, &show_mpls_table_lsp_cmd);
}

View File

@ -1790,22 +1790,18 @@ zebra_route_map_init ()
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);