slurmctld - sort resv licenses appended to node_space table licenses

Sort the appended licenses from the advanced license reservations such that
they come after the non-resv licenses, sorted by resv_id and lic_id.

This is in preparation for the following commit.

Ticket: 24594

Author: MeganD101

src/plugins/sched/backfill/backfill.c

@@ -2251,9 +2251,24 @@ static void _attempt_backfill(void)
 		node_space_handler.node_space = node_space;
 		node_space_handler.node_space_recs = &node_space_recs;
 
-		if (bf_licenses)
+		if (bf_licenses) {
+			int cluster_list_count = cluster_license_count();
+
 			list_for_each(resv_list, _bf_reserve_resv_licenses,
 				      &node_space_handler);
+			j = 0;
+			while (cluster_list_count) {
+				/* if 2+ resv license was added sort the list */
+				if (list_count(node_space[j].licenses) >
+				    (cluster_list_count + 1)) {
+					list_sort(node_space[j].licenses,
+						  bf_license_cmp);
+				}
+
+				if ((j = node_space[j].next) == 0)
+					break;
+			}
+		}
 
 		list_for_each(job_list, _bf_reserve_running,
 			      &node_space_handler);

src/slurmctld/licenses.c

@@ -3155,3 +3155,24 @@ extern bool slurm_bf_licenses_equal(bf_licenses_t *a, bf_licenses_t *b)
 		return false;
 	return !(list_find_first_ro(a, _bf_licenses_find_difference, b));
 }
+
+/* sort appended resv bf_licenses to be in order of resv id and license id */
+extern int bf_license_cmp(void *x, void *y)
+{
+	bf_license_t *entry_a = *(bf_license_t **) x;
+	bf_license_t *entry_b = *(bf_license_t **) y;
+	int resv_cmp_rc;
+
+	if (!entry_a->resv_ptr && !entry_b->resv_ptr)
+		return 0; /* keep these in cluster_license_list order */
+	if (!entry_a->resv_ptr && entry_b->resv_ptr)
+		return -1;
+	if (entry_a->resv_ptr && !entry_b->resv_ptr)
+		return 1;
+	if ((resv_cmp_rc =
+		     slurm_sort_uint32_list_asc(&entry_a->resv_ptr->resv_id,
+						&entry_b->resv_ptr->resv_id)))
+		return resv_cmp_rc;
+	return slurm_sort_uint16_list_asc(&entry_a->id.lic_id,
+					  &entry_b->id.lic_id);
+}

src/slurmctld/licenses.h

@@ -314,6 +314,8 @@ extern void license_set_job_tres_cnt(list_t *license_list,
 
 extern bf_licenses_t *bf_licenses_initial(bool bf_running_job_reserve);
 
+extern int bf_license_cmp(void *x, void *y);
+
 extern char *bf_licenses_to_string(bf_licenses_t *licenses_list);
 
 /*