proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 13:46:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14541 from idryzhov/isis-fix-cb-destroy

Browse Source 
isisd: remove redundant northbound destroy callbacks
This commit is contained in:
Rafael Zalamena 2023-10-08 10:49:03 -03:00 committed by GitHub
commit 5c0a5aa616
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
isisd/isis_nb.c
View File

@ -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", .xpath = "/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-segs-left",
.cbs = { .cbs = {
.modify = isis_instance_segment_routing_srv6_msd_node_msd_max_segs_left_modify, .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", .xpath = "/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-pop",
.cbs = { .cbs = {
.modify = isis_instance_segment_routing_srv6_msd_node_msd_max_end_pop_modify, .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", .xpath = "/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-h-encaps",
.cbs = { .cbs = {
.modify = isis_instance_segment_routing_srv6_msd_node_msd_max_h_encaps_modify, .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", .xpath = "/frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-d",
.cbs = { .cbs = {
.modify = isis_instance_segment_routing_srv6_msd_node_msd_max_end_d_modify, .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,
}, },
}, },
{ {

8
isisd/isis_nb.h
View File

@ -334,20 +334,12 @@ void cli_show_isis_srv6_locator(struct vty *vty, const struct lyd_node *dnode,
bool show_defaults); bool show_defaults);
int isis_instance_segment_routing_srv6_msd_node_msd_max_segs_left_modify( int isis_instance_segment_routing_srv6_msd_node_msd_max_segs_left_modify(
struct nb_cb_modify_args *args); 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( int isis_instance_segment_routing_srv6_msd_node_msd_max_end_pop_modify(
struct nb_cb_modify_args *args); 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( int isis_instance_segment_routing_srv6_msd_node_msd_max_h_encaps_modify(
struct nb_cb_modify_args *args); 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( int isis_instance_segment_routing_srv6_msd_node_msd_max_end_d_modify(
struct nb_cb_modify_args *args); 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, void cli_show_isis_srv6_node_msd(struct vty *vty, const struct lyd_node *dnode,
bool show_defaults); bool show_defaults);
int isis_instance_segment_routing_srv6_interface_modify( int isis_instance_segment_routing_srv6_interface_modify(

72
isisd/isis_nb_config.c
View File

@ -3583,24 +3583,6 @@ int isis_instance_segment_routing_srv6_msd_node_msd_max_segs_left_modify(
return NB_OK; 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 * 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; 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 * 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; 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 * 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; 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 * XPath: /frr-isisd:isis/instance/segment-routing-srv6/interface
*/ */