*: move "show debugging ..." commands to enable node

Use the same node for "show debugging" commands in all daemons.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

11 files changed, 14 insertions, 12 deletions

diff --git a/babeld/babel_zebra.c b/babeld/babel_zebra.c
index 86f8bc721e..d10d418572 100644
--- a/babeld/babel_zebra.c
+++ b/babeld/babel_zebra.c
@@ -251,7 +251,7 @@ void babelz_zebra_init(void)
     install_element(CONFIG_NODE, &debug_babel_cmd);
     install_element(CONFIG_NODE, &no_debug_babel_cmd);
 
-    install_element(VIEW_NODE, &show_debugging_babel_cmd);
+    install_element(ENABLE_NODE, &show_debugging_babel_cmd);
 }
 
 void
diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c
index fe681b4052..27b7bece48 100644
--- a/nhrpd/nhrp_vty.c
+++ b/nhrpd/nhrp_vty.c
@@ -1109,11 +1109,12 @@ void nhrp_config_init(void)
 	access_list_init();
 
 	/* global commands */
-	install_element(VIEW_NODE, &show_debugging_nhrp_cmd);
 	install_element(VIEW_NODE, &show_ip_nhrp_cmd);
 	install_element(VIEW_NODE, &show_dmvpn_cmd);
 	install_element(ENABLE_NODE, &clear_nhrp_cmd);
 
+	install_element(ENABLE_NODE, &show_debugging_nhrp_cmd);
+
 	install_element(ENABLE_NODE, &debug_nhrp_cmd);
 	install_element(ENABLE_NODE, &no_debug_nhrp_cmd);
 
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index 17e33902d9..f61adcd328 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -1236,7 +1236,7 @@ void ospf6_init(void)
 
 	install_element_ospf6_clear_interface();
 
-	install_element(VIEW_NODE, &show_debugging_ospf6_cmd);
+	install_element(ENABLE_NODE, &show_debugging_ospf6_cmd);
 
 	install_element(VIEW_NODE, &show_ipv6_ospf6_border_routers_cmd);
 
diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c
index f92276cffe..c423668ebd 100644
--- a/pbrd/pbr_vty.c
+++ b/pbrd/pbr_vty.c
@@ -1147,7 +1147,7 @@ void pbr_vty_init(void)
 	install_node(&debug_node);
 	install_element(ENABLE_NODE, &debug_pbr_cmd);
 	install_element(CONFIG_NODE, &debug_pbr_cmd);
-	install_element(VIEW_NODE, &show_debugging_pbr_cmd);
+	install_element(ENABLE_NODE, &show_debugging_pbr_cmd);
 
 	install_default(PBRMAP_NODE);
 
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index db3f0b8b23..df0e733d57 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -11236,7 +11236,6 @@ void pim_cmd_init(void)
 	install_element(VIEW_NODE, &show_ip_mroute_summary_vrf_all_cmd);
 	install_element(VIEW_NODE, &show_ip_rib_cmd);
 	install_element(VIEW_NODE, &show_ip_ssmpingd_cmd);
-	install_element(VIEW_NODE, &show_debugging_pim_cmd);
 	install_element(VIEW_NODE, &show_ip_pim_nexthop_cmd);
 	install_element(VIEW_NODE, &show_ip_pim_nexthop_lookup_cmd);
 	install_element(VIEW_NODE, &show_ip_pim_bsrp_cmd);
@@ -11252,6 +11251,8 @@ void pim_cmd_init(void)
 	install_element(ENABLE_NODE, &clear_ip_pim_oil_cmd);
 	install_element(ENABLE_NODE, &clear_ip_pim_statistics_cmd);
 
+	install_element(ENABLE_NODE, &show_debugging_pim_cmd);
+
 	install_element(ENABLE_NODE, &debug_igmp_cmd);
 	install_element(ENABLE_NODE, &no_debug_igmp_cmd);
 	install_element(ENABLE_NODE, &debug_igmp_events_cmd);
