From 98c64530de6726deda6fc9628525c4c6b3146dda Mon Sep 17 00:00:00 2001
From: Jean-Camille Seck <jean-camille.seck@inria.fr>
Date: Tue, 5 Nov 2024 11:30:30 +0100
Subject: [PATCH] [wattmetre] Correct the port incrementation generated by
input_loader.rb
---
data/grid5000/sites/lyon/pdus/wattmetrev3-1.json | 2 +-
.../sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json | 2 +-
.../sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json | 2 +-
data/grid5000/sites/rennes/pdus/wattmetrev3-1.json | 4 ++--
lib/refrepo/input_loader.rb | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/data/grid5000/sites/lyon/pdus/wattmetrev3-1.json b/data/grid5000/sites/lyon/pdus/wattmetrev3-1.json
index 31326337595..958c59454ea 100644
--- a/data/grid5000/sites/lyon/pdus/wattmetrev3-1.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetrev3-1.json
@@ -33,7 +33,7 @@
"25": "sagittaire-3",
"26": "sagittaire-4",
"27": "sagittaire-5",
- "28": "sagittaire-7",
+ "29": "sagittaire-7",
"3": "gemini-1",
"30": "gemini-2",
"31": "gemini-2",
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json
index 9e243f1e598..8a988fd336a 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-31.json
@@ -205,7 +205,7 @@
},
{
"kind": "wattmetre-only",
- "port": 0,
+ "port": 4,
"uid": "wattmetrev3-1"
}
],
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json
index fc8ace67b96..41f09988b5f 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-32.json
@@ -205,7 +205,7 @@
},
{
"kind": "wattmetre-only",
- "port": 1,
+ "port": 5,
"uid": "wattmetrev3-1"
}
],
diff --git a/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json b/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json
index 2688f8b743a..e4692980e7d 100644
--- a/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json
+++ b/data/grid5000/sites/rennes/pdus/wattmetrev3-1.json
@@ -14,8 +14,6 @@
],
"model": "v3",
"ports": {
- "0": "paradoxe-31",
- "1": "paradoxe-32",
"10": "paradoxe-5",
"11": "paradoxe-6",
"12": "paradoxe-25",
@@ -42,6 +40,8 @@
"33": "paradoxe-16",
"34": "paradoxe-17",
"35": "paradoxe-18",
+ "4": "paradoxe-31",
+ "5": "paradoxe-32",
"6": "paradoxe-1",
"7": "paradoxe-2",
"8": "paradoxe-3",
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 59017b0419a..e5725d736aa 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -168,10 +168,10 @@ def add_wattmetre_mapping(h)
# Wattmetre ports are numbered by modules serial, then by channels inside module
wattmetre_modules.sort.each_with_index do |m, module_idx|
channels = m[1]
- channels.sort.sort.each_with_index do |c, chan_idx|
+ channels.sort.sort.each_with_index do |c, _chan_idx|
node_uid = c[1]
# Each module has 6 channels
- port_num = module_idx*6 + chan_idx
+ port_num = module_idx*6 + c[0]-1
pdu["ports"] ||= {}
if pdu['ports'].key?(port_num)
--
GitLab