From a473fe258b06e092294544d8cd79f9bfd0bbea95 Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Mon, 2 Sep 2024 23:57:53 +0200 Subject: [PATCH] isisd: Add missing `exit` statement Add missing `exit` statement to `show running-config` output. ``` router isis ISIS_CORE is-type level-2-only net 49.0001.0000.0000.0004.00 lsp-mtu 1300 topology ipv6-unicast log-adjacency-changes segment-routing srv6 locator ISIS_LOC exit <<<<<<<<<<<<<<<<<<<<<<<< exit ``` Fixes https://github.com/FRRouting/frr/issues/16694 Signed-off-by: Carmine Scarpitta (cherry picked from commit 8be8864ffd674ab87570f37f9f2e7c9afc20798f) --- isisd/isis_cli.c | 6 ++++++ isisd/isis_nb.c | 1 + isisd/isis_nb.h | 2 ++ 3 files changed, 9 insertions(+) diff --git a/isisd/isis_cli.c b/isisd/isis_cli.c index 9718a457ede5..d77d761b013d 100644 --- 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 index 16cafa2ff034..8608d2b9bdf8 100644 --- 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 index c04a006a2e3c..1bf95e3db365 100644 --- 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(