From 4578e909876db96147801c0dfed1b955c538da9f Mon Sep 17 00:00:00 2001 From: Hugo Dominois <hugo.dominois@inria.fr> Date: Tue, 1 Apr 2025 10:38:15 +0200 Subject: [PATCH] [lille][chirop] Describe DC-HdF PDUs and wattmetrev3-1 --- .../lille/clusters/chirop/nodes/chirop-1.json | 8 +- .../lille/clusters/chirop/nodes/chirop-2.json | 8 +- .../lille/clusters/chirop/nodes/chirop-3.json | 8 +- .../lille/clusters/chirop/nodes/chirop-4.json | 8 +- .../lille/clusters/chirop/nodes/chirop-5.json | 8 +- data/grid5000/sites/lille/pdus/pdu-6b-2.json | 9 -- data/grid5000/sites/lille/pdus/pdu-b3-1.json | 9 -- data/grid5000/sites/lille/pdus/pdu-b3-2.json | 9 -- data/grid5000/sites/lille/pdus/pdu-b4-1.json | 9 -- data/grid5000/sites/lille/pdus/pdu-b4-2.json | 9 -- data/grid5000/sites/lille/pdus/pdu-b5-1.json | 10 -- data/grid5000/sites/lille/pdus/pdu-b5-2.json | 10 -- data/grid5000/sites/lille/pdus/pdu-b6-1.json | 9 -- data/grid5000/sites/lille/pdus/pdu-c4-1.json | 13 +++ data/grid5000/sites/lille/pdus/pdu-c4-2.json | 13 +++ input/grid5000/sites/lille/pdus.yaml | 98 +++++++------------ 16 files changed, 79 insertions(+), 159 deletions(-) delete mode 100644 data/grid5000/sites/lille/pdus/pdu-6b-2.json delete mode 100644 data/grid5000/sites/lille/pdus/pdu-b3-1.json delete mode 100644 data/grid5000/sites/lille/pdus/pdu-b3-2.json delete mode 100644 data/grid5000/sites/lille/pdus/pdu-b4-1.json delete mode 100644 data/grid5000/sites/lille/pdus/pdu-b4-2.json delete mode 100644 data/grid5000/sites/lille/pdus/pdu-b5-1.json delete mode 100644 data/grid5000/sites/lille/pdus/pdu-b5-2.json delete mode 100644 data/grid5000/sites/lille/pdus/pdu-b6-1.json create mode 100644 data/grid5000/sites/lille/pdus/pdu-c4-1.json create mode 100644 data/grid5000/sites/lille/pdus/pdu-c4-2.json diff --git a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-1.json b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-1.json index 693bed85165..0714dd83379 100644 --- a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-1.json +++ b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-1.json @@ -266,12 +266,12 @@ }, "pdu": [ { - "port": 6, - "uid": "pdu-b5-1" + "port": 34, + "uid": "pdu-c4-1" }, { - "port": 6, - "uid": "pdu-b5-2" + "port": 34, + "uid": "pdu-c4-2" }, { "kind": "wattmetre-only", diff --git a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-2.json b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-2.json index a3d48f4f8f2..1b71705654b 100644 --- a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-2.json +++ b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-2.json @@ -266,12 +266,12 @@ }, "pdu": [ { - "port": 1, - "uid": "pdu-b4-1" + "port": 22, + "uid": "pdu-c4-1" }, { - "port": 1, - "uid": "pdu-b4-2" + "port": 22, + "uid": "pdu-c4-2" }, { "kind": "wattmetre-only", diff --git a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-3.json b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-3.json index 0201b4b552b..cdf58b0bdcf 100644 --- a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-3.json +++ b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-3.json @@ -266,12 +266,12 @@ }, "pdu": [ { - "port": 3, - "uid": "pdu-b3-1" + "port": 17, + "uid": "pdu-c4-1" }, { - "port": 3, - "uid": "pdu-b3-2" + "port": 17, + "uid": "pdu-c4-2" }, { "kind": "wattmetre-only", diff --git a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-4.json b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-4.json index ec3164b3ba2..70233f76c07 100644 --- a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-4.json +++ b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-4.json @@ -266,12 +266,12 @@ }, "pdu": [ { - "port": 7, - "uid": "pdu-b5-1" + "port": 35, + "uid": "pdu-c4-1" }, { - "port": 7, - "uid": "pdu-b5-2" + "port": 35, + "uid": "pdu-c4-2" }, { "kind": "wattmetre-only", diff --git a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-5.json b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-5.json index 28ab4f4554d..11433fbbfbe 100644 --- a/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-5.json +++ b/data/grid5000/sites/lille/clusters/chirop/nodes/chirop-5.json @@ -266,12 +266,12 @@ }, "pdu": [ { - "port": 5, - "uid": "pdu-b6-1" + "port": 40, + "uid": "pdu-c4-1" }, { - "port": 5, - "uid": "pdu-6b-2" + "port": 40, + "uid": "pdu-c4-2" }, { "kind": "wattmetre-only", diff --git a/data/grid5000/sites/lille/pdus/pdu-6b-2.json b/data/grid5000/sites/lille/pdus/pdu-6b-2.json deleted file mode 100644 index 82ee31cea90..00000000000 --- a/data/grid5000/sites/lille/pdus/pdu-6b-2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "model": "Unknown", - "ports": { - "5": "chirop-5" - }, - "type": "pdu", - "uid": "pdu-6b-2", - "vendor": "Unknown" -} \ No newline at end of file diff --git a/data/grid5000/sites/lille/pdus/pdu-b3-1.json b/data/grid5000/sites/lille/pdus/pdu-b3-1.json deleted file mode 100644 index 353dc77178f..00000000000 --- a/data/grid5000/sites/lille/pdus/pdu-b3-1.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "model": "Unknown", - "ports": { - "3": "chirop-3" - }, - "type": "pdu", - "uid": "pdu-b3-1", - "vendor": "Unknown" -} \ No newline at end of file diff --git a/data/grid5000/sites/lille/pdus/pdu-b3-2.json b/data/grid5000/sites/lille/pdus/pdu-b3-2.json deleted file mode 100644 index 5841091f9b0..00000000000 --- a/data/grid5000/sites/lille/pdus/pdu-b3-2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "model": "Unknown", - "ports": { - "3": "chirop-3" - }, - "type": "pdu", - "uid": "pdu-b3-2", - "vendor": "Unknown" -} \ No newline at end of file diff --git a/data/grid5000/sites/lille/pdus/pdu-b4-1.json b/data/grid5000/sites/lille/pdus/pdu-b4-1.json deleted file mode 100644 index 77a62888e63..00000000000 --- a/data/grid5000/sites/lille/pdus/pdu-b4-1.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "model": "Unknown", - "ports": { - "1": "chirop-2" - }, - "type": "pdu", - "uid": "pdu-b4-1", - "vendor": "Unknown" -} \ No newline at end of file diff --git a/data/grid5000/sites/lille/pdus/pdu-b4-2.json b/data/grid5000/sites/lille/pdus/pdu-b4-2.json deleted file mode 100644 index 722c5c2c548..00000000000 --- a/data/grid5000/sites/lille/pdus/pdu-b4-2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "model": "Unknown", - "ports": { - "1": "chirop-2" - }, - "type": "pdu", - "uid": "pdu-b4-2", - "vendor": "Unknown" -} \ No newline at end of file diff --git a/data/grid5000/sites/lille/pdus/pdu-b5-1.json b/data/grid5000/sites/lille/pdus/pdu-b5-1.json deleted file mode 100644 index 1c33a52cb49..00000000000 --- a/data/grid5000/sites/lille/pdus/pdu-b5-1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "model": "Unknown", - "ports": { - "6": "chirop-1", - "7": "chirop-4" - }, - "type": "pdu", - "uid": "pdu-b5-1", - "vendor": "Unknown" -} \ No newline at end of file diff --git a/data/grid5000/sites/lille/pdus/pdu-b5-2.json b/data/grid5000/sites/lille/pdus/pdu-b5-2.json deleted file mode 100644 index 9455cb948b0..00000000000 --- a/data/grid5000/sites/lille/pdus/pdu-b5-2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "model": "Unknown", - "ports": { - "6": "chirop-1", - "7": "chirop-4" - }, - "type": "pdu", - "uid": "pdu-b5-2", - "vendor": "Unknown" -} \ No newline at end of file diff --git a/data/grid5000/sites/lille/pdus/pdu-b6-1.json b/data/grid5000/sites/lille/pdus/pdu-b6-1.json deleted file mode 100644 index 69f291ed388..00000000000 --- a/data/grid5000/sites/lille/pdus/pdu-b6-1.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "model": "Unknown", - "ports": { - "5": "chirop-5" - }, - "type": "pdu", - "uid": "pdu-b6-1", - "vendor": "Unknown" -} \ No newline at end of file diff --git a/data/grid5000/sites/lille/pdus/pdu-c4-1.json b/data/grid5000/sites/lille/pdus/pdu-c4-1.json new file mode 100644 index 00000000000..9c24f1e905f --- /dev/null +++ b/data/grid5000/sites/lille/pdus/pdu-c4-1.json @@ -0,0 +1,13 @@ +{ + "model": "Unknown", + "ports": { + "17": "chirop-3", + "22": "chirop-2", + "34": "chirop-1", + "35": "chirop-4", + "40": "chirop-5" + }, + "type": "pdu", + "uid": "pdu-c4-1", + "vendor": "Unknown" +} \ No newline at end of file diff --git a/data/grid5000/sites/lille/pdus/pdu-c4-2.json b/data/grid5000/sites/lille/pdus/pdu-c4-2.json new file mode 100644 index 00000000000..86f22d77401 --- /dev/null +++ b/data/grid5000/sites/lille/pdus/pdu-c4-2.json @@ -0,0 +1,13 @@ +{ + "model": "Unknown", + "ports": { + "17": "chirop-3", + "22": "chirop-2", + "34": "chirop-1", + "35": "chirop-4", + "40": "chirop-5" + }, + "type": "pdu", + "uid": "pdu-c4-2", + "vendor": "Unknown" +} \ No newline at end of file diff --git a/input/grid5000/sites/lille/pdus.yaml b/input/grid5000/sites/lille/pdus.yaml index 59891fcb354..f9112a8b820 100644 --- a/input/grid5000/sites/lille/pdus.yaml +++ b/input/grid5000/sites/lille/pdus.yaml @@ -56,115 +56,83 @@ pdus: optional_period: 10 source: protocol: wattmetre - - pdu-b3-1: - vendor: Unknown - model: Unknown - ports: - 3: - uid: chirop-3 - wattmetre: wattmetrev3-1 - module: '04000612' - channel: 5 - phase: 3 - phase_inverted: false - pdu-b3-2: + pdu-c4-1: vendor: Unknown model: Unknown ports: - 3: + 17: uid: chirop-3 wattmetre: wattmetrev3-1 module: '04000612' - channel: 6 + channel: 5 phase: 3 phase_inverted: false - - - pdu-b4-1: - vendor: Unknown - model: Unknown - ports: - 1: + 22: uid: chirop-2 wattmetre: wattmetrev3-1 module: '04000609' channel: 3 phase: 1 phase_inverted: false - - pdu-b4-2: - vendor: Unknown - model: Unknown - ports: - 1: - uid: chirop-2 - wattmetre: wattmetrev3-1 - module: '04000609' - channel: 4 - phase: 1 - phase_inverted: false - - pdu-b5-1: - vendor: Unknown - model: Unknown - ports: - 6: + 34: uid: chirop-1 wattmetre: wattmetrev3-1 module: '04000609' channel: 1 phase: 2 phase_inverted: false - 7: + 35: uid: chirop-4 wattmetre: wattmetrev3-1 module: '04000612' channel: 3 phase: 2 phase_inverted: false - - - pdu-b5-2: + 40: + uid: chirop-5 + wattmetre: wattmetrev3-1 + module: '04000612' + channel: 1 + phase: 3 + phase_inverted: false + + pdu-c4-2: vendor: Unknown model: Unknown ports: - 6: + 17: + uid: chirop-3 + wattmetre: wattmetrev3-1 + module: '04000612' + channel: 6 + phase: 3 + phase_inverted: false + 22: + uid: chirop-2 + wattmetre: wattmetrev3-1 + module: '04000609' + channel: 4 + phase: 1 + phase_inverted: false + 34: uid: chirop-1 wattmetre: wattmetrev3-1 module: '04000609' channel: 2 phase: 2 phase_inverted: false - 7: + 35: uid: chirop-4 wattmetre: wattmetrev3-1 module: '04000612' channel: 4 phase: 2 phase_inverted: false - - pdu-b6-1: - vendor: Unknown - model: Unknown - ports: - 5: - uid: chirop-5 - wattmetre: wattmetrev3-1 - module: '04000612' - channel: 1 - phase: 3 - phase_inverted: false - - pdu-6b-2: - vendor: Unknown - model: Unknown - ports: - 5: + 40: uid: chirop-5 wattmetre: wattmetrev3-1 module: '04000612' channel: 2 - phase: 3 + phase: 2 phase_inverted: false -- GitLab