From bbb764c0f01c430b6351f1b20715540fc9ae708c Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 5 Feb 2025 20:46:25 -0500 Subject: [PATCH] isisd: Remove unneeded modify functions Our infrastructure was complaining about this: 2025/02/05 19:38:42 ISIS: [ZKB8W-3S2Q4][EC 100663330] unneeded 'modify' callback for '/frr-isisd:isis/instance/fast-reroute/level-1/lfa/tiebreaker/type' 2025/02/05 19:38:42 ISIS: [ZKB8W-3S2Q4][EC 100663330] unneeded 'modify' callback for '/frr-isisd:isis/instance/fast-reroute/level-2/lfa/tiebreaker/type' Seems we don't need it. Let's just remove it. Signed-off-by: Donald Sharp --- isisd/isis_nb.c | 12 ------------ isisd/isis_nb_config.c | 40 ---------------------------------------- 2 files changed, 52 deletions(-) diff --git a/isisd/isis_nb.c b/isisd/isis_nb.c index 3024bb57ea..5f95fe48a4 100644 --- a/isisd/isis_nb.c +++ b/isisd/isis_nb.c @@ -560,12 +560,6 @@ const struct frr_yang_module_info frr_isisd_info = { .destroy = isis_instance_fast_reroute_level_1_lfa_tiebreaker_destroy, } }, - { - .xpath = "/frr-isisd:isis/instance/fast-reroute/level-1/lfa/tiebreaker/type", - .cbs = { - .modify = isis_instance_fast_reroute_level_1_lfa_tiebreaker_type_modify, - } - }, { .xpath = "/frr-isisd:isis/instance/fast-reroute/level-1/remote-lfa/prefix-list", .cbs = { @@ -597,12 +591,6 @@ const struct frr_yang_module_info frr_isisd_info = { .destroy = isis_instance_fast_reroute_level_2_lfa_tiebreaker_destroy, } }, - { - .xpath = "/frr-isisd:isis/instance/fast-reroute/level-2/lfa/tiebreaker/type", - .cbs = { - .modify = isis_instance_fast_reroute_level_2_lfa_tiebreaker_type_modify, - } - }, { .xpath = "/frr-isisd:isis/instance/fast-reroute/level-2/remote-lfa/prefix-list", .cbs = { diff --git a/isisd/isis_nb_config.c b/isisd/isis_nb_config.c index fb391534e2..6bd3b39bc7 100644 --- a/isisd/isis_nb_config.c +++ b/isisd/isis_nb_config.c @@ -1762,26 +1762,6 @@ int isis_instance_fast_reroute_level_1_lfa_tiebreaker_destroy( return NB_OK; } -/* - * XPath: /frr-isisd:isis/instance/fast-reroute/level-1/lfa/tiebreaker/type - */ -int isis_instance_fast_reroute_level_1_lfa_tiebreaker_type_modify( - struct nb_cb_modify_args *args) -{ - struct lfa_tiebreaker *tie_b; - struct isis_area *area; - - if (args->event != NB_EV_APPLY) - return NB_OK; - - tie_b = nb_running_get_entry(args->dnode, NULL, true); - area = tie_b->area; - tie_b->type = yang_dnode_get_enum(args->dnode, NULL); - lsp_regenerate_schedule(area, area->is_type, 0); - - return NB_OK; -} - /* * XPath: /frr-isisd:isis/instance/fast-reroute/level-1/remote-lfa/prefix-list */ @@ -1911,26 +1891,6 @@ int isis_instance_fast_reroute_level_2_lfa_tiebreaker_destroy( return NB_OK; } -/* - * XPath: /frr-isisd:isis/instance/fast-reroute/level-2/lfa/tiebreaker/type - */ -int isis_instance_fast_reroute_level_2_lfa_tiebreaker_type_modify( - struct nb_cb_modify_args *args) -{ - struct lfa_tiebreaker *tie_b; - struct isis_area *area; - - if (args->event != NB_EV_APPLY) - return NB_OK; - - tie_b = nb_running_get_entry(args->dnode, NULL, true); - area = tie_b->area; - tie_b->type = yang_dnode_get_enum(args->dnode, NULL); - lsp_regenerate_schedule(area, area->is_type, 0); - - return NB_OK; -} - /* * XPath: /frr-isisd:isis/instance/fast-reroute/level-2/remote-lfa/prefix-list */