Merge pull request #16741 from FRRouting/mergify/bp/stable/9.1/pr-16724

isisd: Add missing `exit` statement to `show running-config` output (backport #16724)
FRRouting · Sep 4, 2024 · 76b0754 · 76b0754
2 parents f4bb779 + a473fe2
commit 76b0754
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/isisd/isis_cli.c b/isisd/isis_cli.c
@@ -2061,6 +2061,12 @@ void cli_show_isis_srv6_locator(struct vty *vty, const struct lyd_node *dnode,
 	vty_out(vty, "  locator %s\n", yang_dnode_get_string(dnode, NULL));
 }
 
+void cli_show_isis_srv6_locator_end(struct vty *vty,
+				    const struct lyd_node *dnode)
+{
+	vty_out(vty, " exit\n");
+}
+
 /*
  * XPath: /frr-isisd:isis/instance/segment-routing-srv6/enabled
  */

diff --git a/isisd/isis_nb.c b/isisd/isis_nb.c
@@ -873,6 +873,7 @@ const struct frr_yang_module_info frr_isisd_info = {
 				.modify = isis_instance_segment_routing_srv6_locator_modify,
 				.destroy = isis_instance_segment_routing_srv6_locator_destroy,
 				.cli_show = cli_show_isis_srv6_locator,
+				.cli_show_end = cli_show_isis_srv6_locator_end,
 			},
 		},
 		{

diff --git a/isisd/isis_nb.h b/isisd/isis_nb.h
@@ -332,6 +332,8 @@ int isis_instance_segment_routing_srv6_locator_destroy(
 	struct nb_cb_destroy_args *args);
 void cli_show_isis_srv6_locator(struct vty *vty, const struct lyd_node *dnode,
 				bool show_defaults);
+void cli_show_isis_srv6_locator_end(struct vty *vty,
+				    const struct lyd_node *dnode);
 int isis_instance_segment_routing_srv6_msd_node_msd_max_segs_left_modify(
 	struct nb_cb_modify_args *args);
 int isis_instance_segment_routing_srv6_msd_node_msd_max_end_pop_modify(