diff --git a/ripngd/ripng_debug.c b/ripngd/ripng_debug.c
index 54edb17ecc..539c01b3ec 100644
--- a/ripngd/ripng_debug.c
+++ b/ripngd/ripng_debug.c
@@ -218,7 +218,7 @@ void ripng_debug_init(void)
 
 	install_node(&debug_node);
 
-	install_element(VIEW_NODE, &show_debugging_ripng_cmd);
+	install_element(ENABLE_NODE, &show_debugging_ripng_cmd);
 
 	install_element(ENABLE_NODE, &debug_ripng_events_cmd);
 	install_element(ENABLE_NODE, &debug_ripng_packet_cmd);
diff --git a/sharpd/sharp_vty.c b/sharpd/sharp_vty.c
index d062f027ab..0c3bf7af78 100644
--- a/sharpd/sharp_vty.c
+++ b/sharpd/sharp_vty.c
@@ -716,7 +716,7 @@ void sharp_vty_init(void)
 	install_element(ENABLE_NODE, &send_opaque_reg_cmd);
 	install_element(ENABLE_NODE, &neigh_discover_cmd);
 
-	install_element(VIEW_NODE, &show_debugging_sharpd_cmd);
+	install_element(ENABLE_NODE, &show_debugging_sharpd_cmd);
 
 	return;
 }
diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index 55610fd1e0..489fa9663f 100644
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -1169,7 +1169,7 @@ void static_vty_init(void)
 	install_element(CONFIG_NODE, &ipv6_route_cmd);
 	install_element(VRF_NODE, &ipv6_route_vrf_cmd);
 
-	install_element(VIEW_NODE, &show_debugging_static_cmd);
+	install_element(ENABLE_NODE, &show_debugging_static_cmd);
 	install_element(ENABLE_NODE, &debug_staticd_cmd);
 	install_element(CONFIG_NODE, &debug_staticd_cmd);
 }
diff --git a/vrrpd/vrrp_vty.c b/vrrpd/vrrp_vty.c
index 8dd97a173e..7d9cea3adc 100644
--- a/vrrpd/vrrp_vty.c
+++ b/vrrpd/vrrp_vty.c
@@ -775,7 +775,7 @@ void vrrp_vty_init(void)
 
 	install_element(VIEW_NODE, &vrrp_vrid_show_cmd);
 	install_element(VIEW_NODE, &vrrp_vrid_show_summary_cmd);
-	install_element(VIEW_NODE, &show_debugging_vrrp_cmd);
+	install_element(ENABLE_NODE, &show_debugging_vrrp_cmd);
 	install_element(ENABLE_NODE, &debug_vrrp_cmd);
 	install_element(CONFIG_NODE, &debug_vrrp_cmd);
 	install_element(CONFIG_NODE, &vrrp_autoconfigure_cmd);
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 9993e73353..53863ca2f5 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -4271,9 +4271,9 @@ void vtysh_init_vty(void)
 #endif
 
 	/* debugging */
-	install_element(VIEW_NODE, &vtysh_show_debugging_cmd);
 	install_element(VIEW_NODE, &vtysh_show_error_code_cmd);
-	install_element(VIEW_NODE, &vtysh_show_debugging_hashtable_cmd);
+	install_element(ENABLE_NODE, &vtysh_show_debugging_cmd);
+	install_element(ENABLE_NODE, &vtysh_show_debugging_hashtable_cmd);
 	install_element(ENABLE_NODE, &vtysh_debug_all_cmd);
 	install_element(CONFIG_NODE, &vtysh_debug_all_cmd);
 	install_element(ENABLE_NODE, &vtysh_debug_memstats_cmd);
diff --git a/zebra/debug.c b/zebra/debug.c
index 8c53ab73e4..87a10ea65d 100644
--- a/zebra/debug.c
+++ b/zebra/debug.c
@@ -671,7 +671,7 @@ void zebra_debug_init(void)
 
 	install_node(&debug_node);
 
-	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);