diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json
index 50b756d2ea2580d26c3b59c4942437536e998f3c..17540bf7cada7617cefe29cdab3518b22f1927dc 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json
@@ -205,8 +205,8 @@
             "uid": "gros-wattmetre1"
           },
           {
-            "port": 42,
-            "uid": "gros-pdu1"
+            "port": 1,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json
index f94b688bf45180a92d42384d4a12a45a0b3653b6..398668dbfd91f3d7f414f8a846d6c45d701d7353 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 9,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 6,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json
index aff72cb60e441d51b67707fd21f38fddc9dfc59c..fc2baa0e7d3c31c9ad0440d9895987217dabda0b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 29,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 14,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json
index 0e064dd84e1d620c430086ab1eb308b3f4a1f5ba..f0bc2645f7fd5e9068330cfb7eb36ea84faac9a4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 18,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 14,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json
index 0b830983d63a7227ef9a42c194430dca875dc7a1..7f6a531685c1f1ce2e541bad7c6bbae61f7cf6a3 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 19,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 15,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json
index 4136847267d03ef34b688491fc52d8483f66b9ef..1ea4e49dee1d8b9c77d54a93deb3aa6af4bcb27a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 20,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 17,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json
index 5bde15757bfa942e6f0123781d312a8b6d507699..9b63967e5d70ec172cd38d92b6b6ecf684d7d95e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 21,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 15,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json
index 93e0c60303e669d0955d2beff9dcdd031f9cf7df..c5491381b379238ba8d0d1aa71e8166306fdc3cf 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 22,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 17,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json
index de1caf5c6b7d01a2ccd7c6289721706594578ae8..2191255e4970b80b5ce7432e7ea9a25aaf7843ea 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 23,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 18,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json
index b4ad8d1c5993cbaf60b777469e26ae3be3bb47b6..f9600bff46d1b2b62d1918c06dacb58d97299aa9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 12,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 19,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json
index 88715b3fffe86f481cc806647999e01cabc68040..21df19d9afff407f5af165c73510262ba4b72107 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 13,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 18,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json
index 398c130d8483fea78cdf6674204bad5e86c76760..aa0748562f25a992efa6860fdef384b7b9a683e0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 14,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 20,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json
index 898f9424bbfe7c85c4467112f9543f5c3f55b472..6062ec4cf628cf3d916f8c159cba4a290bc6dbb5 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 10,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 6,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json
index 6c689a11880e03c836ed2587b1da9a38e7ce891c..121b96d517bc7b18329b04d56f5bcf8f4128e68f 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 15,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 19,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json
index 35bad25f9163b6945a1b5ff33978b979e53a5306..55261ff1877f506c7a4f6ac654c9bc05b7e5cae9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 16,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 20,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json
index 4bac081cdf4555c71b6e1873eafe174841b8f85c..37fecc27dd566ccbf9f07a9b65030c08f3f26f6b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 17,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 21,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json
index 8b220266e13c1b6df4db673b10d9113535eeb302..cf10fc54aef26e6d467eed019d17cd8e49aafe38 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 0,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 22,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json
index 1ba6764233bfd1408db960185937f772e932a422..e9aeae67a6bec46e65060a7571c6c37e084ca228 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 1,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 21,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json
index 2a69898148fbc91d1349ca84b0383b52d2f17c2f..4ee52b3d79ef831490e37c15e4ac74f6d1aba690 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 2,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 23,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json
index 7df5eeacec1fc643959fb5d367276ffa4007940c..bb4201f8129d44d90ce9a40731bf27cfd6b87692 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 3,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 22,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json
index 2f51af1bc71e51255d938ff6f5937f14907124c5..94dff3a5398cc7fd64e4bf9be7bdbf7edd226fbb 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 6,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 13,
+            "uid": "gros-pdu8"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json
index 458c912280a21ae8651f64c113fde2f668a87d47..cc3236b8304ff9d576d84f5b64a538c5ca056cfa 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 7,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 17,
+            "uid": "gros-pdu8"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json
index e8c1e8af360ca015aea289ff04c34d6a444d0560..0bbbf618f16d4faa98e90dbd562d79f52ebdeb99 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 8,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 18,
+            "uid": "gros-pdu8"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json
index eb71bb3167fe22057c257b54b630ac01887f67fe..559da1141232fe4d9497980d88926c1475602b4a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 11,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 7,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json
index d070fe9251870dc79782e0fceaedc604ad26b8d0..bcc53769d83332238f7c6a8dd892a68341ccd90a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 9,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 19,
+            "uid": "gros-pdu8"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json
index 30b2db33c884b1bc09a77408a2853e0afb1193f9..fe0fb926775608957fa82c6f516abdbe1a151464 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 10,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 20,
+            "uid": "gros-pdu8"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json
index bf850d5eca33bffff706476505ec51df293c6419..8525a08672683d4d50789c1c587ab19b8481b62b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 11,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 21,
+            "uid": "gros-pdu8"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json
index 7308f58d783337f9a9169267f485f3e48a87d84a..b91baeab20751807c402cfe1fadae1c30ccd3d31 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 4,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 22,
+            "uid": "gros-pdu8"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json
index a53cc25bde224bf0e76f61fefd1c7478fd1b0421..58685845376b43c9d69d47523748c2a18f8bacb8 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 5,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 23,
+            "uid": "gros-pdu8"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json
index 7e1c3d2a7f4553e6bfc98725adadc57bd1d8c17f..197320b679a89bebdea45666e68ccc061107c476 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 12,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 7,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json
index 578739d8c146a8624fcd1063fa90f24d987a8055..22d3a6a1501e1b76226b8f78bc6fe646c852dff6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 13,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 9,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json
index 53412c397504cd30f5646c41a8fbb10bffb55463..0046f1b8802606f811b46438c60a6a4a5e024624 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 14,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 10,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json
index 8653b282f4aa7a3f5f7ea9ba0e306a39201e786c..58cc3ecca1492b7e4b569fb2c4a115f2b3dccc23 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 15,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 9,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json
index 7c7cf23ef0ea9b05f6cbc5520e7b33392fb36923..2fd7602084a8da5b47c9f669c14b466ecd9e5200 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 16,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 10,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json
index e2aab85b9366ee7eca263acf9f3be8e940b606a6..5c4d7040b2cc7f872ddda09454e702a0e1826104 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 17,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 11,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json
index 376bafec3201154a785b4ac091880416d56f9e6b..94fde0db8f7cf9994eb0047179d862cb17ed0eea 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 18,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 11,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json
index 1aa2ef7caefa75c421440b8c06b905005b018815..6ac33e7fcd38db71e69004d44dbbfd75cd5b1374 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 1,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 1,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json
index e008451e11b0a61ef16bde63dad6630e02f7cca1..6953728f73844e4dfc40af596d99b33ab0980a23 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 19,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 12,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json
index a5b7be58438de9eac1f97f876b238c2cb59700fe..a82371af10420486e363b9ce9a94d9cc9bd8a9e1 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 20,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 12,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json
index 68db992b6842e9f7b5cb4f89d874aa81fd7cdb34..f284fc23016fd2baac8c0a6b6f2f01250a2297f8 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 21,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 13,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json
index 4adff860f66e2d1e214035cc00e6bb6a58c99648..b10645de592a62d7218d3501a362e5ab24d9924f 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 22,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 14,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json
index 49ecd5c0e1fd14bc89139591616eb82d687c7df8..9400ae067a0a3eba0973f79d52396bddb951db1d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 23,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 13,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json
index 3788fed9a74657b6b74cc331185ac12efea6cd9b..c35780d2f62cc98d37d576c32e10d6afaa30a744 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 24,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 14,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json
index 6680055752dd0ff028d4696cc52b025623b65686..fc4a24b6d8b070ce87720efa2fd5f3f300bb341d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 25,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 15,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json
index 73766ad1a80ec699302a8527051490cd460c6eb2..b7711f3202583f18d7a5a2a9064c739311211f69 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 26,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 15,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json
index 3ebbd4340bd7fc02dc1ac75a2041051019ca3245..3f1d8cd7c66fa663cafb66fc59992599ceede8a4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 27,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 17,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json
index 28059767a006cd0c4005fe78a6dbb241404c58a5..2998ea3e44710ee5f8e2b95db6745d7dd2916021 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 28,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 17,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json
index 98071c413236f4805d6d7c7cfc2de6c60df5908a..d67bc9c68f8b0377acda41bcf512609681078d3a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 2,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 2,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json
index cf78de551cbfec60d562a5f3e8628719cd441b16..7f88fe6769ed019a5baa357c9b5de9b6fec030ac 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 29,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 18,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json
index db3c70154487b63f522a8bc2caa6baecb2026d5d..8ef609f20878c00b5bc97f78b81ee0c2d668ef18 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 30,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 18,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json
index 29135ec404f036b0b9e8c341d0f17e8693ee1e0a..55292c0c695ce435fd4b132c9f5433bf6f3aee53 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 31,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 19,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json
index 5d8979168480d52966eb3ac8d30025c862221270..377c322a8adabec94faf220058fc922f8f2d99df 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 32,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 19,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json
index 0e84fa955ee5d8d646df94eba59e7c88e52ebc5c..226fa8240d4c1ccfb667dbb9b51f14398953b1a8 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 33,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 20,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json
index ff0ca889f0fcc3080dba9da687c3a09a7b962873..9acfc3e7b1b7b46257b4baa6993c2cc16872529a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 34,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 21,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json
index 660d39bb1dd2fa9aefe8ab922918906c9a6c0763..a5f71b15be83ad21a95d2f2868c95b99543a05fd 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 35,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 20,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json
index e38ce113f9f34c1bdaf40284e97d247005c7d427..6e78f9283256a3ca83de22e39f3ede739643b6c6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 36,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 22,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json
index e7409c4afe0c12d73f8f54f77cf3b1eaefcd22ca..d9c38817e2bf4d881971e25916f37cede342c9b9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 37,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 21,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json
index 6819dcc618dd532d9c1a495b7b1d58f3d106f1b9..690da92d7dd681cdd564295155377fbd6ec27361 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 38,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 23,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json
index afc2759b335cbf186b2dd35146ff3f223a43a7d3..552fe95803092ac0616116a51f27f90eb1471827 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 3,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 3,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json
index 68a5a7f0926f33615c3461e5ca7620a1243a71ae..0cb450ea967d5653506bbe09ed1d7687da333d20 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 39,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 23,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json
index f1ac7561156b65d906e3205f9a3c22c7eebb306c..32391496355d4b63ae727c631ec2f47c914d1bc9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 30,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 1,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json
index 89f9c8c8c1d3e6c4b135386423803d616b4235aa..fa4871568c167998965435e34afe0772472ae6f0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 31,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 2,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json
index dc27f8e3400891a2189fae91d198226e304da6f3..77913b2465f53235980df0adbf450d18b0681571 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 32,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 1,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json
index a5960f18049883a17bcd9bb9f7f91775622e492f..a3e01342c8ba08deb796af12606a9ff7617b2d42 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 33,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 3,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json
index edf9abc45bd5bf6dece3b042176cb324e18fbda6..d2ec4c5c2c23c5f4c88964673a6f03259d8f88e2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 34,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 4,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json
index 09dcd75d56480270185d98007da77d74b3ad49c1..1f0f246dbc86fa71c6c407f605cb2e78a1c89e42 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 35,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 2,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json
index b2a5aad4507b6fadff71a9e4696a5625a4dee50f..df2a9c0a73c8fb9197bd625244ec40b232116c80 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 24,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 5,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json
index f62fb5163ebc5224eca4edd7b8b25c71961a2573..1e085d86fe05a0ac60c2b62ddaba850e1bab3ba1 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 25,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 4,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json
index b86a9d5bc950973e4ab5c8ba8ade61a2dac79593..985b977be1e67711efeb45ace8b69e93c69b6092 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 26,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 6,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json
index 41628744b42b8a22085d3eda7d0e3ad75ceabe17..434745c9f36cc666ff08f8cfc1a22428730e5c9e 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 4,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 3,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json
index 893e1abb252d88b46a4b29d3efb971f8223f0c1d..a6ff125e7028e3cd955f4fd90efb1ea6ed3ed001 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 27,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 7,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json
index 6bbc3867c100eafb6e6b5116597ee3c76d856d4f..14993311895609338a61692cfa50ae244c7fc713 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 28,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 5,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json
index 1e82230468f457a3b371ec8267cd6bd1118cf2b6..f8f5a7d38a8b14257b06077eac91c1bcb178e90d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 29,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 7,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json
index 86662879406a2698897eeb280984b84866ede95b..b417b5111c228b79eda7587b35a99de88f472f36 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 18,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 6,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json
index ba0a78d309b06e8d5b26f7009228242da2672551..8e9d58a6451ee10c82f228284083b80b4d165511 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 19,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 9,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json
index 14b41f53f49f15a2fc5cfc385d1e15321e973677..8551c2ad2b06de6195f30d98053386caaaa0da1a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 20,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 10,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json
index f7159155c609ad09c2b22a26336c7ae480208987..24f95a166810af685de34f9e1aa5bd8140286755 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 21,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 9,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json
index b0152c353c87ae52de9ba98c14cd8f467c086eba..028516b6ab121bdd63c3c22169eaf29b928a45f6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 22,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 10,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json
index ac00f4393e9f0b8c3730eab64298155adb659457..07d0bf01d51ec371840f88d6d27324ea223278ed 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 23,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 11,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json
index 285133820d224aff4553f6d7335db01f351ed373..c819187f8e0d61c0306af9e42806273f3abdbeac 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 12,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 11,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json
index a52e19eb80ef9c3e8c96c00f50be3fa482ef0b98..2272a80a8b9c48b2e8e59a7ef9977db4ddf4e446 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 5,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 4,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json
index 7741aea5ef68c08aa990da4c6cc48fdc96ae95cb..0e6c28e84d9b093055c7bf14fcdb2d171328e23c 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 13,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 12,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json
index cdfa0e1cf130c3b8498920af1c053df5517101b9..7e82565a7c72a460946d44c6e99dfa23f198628b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 14,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 15,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json
index 569aa0739764d5c0b9dbab805d2bcb2a9e6fcb24..2ebaae2c77a848ea7bf0b92835a4ba93d3c29ec7 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 15,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 14,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json
index be9f75f2916f9f5998e26f22aa095aa4b5bf948c..979fea2fb01a96fbb67f2797444f8c8958c3543d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 16,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 15,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json
index b538982aedd64a97b72587ca8a4b439f72061c76..608dc460aeae7128d68235dded454de1392a396b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 17,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 17,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json
index ca72a0533464fd64192bf50ec33203b16c144f01..e4acb7d71632d546e74172963162cac815a8e134 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 6,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 18,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json
index fcd864feb86490d7e92f4a803a18cb70eecc4cd2..beb023f63eba882a37206f7cdb2f7bb36509c2d4 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 7,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 17,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json
index faa39879da607faf4af93ac1f1f5e36f84774c6f..f888435d6ee6be34d641c9d17a1b150fbf6e23db 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 8,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 19,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json
index a046f23d5d05f6e391ce326107e2896d8797d778..296e61f29373432ff838901c7eff5cf2a7ff1cc6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 9,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 18,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json
index fc1656c77c538a58c3d623b2f0ddf07e494fdabf..0df748e9f228c5c622c0081e3fb0d8a5e342abd9 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 10,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 20,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json
index cfc83e0757bfd6e938c460e49f0575780015e743..1b6bfeee0f00beab080f52ecffa1a86b5b26c9d6 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 6,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 4,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json
index 0550cb9f9168d1873a9f0b82a56847c7f8d81677..c1577951cca03f797457864a6ba504bc7608cc65 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 11,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 19,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json
index 7af88b10d3d46bd5d550bae55bf4b3bf4b94c369..e37ebd90af76e927f3cdaa504da93924af123bd0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 0,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 21,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json
index a21b8d096d7719c717f64ff1c65346417403aee6..3341ec8aac0f07e4cfa615ebc510501af6b5bfb1 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 1,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 20,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json
index ff03740d47241853ed96013e78ddaade631a776b..cc65f468ed898f27f6c934f614884ae2d775566b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 2,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 23,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json
index eb858251f75f30b4eb2587643a1b214b05b16104..444a64f023eeeeedc875bad35cddb0e21e8bd791 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 3,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 21,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json
index 131209aaa4ad6328d3a4fa76188696127ff7b3ae..619bc1539105c7a8849ba76eaee74fc7f2203200 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 4,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 22,
+            "uid": "gros-pdu4"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json
index b4eb41ec92eebfb191d78cfa4f71d12121284b98..4faef972777da52688c0718edd5d2c23fedf7050 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 5,
             "uid": "gros-wattmetre2"
+          },
+          {
+            "port": 22,
+            "uid": "gros-pdu3"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json
index 24cd7abd24d63833c187c9b40d7bedbbb40f8437..4cbdd2bf7a421645492aa3963fe4c5dd2bc0324b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 42,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 1,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json
index 18256dc4d2a6d50ba7f993f24ed4a6ba84b3966e..5aa07f2351933f1bd4fa5a2c202bd2c7884cfe26 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 43,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 2,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json
index 867b219b6e0b1739fce319260bba6577c49d9aae..58f8f19c615077a49650588c3f579262915f02f3 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 44,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 3,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json
index 45229d61167aaac456471f854ec13d134fedeb4b..7f25cddf6bc9e79ad0ee354850f304e7116f9366 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 7,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 5,
+            "uid": "gros-pdu1"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json
index 1a34c9b4001d73469bdcfa7ba5be93b3159ad91d..a551b405b838dfb05f0e8b10aa39f299e750562c 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 45,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 1,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json
index 9f1c6fbb815ee373cfc18e1ce577a62524fa601c..b273cf417066d9db520f5702b5dff4bb01485b4b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 46,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 4,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json
index 8ca3605fa437b92d0b91210e8b1304b3f0c559ea..b94948efdc2c5d5336f4df5727e587bc4d9a8e9b 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 47,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 2,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json
index 506f4392fb529314bc947c23a96e40256f660063..7b377f4341515d08ea5df45c384bc48889e94088 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 36,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 5,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json
index 7d5522a3ff6eb56fdd86d735e2f5ce2b29f72625..db98dd43c1d2264c67802abea39bbe5c0e8ad772 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 37,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 3,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json
index c7eeb160c6979c4a971c96367dbcd5f96099d4c1..5945ef7facf3a51ef0ab6915e9b4b77c3b4aec7d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 38,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 6,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json
index e5d720192a8e14a0066c641667a2571a4e6c5529..cf3bc3deb642deeadf87f2b3e7a6fcef4b2dea39 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 39,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 4,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json
index 2decc8e8b7b9dae5b3aec6e3f910b3f336d1f06c..5c33c3cfaa91462a21c2c90e665c6e0417fc956d 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 40,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 5,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json
index 925e25572bd2b78e186989e69e692c4492560d36..032aa419a67ec6307ea11f065f3329ebf4ed6d97 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 41,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 7,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json
index 645b8bc2900db4e1cfe1e784e5a912dee8696c65..ed4631ad4282a89e8341e90fd042f0f2c6209714 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 30,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 6,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json
index 9dd1785b62390db4c2615a923a16003489f9ef47..8f4a20d22c8381f2f46f320002c440d2a1c9dab0 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 8,
             "uid": "gros-wattmetre1"
+          },
+          {
+            "port": 5,
+            "uid": "gros-pdu2"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json
index d1f7b9f8951c3e55b53f7b247807c1feb08e01b6..9f3ebb42793de6bb690b1395f32e144d9eea78ba 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 31,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 10,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json
index 3c116a2bffc18e9e1ab7fe128ae6e9a9e0fc12f9..d0b0672c211eecebb8b917c57208d43602dec545 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 32,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 7,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json
index 50e6985ea5a6561ec5ef443e0a15993f9196fdd0..61f1bdafd4c7f11004b39638579ad4f469164150 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 33,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 9,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json
index f47c7f5aa6e8d332c33f3f42e2c2186cdfb13b51..3516c6da32fe98ef1fe2a87e46add65c50140a54 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 34,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 10,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json
index e37a1c0ad978cbfaeb58358f17db0aa2d78b7407..bb7978cba8fbba5eae01db036f68b44772918e93 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 35,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 9,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json
index 42b7e4e09309be5df44d5ee64a4ccb7cf7d4d444..3b631152fa8c59d8ec3e3254d9e39f8e0fa9d3e2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 24,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 11,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json
index 3ae1f05184ceabb4fca70840a52eadbd07b94e2e..7809a162a506b0904cdc2915d96bb2b144903a63 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 25,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 12,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json
index 74711d3972edf8541b3694b0afbbbb6a590d39ea..1d615d2176c96ecaa995d8c7ee830eb212db478a 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 26,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 12,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json
index d46059f61020d0ae536525aa06b0c8c6ad2b854f..269cd1519276c4050c2c31c4d870739fe7c1edc3 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 27,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 13,
+            "uid": "gros-pdu6"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json
index d69ba8df66f494f16b7e01881170c1de0b9e9670..eb02fc22eaa41b1cd56f46c7d23e3837e72f6ecd 100644
--- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json
+++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json
@@ -200,8 +200,13 @@
         },
         "pdu": [
           {
+            "kind": "wattmetre-only",
             "port": 28,
             "uid": "gros-wattmetre3"
+          },
+          {
+            "port": 13,
+            "uid": "gros-pdu5"
           }
         ],
         "www": {
diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu1.json b/data/grid5000/sites/nancy/pdus/gros-pdu1.json
index 33436b3a30464dbc566abd0f9d8d3a4f16794710..3fe7d6d70950219506e5b95712b1b4bb448804be 100644
--- a/data/grid5000/sites/nancy/pdus/gros-pdu1.json
+++ b/data/grid5000/sites/nancy/pdus/gros-pdu1.json
@@ -14,7 +14,26 @@
   ],
   "model": "AP8653",
   "ports": {
-    "42": "gros-1"
+    "1": "gros-2",
+    "10": "gros-15",
+    "11": "gros-18",
+    "12": "gros-20",
+    "13": "gros-22",
+    "14": "gros-23",
+    "15": "gros-26",
+    "17": "gros-29",
+    "18": "gros-31",
+    "19": "gros-32",
+    "20": "gros-34",
+    "21": "gros-35",
+    "22": "gros-37",
+    "23": "gros-39",
+    "3": "gros-4",
+    "4": "gros-6",
+    "5": "gros-8",
+    "6": "gros-10",
+    "7": "gros-12",
+    "9": "gros-14"
   },
   "sensors": [
     {
diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu2.json b/data/grid5000/sites/nancy/pdus/gros-pdu2.json
index 134ab0c6281135c9d0ae4c87576494651fd04c58..16d5d8acef696c77a563e0b1352157e00143cafd 100644
--- a/data/grid5000/sites/nancy/pdus/gros-pdu2.json
+++ b/data/grid5000/sites/nancy/pdus/gros-pdu2.json
@@ -14,6 +14,26 @@
   ],
   "model": "AP8653",
   "ports": {
+    "1": "gros-1",
+    "10": "gros-17",
+    "11": "gros-19",
+    "12": "gros-21",
+    "13": "gros-24",
+    "14": "gros-25",
+    "15": "gros-27",
+    "17": "gros-28",
+    "18": "gros-30",
+    "19": "gros-33",
+    "2": "gros-3",
+    "20": "gros-36",
+    "21": "gros-38",
+    "23": "gros-40",
+    "3": "gros-5",
+    "4": "gros-7",
+    "5": "gros-9",
+    "6": "gros-11",
+    "7": "gros-13",
+    "9": "gros-16"
   },
   "sensors": [
     {
diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu3.json b/data/grid5000/sites/nancy/pdus/gros-pdu3.json
index d2444abf23efe79d61311ff9819e52aa5e562d44..d85ed128d5d77f01697042c91952b8a62757b966 100644
--- a/data/grid5000/sites/nancy/pdus/gros-pdu3.json
+++ b/data/grid5000/sites/nancy/pdus/gros-pdu3.json
@@ -14,6 +14,24 @@
   ],
   "model": "AP8653",
   "ports": {
+    "1": "gros-41",
+    "10": "gros-57",
+    "11": "gros-58",
+    "14": "gros-62",
+    "15": "gros-63",
+    "17": "gros-66",
+    "18": "gros-68",
+    "19": "gros-70",
+    "2": "gros-42",
+    "20": "gros-72",
+    "21": "gros-74",
+    "22": "gros-76",
+    "3": "gros-44",
+    "4": "gros-45",
+    "5": "gros-47",
+    "6": "gros-49",
+    "7": "gros-50",
+    "9": "gros-56"
   },
   "sensors": [
     {
diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu4.json b/data/grid5000/sites/nancy/pdus/gros-pdu4.json
index bffead24e7d3b7b3e760ee24d3c169c36e745b8b..e82d4c351ffb124000561f5182fc2edcfa6442fd 100644
--- a/data/grid5000/sites/nancy/pdus/gros-pdu4.json
+++ b/data/grid5000/sites/nancy/pdus/gros-pdu4.json
@@ -14,6 +14,24 @@
   ],
   "model": "AP8653",
   "ports": {
+    "1": "gros-43",
+    "10": "gros-55",
+    "11": "gros-59",
+    "12": "gros-60",
+    "15": "gros-61",
+    "17": "gros-64",
+    "18": "gros-65",
+    "19": "gros-67",
+    "2": "gros-46",
+    "20": "gros-69",
+    "21": "gros-71",
+    "22": "gros-75",
+    "23": "gros-73",
+    "4": "gros-48",
+    "5": "gros-51",
+    "6": "gros-53",
+    "7": "gros-52",
+    "9": "gros-54"
   },
   "sensors": [
     {
diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu5.json b/data/grid5000/sites/nancy/pdus/gros-pdu5.json
index 7c7e2d3172af94fe430a68cad1743ddd349bcb87..42e2d1a30dfdaec158bb86a5b237327e9f426c59 100644
--- a/data/grid5000/sites/nancy/pdus/gros-pdu5.json
+++ b/data/grid5000/sites/nancy/pdus/gros-pdu5.json
@@ -14,6 +14,26 @@
   ],
   "model": "AP8653",
   "ports": {
+    "1": "gros-77",
+    "10": "gros-93",
+    "11": "gros-95",
+    "12": "gros-97",
+    "13": "gros-99",
+    "14": "gros-101",
+    "15": "gros-104",
+    "17": "gros-105",
+    "18": "gros-108",
+    "19": "gros-110",
+    "2": "gros-78",
+    "20": "gros-111",
+    "21": "gros-114",
+    "22": "gros-116",
+    "3": "gros-79",
+    "4": "gros-81",
+    "5": "gros-83",
+    "6": "gros-85",
+    "7": "gros-88",
+    "9": "gros-92"
   },
   "sensors": [
     {
diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu6.json b/data/grid5000/sites/nancy/pdus/gros-pdu6.json
index e54d016d9869a89d13759e858e0f0a8dc15a9004..c3345b4a9e99f21fc850e8157848c711b580684d 100644
--- a/data/grid5000/sites/nancy/pdus/gros-pdu6.json
+++ b/data/grid5000/sites/nancy/pdus/gros-pdu6.json
@@ -14,6 +14,26 @@
   ],
   "model": "AP8653",
   "ports": {
+    "1": "gros-80",
+    "10": "gros-90",
+    "12": "gros-96",
+    "13": "gros-98",
+    "14": "gros-100",
+    "15": "gros-102",
+    "17": "gros-103",
+    "18": "gros-106",
+    "19": "gros-107",
+    "2": "gros-82",
+    "20": "gros-109",
+    "21": "gros-112",
+    "22": "gros-113",
+    "23": "gros-115",
+    "3": "gros-84",
+    "4": "gros-86",
+    "5": "gros-87",
+    "6": "gros-89",
+    "7": "gros-91",
+    "9": "gros-94"
   },
   "sensors": [
     {
diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu8.json b/data/grid5000/sites/nancy/pdus/gros-pdu8.json
index ba570059aac864c2492db19958949be0a2d6c28d..77796f6474a1e01d6742e3d3f9e0a6c5d42be2e7 100644
--- a/data/grid5000/sites/nancy/pdus/gros-pdu8.json
+++ b/data/grid5000/sites/nancy/pdus/gros-pdu8.json
@@ -14,6 +14,14 @@
   ],
   "model": "AP8653",
   "ports": {
+    "13": "gros-117",
+    "17": "gros-118",
+    "18": "gros-119",
+    "19": "gros-120",
+    "20": "gros-121",
+    "21": "gros-122",
+    "22": "gros-123",
+    "23": "gros-124"
   },
   "sensors": [
     {