isisd: remove redundant northbound destroy callbacks

Fixes startup warnings:
```
ISIS: [ZKB8W-3S2Q4][EC 100663330] unneeded 'destroy' callback for '/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-segs-left'
ISIS: [ZKB8W-3S2Q4][EC 100663330] unneeded 'destroy' callback for '/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-pop'
ISIS: [ZKB8W-3S2Q4][EC 100663330] unneeded 'destroy' callback for '/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-h-encaps'
ISIS: [ZKB8W-3S2Q4][EC 100663330] unneeded 'destroy' callback for '/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-d'
```

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/isisd/isis_nb.c b/isisd/isis_nb.c
index 186ebfc729daea11a978764f120a2f85ab78ba40..16cafa2ff034d7e2eb64462faad08d5bf1e57684 100644 (file)
--- a/isisd/isis_nb.c
+++ b/isisd/isis_nb.c
@@ -879,28 +879,24 @@ const struct frr_yang_module_info frr_isisd_info = {
                        .xpath = "/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-segs-left",
                        .cbs = {
                                .modify = isis_instance_segment_routing_srv6_msd_node_msd_max_segs_left_modify,
-                               .destroy = isis_instance_segment_routing_srv6_msd_node_msd_max_segs_left_destroy,
                        },
                },
                {
                        .xpath = "/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-pop",
                        .cbs = {
                                .modify = isis_instance_segment_routing_srv6_msd_node_msd_max_end_pop_modify,
-                               .destroy = isis_instance_segment_routing_srv6_msd_node_msd_max_end_pop_destroy,
                        },
                },
                {
                        .xpath = "/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-h-encaps",
                        .cbs = {
                                .modify = isis_instance_segment_routing_srv6_msd_node_msd_max_h_encaps_modify,
-                               .destroy = isis_instance_segment_routing_srv6_msd_node_msd_max_h_encaps_destroy,
                        },
                },
                {
                        .xpath = "/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-d",
                        .cbs = {
                                .modify = isis_instance_segment_routing_srv6_msd_node_msd_max_end_d_modify,
-                               .destroy = isis_instance_segment_routing_srv6_msd_node_msd_max_end_d_destroy,
                        },
                },
                {

diff --git a/isisd/isis_nb.h b/isisd/isis_nb.h
index be89fd2ac68acefbc08f19bd21d73b1d1bb7d4d9..c04a006a2e3c95d94982fc10d6eb15b0cec84f37 100644 (file)
--- a/isisd/isis_nb.h
+++ b/isisd/isis_nb.h
@@ -334,20 +334,12 @@ void cli_show_isis_srv6_locator(struct vty *vty, const struct lyd_node *dnode,
                                bool show_defaults);
 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_segs_left_destroy(
-       struct nb_cb_destroy_args *args);
 int isis_instance_segment_routing_srv6_msd_node_msd_max_end_pop_modify(
        struct nb_cb_modify_args *args);
-int isis_instance_segment_routing_srv6_msd_node_msd_max_end_pop_destroy(
-       struct nb_cb_destroy_args *args);
 int isis_instance_segment_routing_srv6_msd_node_msd_max_h_encaps_modify(
        struct nb_cb_modify_args *args);
-int isis_instance_segment_routing_srv6_msd_node_msd_max_h_encaps_destroy(
-       struct nb_cb_destroy_args *args);
 int isis_instance_segment_routing_srv6_msd_node_msd_max_end_d_modify(
        struct nb_cb_modify_args *args);
-int isis_instance_segment_routing_srv6_msd_node_msd_max_end_d_destroy(
-       struct nb_cb_destroy_args *args);
 void cli_show_isis_srv6_node_msd(struct vty *vty, const struct lyd_node *dnode,
                                 bool show_defaults);
 int isis_instance_segment_routing_srv6_interface_modify(

diff --git a/isisd/isis_nb_config.c b/isisd/isis_nb_config.c
index 5d0089d6fb3772bf18eea12b609de88bc96d27e8..b6ee073fd5da6f091bd64a58018c748c751e7ed2 100644 (file)
--- a/isisd/isis_nb_config.c
+++ b/isisd/isis_nb_config.c
@@ -3583,24 +3583,6 @@ int isis_instance_segment_routing_srv6_msd_node_msd_max_segs_left_modify(
        return NB_OK;
 }
 
-int isis_instance_segment_routing_srv6_msd_node_msd_max_segs_left_destroy(
-       struct nb_cb_destroy_args *args)
-{
-       struct isis_area *area;
-
-       if (args->event != NB_EV_APPLY)
-               return NB_OK;
-
-       area = nb_running_get_entry(args->dnode, NULL, true);
-       area->srv6db.config.max_seg_left_msd =
-               yang_get_default_uint8("./msd/node-msd/max-segs-left");
-
-       /* Update and regenerate LSP */
-       lsp_regenerate_schedule(area, area->is_type, 0);
-
-       return NB_OK;
-}
-
 /*
  * XPath: /frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-pop
  */
@@ -3622,24 +3604,6 @@ int isis_instance_segment_routing_srv6_msd_node_msd_max_end_pop_modify(
        return NB_OK;
 }
 
-int isis_instance_segment_routing_srv6_msd_node_msd_max_end_pop_destroy(
-       struct nb_cb_destroy_args *args)
-{
-       struct isis_area *area;
-
-       if (args->event != NB_EV_APPLY)
-               return NB_OK;
-
-       area = nb_running_get_entry(args->dnode, NULL, true);
-       area->srv6db.config.max_end_pop_msd =
-               yang_get_default_uint8("./msd/node-msd/max-end-pop");
-
-       /* Update and regenerate LSP */
-       lsp_regenerate_schedule(area, area->is_type, 0);
-
-       return NB_OK;
-}
-
 /*
  * XPath: /frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-h-encaps
  */
@@ -3661,24 +3625,6 @@ int isis_instance_segment_routing_srv6_msd_node_msd_max_h_encaps_modify(
        return NB_OK;
 }
 
-int isis_instance_segment_routing_srv6_msd_node_msd_max_h_encaps_destroy(
-       struct nb_cb_destroy_args *args)
-{
-       struct isis_area *area;
-
-       if (args->event != NB_EV_APPLY)
-               return NB_OK;
-
-       area = nb_running_get_entry(args->dnode, NULL, true);
-       area->srv6db.config.max_h_encaps_msd =
-               yang_get_default_uint8("./msd/node-msd/max-h-encaps");
-
-       /* Update and regenerate LSP */
-       lsp_regenerate_schedule(area, area->is_type, 0);
-
-       return NB_OK;
-}
-
 /*
  * XPath: /frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-d
  */
@@ -3700,24 +3646,6 @@ int isis_instance_segment_routing_srv6_msd_node_msd_max_end_d_modify(
        return NB_OK;
 }
 
-int isis_instance_segment_routing_srv6_msd_node_msd_max_end_d_destroy(
-       struct nb_cb_destroy_args *args)
-{
-       struct isis_area *area;
-
-       if (args->event != NB_EV_APPLY)
-               return NB_OK;
-
-       area = nb_running_get_entry(args->dnode, NULL, true);
-       area->srv6db.config.max_end_d_msd =
-               yang_get_default_uint8("./msd/node-msd/max-end-d");
-
-       /* Update and regenerate LSP */
-       lsp_regenerate_schedule(area, area->is_type, 0);
-
-       return NB_OK;
-}
-
 /*
  * XPath: /frr-isisd:isis/instance/segment-routing-srv6/interface
  */