ripd: fix show run output for distribute-list

CLI show callbacks should be defined in frr_ripd_cli_info instead of frr_ripd_info, because only the former is loaded by mgmtd and only its callbacks are getting called for config output. Signed-off-by: Igor Ryzhov <[email protected]>
FRRouting · Aug 7, 2024 · 25d94ec · 25d94ec
1 parent d36ff6d
commit 25d94ec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c
@@ -1374,6 +1374,22 @@ const struct frr_yang_module_info frr_ripd_cli_info = {
 			.xpath = "/frr-ripd:ripd/instance/non-passive-interface",
 			.cbs.cli_show = cli_show_rip_non_passive_interface,
 		},
+		{
+			.xpath = "/frr-ripd:ripd/instance/distribute-list/in/access-list",
+			.cbs.cli_show = group_distribute_list_ipv4_cli_show,
+		},
+		{
+			.xpath = "/frr-ripd:ripd/instance/distribute-list/out/access-list",
+			.cbs.cli_show = group_distribute_list_ipv4_cli_show,
+		},
+		{
+			.xpath = "/frr-ripd:ripd/instance/distribute-list/in/prefix-list",
+			.cbs.cli_show = group_distribute_list_ipv4_cli_show,
+		},
+		{
+			.xpath = "/frr-ripd:ripd/instance/distribute-list/out/prefix-list",
+			.cbs.cli_show = group_distribute_list_ipv4_cli_show,
+		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/redistribute",
 			.cbs.cli_show = cli_show_rip_redistribute,

diff --git a/ripd/rip_nb.c b/ripd/rip_nb.c
@@ -143,31 +143,27 @@ const struct frr_yang_module_info frr_ripd_info = {
 			.cbs = {
 				.modify = group_distribute_list_ipv4_modify,
 				.destroy = group_distribute_list_ipv4_destroy,
-				.cli_show = group_distribute_list_ipv4_cli_show,
 			}
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/distribute-list/out/access-list",
 			.cbs = {
 				.modify = group_distribute_list_ipv4_modify,
 				.destroy = group_distribute_list_ipv4_destroy,
-				.cli_show = group_distribute_list_ipv4_cli_show,
 			}
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/distribute-list/in/prefix-list",
 			.cbs = {
 				.modify = group_distribute_list_ipv4_modify,
 				.destroy = group_distribute_list_ipv4_destroy,
-				.cli_show = group_distribute_list_ipv4_cli_show,
 			}
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/distribute-list/out/prefix-list",
 			.cbs = {
 				.modify = group_distribute_list_ipv4_modify,
 				.destroy = group_distribute_list_ipv4_destroy,
-				.cli_show = group_distribute_list_ipv4_cli_show,
 			}
 		},
 		{