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 <idryzhov@gmail.com>
(cherry picked from commit 25d94ec3eedca978ce7c37359105b0518dcf0f5f)

diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c
index 7066485be065651d1037db850df7e682081579b4..5712a0b825b9022b7686585423d0c60406f9f2ba 100644 (file)
--- 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
index d5df5916ada64bf5f1c8c7082ee071f47357ea22..231099d3ac41c134be74ab0610cfef246de25b4d 100644 (file)
--- a/ripd/rip_nb.c
+++ b/ripd/rip_nb.c
@@ -143,7 +143,6 @@ 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,
                        }
                },
                {
@@ -151,7 +150,6 @@ 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,
                        }
                },
                {
@@ -159,7 +157,6 @@ 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,
                        }
                },
                {
@@ -167,7 +164,6 @@ 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,
                        }
                },
                {