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 693bed85165a4ebf0a06082be8148d9e2b2a4990..0714dd83379505e63274ca763655eb0d1ed1b1f4 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 a3d48f4f8f27a6cacb88185f8fdde37723cbec44..1b71705654b9e209da744495df2703489064c86e 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 0201b4b552b22f02aa8ad6ad6e40f3a0be3b86db..cdf58b0bdcf7eab840f1a3995eba5b44f45c418e 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 ec3164b3ba254ce90635402f20975c6850bee057..70233f76c074089ce694f688f2101d343434234e 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 28ab4f4554d79202e7db73b544eab66dc45b930c..11433fbbfbe47f6cdc1d35916b091ca89090a78b 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 82ee31cea902a7b2c45fe4b6d33cd53b0ff4f411..0000000000000000000000000000000000000000
--- 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 353dc77178fb020b915eb8262d9d5f373fbde3ad..0000000000000000000000000000000000000000
--- 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 5841091f9b078344fd02fd195417c80196bf4eea..0000000000000000000000000000000000000000
--- 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 77a62888e63af1add61054284a916ca6ba29ebf6..0000000000000000000000000000000000000000
--- 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 722c5c2c5484d314e16c2eb052242f76e99ca19c..0000000000000000000000000000000000000000
--- 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 1c33a52cb493ca3ec7d600cdd1fbdb50500ae420..0000000000000000000000000000000000000000
--- 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 9455cb948b070d60bc56e3e477a277b774af34c7..0000000000000000000000000000000000000000
--- 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 69f291ed3881f3cc6dbe7e364801aafdca3cd570..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..9c24f1e905ffcf345a1d11ae63f5e7e6a506fb94
--- /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 0000000000000000000000000000000000000000..86f22d774010b1f54e3d5f5d67e966797913a34e
--- /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 59891fcb35486175e1ec49762f66422433aacbc4..f9112a8b820e4857c029ebd24338f37aec474860 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