diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2024-10-31 15:17:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-31 15:17:02 +0200 |
| commit | c8341f265f7bfcfd1d5011fe6eab40f2e8c6501f (patch) | |
| tree | fabf824385ade377f3813b8aa8a3cd2fdf2351e4 | |
| parent | 4e23ebed1e83f8d8d1cddaa2bac9296ac361ce59 (diff) | |
| parent | 909e6dd6218eeda2ebb2a09e8be775c995a1bfab (diff) | |
Merge pull request #17300 from FRRouting/mergify/bp/dev/10.2/pr-17250
isisd: fix change flex-algorithm number from uint32 to uint8 (backport #17250)
| -rw-r--r-- | isisd/isis_cli.c | 4 | ||||
| -rw-r--r-- | isisd/isis_nb_config.c | 4 | ||||
| -rw-r--r-- | yang/frr-isisd.yang | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/isisd/isis_cli.c b/isisd/isis_cli.c index e6cc794bae..93f7bbf753 100644 --- a/isisd/isis_cli.c +++ b/isisd/isis_cli.c @@ -2015,12 +2015,12 @@ void cli_show_isis_prefix_sid_algorithm(struct vty *vty, const char *sid_value_type; const char *sid_value; bool n_flag_clear; - uint32_t algorithm; + uint8_t algorithm; prefix = yang_dnode_get_string(dnode, "prefix"); sid_value_type = yang_dnode_get_string(dnode, "sid-value-type"); sid_value = yang_dnode_get_string(dnode, "sid-value"); - algorithm = yang_dnode_get_uint32(dnode, "algo"); + algorithm = yang_dnode_get_uint8(dnode, "algo"); lh_behavior = yang_dnode_get_string(dnode, "last-hop-behavior"); n_flag_clear = yang_dnode_get_bool(dnode, "n-flag-clear"); diff --git a/isisd/isis_nb_config.c b/isisd/isis_nb_config.c index 0f0c900ec2..fb391534e2 100644 --- a/isisd/isis_nb_config.c +++ b/isisd/isis_nb_config.c @@ -2633,14 +2633,14 @@ int isis_instance_segment_routing_algorithm_prefix_sid_create( struct isis_area *area; struct prefix prefix; struct sr_prefix_cfg *pcfg; - uint32_t algorithm; + uint8_t algorithm; if (args->event != NB_EV_APPLY) return NB_OK; area = nb_running_get_entry(args->dnode, NULL, true); yang_dnode_get_prefix(&prefix, args->dnode, "prefix"); - algorithm = yang_dnode_get_uint32(args->dnode, "algo"); + algorithm = yang_dnode_get_uint8(args->dnode, "algo"); pcfg = isis_sr_cfg_prefix_add(area, &prefix, algorithm); pcfg->algorithm = algorithm; diff --git a/yang/frr-isisd.yang b/yang/frr-isisd.yang index 60914b0be9..a3e073f626 100644 --- a/yang/frr-isisd.yang +++ b/yang/frr-isisd.yang @@ -1922,7 +1922,7 @@ module frr-isisd { if set to disable, ISISEXPLICITNULLFlag will override the value of ISISPHPFlag"; leaf algo { - type uint32 { + type uint8 { range "128..255"; } description |