From 35ba600a6fa22bf534384fcf2e9882267647f5ac Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Mon, 21 Aug 2023 12:14:15 +0200
Subject: [PATCH] Revert "[refrepo][oarproperties] Do not try to do an addition
if next_id is 'NO'"
This reverts commit 268414ce72d750060d5ea417190a58a2966f59fa.
See https://intranet.grid5000.fr/bugzilla/show_bug.cgi?id=14813
---
lib/refrepo/gen/oar-properties.rb | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index e6478f16c2d..86bf28b7d30 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -1204,7 +1204,6 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
phys_rsc_map.each do |physical_resource, variables|
# if it's a new cluster, or the cluster doesn't have resource ids for this kind of resources
if is_a_new_cluster or cluster_resources.map{|r| r[physical_resource]}.select{|x| not x.nil?}.empty?
- next if next_rsc_ids[physical_resource] == 'NO'
variables[:current_ids] = [*next_rsc_ids[physical_resource]+1..next_rsc_ids[physical_resource]+variables[:per_cluster_count]]
next_rsc_ids[physical_resource] = variables[:per_server_count] > 0 ? variables[:current_ids].max : next_rsc_ids[physical_resource]
else
--
GitLab