Merge pull request #17301 from FRRouting/mergify/bp/stable/10.1/pr-17250

isisd: fix change flex-algorithm number from uint32 to uint8 (backport #17250)
FRRouting · Oct 31, 2024 · 06ced04 · 06ced04
2 parents ecaada1 + e61379f
commit 06ced04
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -2630,14 +2630,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
@@ -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