diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
index 19dde8bf86345264e6620e50b9393f8d3ac44220..160b1a82a3c3638abbded69c113ce100f929a425 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "A1",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 4,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
index 1a970edfc828b9ebe057181eda07645a38df74a6..c4df6c1ee9c780af4c9cbf5bde39ee9d5c9d579b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu2",
-    "pdu_port": "H1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 11,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
index 79108999973a5b806cc7503de3491d170b58bc58..7f82a93767e3c0bc4254a1224e883edf7f1c9720 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "D1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 12,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
index 683ebddd600cc46e8ca01bb4782db0c349e1f2c3..178283f53c66b34a79f47a6bd935bbb5373cf1b3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "E1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 13,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
index 8fac0420515ac9cddfaa26cbcc606ecaa0069a1d..70a6a42c5c4039c679bf71f1e6330fc5d9c4b14c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "F1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 14,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
index 540cca145bd1cefe75df14d309296afd9594d27e..62da60f59b482477e84b819168a3bc55de36fbe1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "G1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 15,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
index 5147f232386423159bf3883dc6016236af9d674d..8dc9206e97df101ae53d952a4c9b25eae939d832 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "H1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 17,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
index 87933226af8e6d040fca7a1d35b45401da07a2d9..81b339e98df9ba189608fa681e5c9c63839ba800 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "B2",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 18,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
index a3fdf22dcfa6674b2c297e27d260d50d428914d7..729b416de42f85c9e6d6f02323ee49cc394cd449 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "C2",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 19,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
index d6d23a8b3b6273e351502f6f36fb5b5730bad00d..0b09fcb143fe97ba5d4902750ddd44fb95b85ec9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "D2",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 20,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
index 650e35f273fd958369bfda2bf1a9c1a84c67fa71..686f7b7401530ebbc2c48072b911d0380ac42d7a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "E2",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 21,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
index 28a5505f0a1d115088f47ec6dcb601952aafa2ce..6f68658e20f71ac7ccadde8ffe83abb7d25a9434 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "A2",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 3,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
index 2ce38a05602205ce55283f323f06d8957201d12f..c7cd3c9ff0afb83580676596b854c46dedbb9067 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "F2",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 22,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
index b2b08b6a4ace99e151ebf98c3b1221b2d4d8159f..053cd0a1d7ab5f54727c960ab78d26914bf1ff4a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "G2",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 23,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
index d2eed2d55538ebb612298053af517177c804aaff..9d6e998a54a1b5b7b41d396f42d10df2bc1aabd8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "H2",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 21,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
index 93f55292fddf2b3dffaed18ac888d2f8a320d82a..2eca3963af7ba458794567a6215afb1b0c6668a8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "B3",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 20,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
index ad1be620d80b70a8684b05e651c7ad65df1bfa8c..5a0ceca68a1d0c88588ec266eb95cbd2c8c2194a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "C3",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 19,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
index d4e998a9816f611ae07307dec407daeb94b24d21..19c91b0ef0f0b79a056be3914a0da2754f72a5c7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "D3",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 18,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
index 769d3d9f2c8f955d74947aa4358d21b2ded22de7..6ea2e289bc9f780bf2a011756bce1667cc3e6a77 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "E3",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 17,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
index 44eaf705ad8710ea1e2c04e942c2407bd0ae1bca..13049665bfd939eb19ecd461d411d12470acd274 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "F3",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 15,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
index 42a77ce5c1404284cd1931772869dfd69244e0ce..9f77981aeb4292c53c82f1c804055f50379aaaab 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "G3",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 14,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
index a159502680c6fb5183bd850679f9742a2874ef58..febcf90a892a3a5d318c090568af1eed65e2a163 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "H3",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 13,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
index 9a8f007f40d7cf6744febb2ec841b73c728fbc89..b12dc535a05375fa8d9b97795fc09c4ce0dbfaab 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "A3",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 2,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
index 1e89b91b45d1b3942f9af4e1243dc1206e64a438..8576763bbd658643a35aea959050cdcd765b9d7f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu4",
-    "pdu_port": "E2",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 1,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
index f56caf71b81664bb4b138a4ec2f70328da3c7c9c..e53d59c2e03691c836add9a6646220fb2617b00e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu4",
-    "pdu_port": "D2",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 2,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
index 6d50a46129f1df3e0bad249435a70acc0651f5f4..76c15ab1d8e59f601bb709dd7a4cea7b0f67bada 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu4",
-    "pdu_port": "C2",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 3,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
index 61c9bc550761b102ef69d75b657816df1da753a2..e3469406ca575d574e73da40dfe436332fc2aad6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu4",
-    "pdu_port": "B2",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 4,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
index 30194dbd1a985456ee07ecbc57bb5e37a78d0ead..15d37a8bb9136dd1604a7a49603f605f829dd8e6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu4",
-    "pdu_port": "H1",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 5,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
index 6088492ef013648ac96bb07a45a176f9704ebb12..175a3799f2fcf84aa8306247014488dbcdbcf96b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "A1",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 6,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
index 2d017508f6ad459f1d39555d12e0ed89cd532670..e1a975295ac2757fde989f7c96093b43d13b4ed5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "A2",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 7,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
index b3056885444a47ea108400b3e18ab794ebf57a93..5ff2bed81f5ff43b4fc40212c6c647e12b63c48d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "A3",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 8,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
index 0da253f2dd7760c0cb2e0e3f257f09bf5a645280..97cd8936a59238a8dc31c7b7dbfa26ccc2e674e3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "C1",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 2,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
index c003b871f0e7d692a2e60e448a0423e316623ec2..5145f6dc727d3a9c006831af25e77365ed52af24 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "D1",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 3,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
index d5929efcb891f72a0c4c2e230cf7c48d167f51b3..005a01bd01cb65aade0cdca1790638b204ce11c6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu2",
-    "pdu_port": "D2",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 1,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
index f1150ea17030b030af03547afcaf0e8c28ee68e0..b491bc3fe7a928678b22237f9323a41c27d382da 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "E1",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 4,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
index d3bd4225bc0c28692b9e2a12bbe936294053c417..561a741c06682960364e8adf64763ecb2b715f04 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "F1",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 5,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
index ddf5718fa36b3b5087b5effa6355d19d04f740fd..3143665f16e5735690a003eabd3c5b1717cc5546 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "G1",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 6,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
index bcbbdded78cdb910b48bd2f4ff5730f5fe217fb1..f338ddac191443b1bb689d8638af87520beab446 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "H1",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 7,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
index dc9710aa51aa35256973d7c83bdbc3992040f739..28ca3cc8a5a1ef57c9cf759fa2b34f1973736c31 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "B2",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 17,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
index 1e53afd590e5a17cb80208838db5629ba05fede2..7e2b324f0580def18891c0b5e5fd0364484a5e16 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "C2",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 18,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
index 59ecf2a24abad64eb60f39c0be09f11a1377cfcd..7e3397d287da7afabb3c0734d911705e32689065 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "D2",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 19,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
index d430afad8afd7b2d59351b0406fc1915287c3762..4166e378a34e3106fe03b628aa4755356fd9db19 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "E2",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 20,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
index 018a408ccec017a2b604e91c258678b9616ce215..4ca49ab7428c30bbe2b5ae6e57c1698c152d1359 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "F2",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 21,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
index d866b768de99412def32ad3383653ca69b1e9c37..2d4375d1deec498f13067b2dec54891c2a224803 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "G2",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 22,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
index b69e9b71958fe595b2552521dc6e70bba0b2b47c..0f38e5b2e9d8905aec748899bcaa458c2485c623 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu2",
-    "pdu_port": "B2",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 3,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
index a820ab4e453ffabf443599b8c35b051b31efdf54..a5bf1e8e0ad5ecda7692a335f4d50e227f8e8694 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "H2",
+    "pdu": "griffon-pdu3",
+    "pdu_port": 23,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
index 071e631b258b40aa202e5c6b5341f1399dffa1f1..79e7f09d58a0df964c9510740ae818f9c2b17b92 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "B3",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 21,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
index d035b68c1f7f35eb0f1788633edc167e48590d01..87530f4234282daf612b26736338f09c83d143d5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "C3",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 20,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
index 861fa8247151da08313287dc04275d6f59a0e432..7730b1c9647738692da434162f06db43914f8755 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "D3",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 19,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
index 5523de303d24e1bb88244c2161cdea00701f5270..87ad17a048bfee0971160e74a48b82405bfccae7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "E3",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 18,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
index 84b647a89d16a79a006e04ae81c22641f6b9a0d1..c284459838326b467629f9ea82e90d2747675963 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "F3",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 17,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
index f66592230634ccba326d8e6cc52d4119e2ea020d..6a151bda1552e6c418c9127e27c7bcd5b37d550f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "G3",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 15,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
index 5e857d8d79d9d58cd4743d342c7d4336ab6aeb29..59d00ba582d7a586f43b96c6106157d0c26d76cc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu3",
-    "pdu_port": "H3",
+    "pdu": "griffon-pdu4",
+    "pdu_port": 14,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
index 0bca0373058ebf02e9139315fa6c3e59eb0294a9..b2a0e970a219c3a15d5fa0ddcc4e387259aa8ceb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "G2",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 1,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
index eaee5b11d4e9f568cb0356226ccea3d7e18e104c..b95d62a69bbf86b61a221baa2a1ed0bec7a0437b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "F2",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 2,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
index 7373b29dd7d7769e79de39a5deaacfaa880dcca8..851938609669fb423fb29962a4d335dacddd04db 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu2",
-    "pdu_port": "D1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 4,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
index 51b11ac227e3f92fb083663f76bd0ee1d51f4779..640fc07fba46776da72cc05513d681603d01aa1b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu1",
-    "pdu_port": "E2",
+    "pdu": "griffon-pdu2",
+    "pdu_port": 5,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
index bb5dfde29507e0b2771447dca08d4a99c22e997d..58043ce416633371f66269738f30ce20ddf884e7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu6",
-    "pdu_port": "D2",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 3,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
index f0ae1d35888a84a8e36dfaf2761bd4485ca31dd1..a0b4c0a74ca86462af7bd638648253c90f8973c5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu6",
-    "pdu_port": "C2",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 2,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
index 6786fbc755de98be5d2b2215d5bb42e85d21472f..13f99b97c3cf90f1c0edb932df801a9e221afe25 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu6",
-    "pdu_port": "B2",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 1,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
index 6155a0d31e6525f0d38f82b027937ed1d4211951..385a6ff5a50addb600537df502cd5996ef693808 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu6",
-    "pdu_port": "B3",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 8,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
index dd67db8203e7554d5bbc266ce5a9cacf3fe40aa1..63f60a89bd992339398fb5b044cbc0db0a0a74b2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu6",
-    "pdu_port": "C3",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 2,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
index 73b1d0081288cc20b735580617ba55d75a28640d..ed3449e2b05c0b0d5aa2226da7b81178d195226d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu6",
-    "pdu_port": "D3",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 3,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
index 30a728907cd932e01c351d070d278aa3e570fe0c..8d1f9c02622add71084cf9371760aad959987ac1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu6",
-    "pdu_port": "H1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 4,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
index 4b33bcb5e21c0d8cd4e10acf56284888334ee5fa..c99891d7b848a1e9fdadc33d21f63b94258f1c4d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu6",
-    "pdu_port": "G1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 5,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
index 134e0c024d4079069be826c31dac5e46eceff8cd..2a3079ebf8cb9bcf9ca57cee5ba00eafeb78d69c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu6",
-    "pdu_port": "A1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 6,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
index 1a6b44039affbd1384bfaf1da159bb4403b6285f..80bd7912d0cc95caa9ddc4a653d751f64c164468 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu2",
-    "pdu_port": "E1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 5,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
index 9908fe47579a0ee466733bc228aac84b3165859e..9a8996caab25638353638600dd0bd9c52f3a0bcf 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "A2",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 7,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
index c95adc8e860c8a0b93f831c95efa77de240ef255..196f67fc9ae78267e0dcb03f52d990a16cc60f84 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "A3",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 8,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
index 42a7e79e198cdb9d18f001d19fc2de46dbda4f95..0be59d90a9296c5859d19e5b69827d38f5b08694 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "B1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 9,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
index 64f69f93921f74f381e63968e38a95fdd616567a..96417efedb326a205fd75c1dd28e45d8db3a18fa 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "C1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 10,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
index 9a7edcba96b7b76f067122edb9507002a350f58e..d46b8888124e345075f4b36b70d6066b34dd5375 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "D1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 11,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
index e43fd4436032cb98ad98e0e4db45ab88d40c16bc..8a48c07c4cd398ffbeafba1570101450c6bc8ca5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "E1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 13,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
index 4df5bd5735dc9c3b57650a67b177e060ec9e1516..8aa56182e18a691310d5483e5f6ec06717f54d81 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "F1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 14,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
index ae945900bdbe58a7f90ead12c9705387d61cf1f1..570b570c44599d6d04e32e789a742b948b9390c7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "G1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 15,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
index 98707bf23402be06955ee846ef8f3073c580211f..1294d2d8e194251fd1be8f59fcd6ac10d74d63bf 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "H1",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 17,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
index ebce22cb90d9c7ba5d764a043a4f1e13bcef1342..c9b91af203bfcd33c4f363d49b3090e1984c3aa0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "B2",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 18,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
index 2a1268367c266bbed1f1890b72628d448abc78f6..4665fd08b40e72e9d2d92bd6318bc8ee96cb25bf 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu2",
-    "pdu_port": "F1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 6,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
index 6876ed86f2bb7fd8cc1cb5dd82514165422a964a..375ed8ce296ea3fc5c2553bee55d0628ca69ac8d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "C2",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 19,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
index b138b4b6a66df891e40f78f90015e1abe3a903b2..281382f36120a58d5deee228c5ec74565c3e999c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "D2",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 20,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
index b818067ddcac493c231287ee17eeb7f4dca5585d..bd07cee342f1ee5981240df6c1de2ea9d64d060e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "E2",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 21,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
index db399d96932f13524d6d693d0483594b3cbfd55a..6b7af6e3ca403e25ed86ed198e4797610715159d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "F2",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 22,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
index 3e0d3425737aa8db5a1148875e6de5623849516f..b92c8d809b9bc97470c84b6ae66110bbe0f5ca56 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "G2",
+    "pdu": "griffon-pdu5",
+    "pdu_port": 23,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
index e8a0f37d19fce759adda7174fdb8e1c0e94bcc74..b8d67e66ec3e19c831806a57e62dd3dc52db0f45 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "H2",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 21,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
index a4a5508c0696a1dcb54d32d3c8d96828f6b85821..13bfd9162b462f313cec6def1a55d1387a132085 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "B3",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 20,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
index 53010e78d4370da290e6684209cc576d3ebc9115..03754d5120a3fee3d06ef1e35f25d07d8a4bbc2f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "C3",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 19,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
index e31445c91fa3fa5446120a5e7438fcb68681b0aa..06715a6cd72cce70d480674857fc6f92f1e597d1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "D3",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 18,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
index 90620b46728730b75f7676969c61845a9e988dab..d292c208e65f8eb94d094573f8d4d585ada0c6c0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "E3",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 17,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
index 8d5c0f6fdb0211ff35f744d297b8556a3cc576a6..3dd311f8a8f093b6f5b87e0f0da083f9fbf1daa9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu2",
-    "pdu_port": "G1",
+    "pdu": "griffon-pdu1",
+    "pdu_port": 10,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
index 76f4c9b98a7a34ae3e23b388d95cd5b6dee6981c..d53134f4e5f1f954192dd32759b981ab277ef03b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "F3",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 15,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
index 2bdbb4946a59048593734a9e97e41085a6d1735a..bfc6377251aabbcee4ee3ef2425a923174ea54f6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "G3",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 14,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
index 977422e4aeb374e6ba0652ecd140ef02cde2918b..b48d09ef47aaaf30a05cbacaaf0add7a1ebd603e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
@@ -88,8 +88,8 @@
     "version": null
   },
   "pdu": {
-    "pdu": "pdu5",
-    "pdu_port": "H3",
+    "pdu": "griffon-pdu6",
+    "pdu_port": 13,
     "vendor": "American Power Conversion"
   },
   "processor": {
diff --git a/generators/input/nancy.yaml b/generators/input/nancy.yaml
index 79f43da3bc27795e7d8b0547256d1dfd08c6b3fa..378664c7337107b948d30b296b48d42172cbe2ee 100644
--- a/generators/input/nancy.yaml
+++ b/generators/input/nancy.yaml
@@ -4,12 +4,12 @@ griffon-1:
   mac_eth0: 00:E0:81:B2:C1:88
   mac_ib: C903000318F0
   mac_eth1: 00:E0:81:B2:C1:89
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "1"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "1"
-  pdu_pos: A1
+  pdu_pos: 4
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.1
@@ -32,12 +32,12 @@ griffon-2:
   mac_eth0: 00:E0:81:B2:C4:BC
   mac_ib: C90300028064
   mac_eth1: 00:E0:81:B2:C4:BD
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "2"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "2"
-  pdu_pos: A2
+  pdu_pos: 3
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.2
@@ -60,12 +60,12 @@ griffon-3:
   mac_eth0: 00:E0:81:B2:C1:FE
   mac_ib: C90300027F60
   mac_eth1: 00:E0:81:B2:C1:FF
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "3"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "3"
-  pdu_pos: A3
+  pdu_pos: 2
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.3
@@ -88,12 +88,12 @@ griffon-4:
   mac_eth0: 00:E0:81:B2:BF:E4
   mac_ib: C90300028068
   mac_eth1: 00:E0:81:B2:BF:E5
-  pdu: pdu2
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "4"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "4"
-  pdu_pos: D2
+  pdu_pos: 1
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.4
@@ -116,12 +116,12 @@ griffon-5:
   mac_eth0: 00:E0:81:B2:C1:FC
   mac_ib: C903000280C0
   mac_eth1: 00:E0:81:B2:C1:FD
-  pdu: pdu2
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "5"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "5"
-  pdu_pos: B2
+  pdu_pos: 3
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.5
@@ -144,12 +144,12 @@ griffon-6:
   mac_eth0: 00:E0:81:B1:C4:E7
   mac_ib: C903000280AC
   mac_eth1: 00:E0:81:B1:C4:E8
-  pdu: pdu2
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "6"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "6"
-  pdu_pos: D1
+  pdu_pos: 4
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.6
@@ -172,12 +172,12 @@ griffon-7:
   mac_eth0: 00:E0:81:B2:C4:AC
   mac_ib: C90300028054
   mac_eth1: 00:E0:81:B2:C4:AD
-  pdu: pdu2
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "7"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "7"
-  pdu_pos: E1
+  pdu_pos: 5
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.7
@@ -200,12 +200,12 @@ griffon-8:
   mac_eth0: 00:E0:81:B2:C4:A0
   mac_ib: C903000280C8
   mac_eth1: 00:E0:81:B2:C4:A1
-  pdu: pdu2
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "8"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "8"
-  pdu_pos: F1
+  pdu_pos: 6
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.8
@@ -228,12 +228,12 @@ griffon-9:
   mac_eth0: 00:E0:81:B2:C5:76
   mac_ib: C9030002805C
   mac_eth1: 00:E0:81:B2:C5:77
-  pdu: pdu2
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "9"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "9"
-  pdu_pos: G1
+  pdu_pos: 10
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.9
@@ -256,12 +256,12 @@ griffon-10:
   mac_eth0: 00:E0:81:B2:C0:A4
   mac_ib: C90300027F58
   mac_eth1: 00:E0:81:B2:C0:A5
-  pdu: pdu2
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "10"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "10"
-  pdu_pos: H1
+  pdu_pos: 11
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.10
@@ -284,12 +284,12 @@ griffon-11:
   mac_eth0: 00:E0:81:B2:C2:4C
   mac_ib: C90300028008
   mac_eth1: 00:E0:81:B2:C2:4D
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "25"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "11"
-  pdu_pos: D1
+  pdu_pos: 12
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.11
@@ -313,12 +313,12 @@ griffon-12:
   mac_eth0: 00:E0:81:B2:C1:9E
   mac_ib: C903000280DC
   mac_eth1: 00:E0:81:B2:C1:9F
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "26"
   switch_ib_card: "0x000b8cffff003106"
   switch_ib_card_pos: "12"
-  pdu_pos: E1
+  pdu_pos: 13
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.12
@@ -342,12 +342,12 @@ griffon-13:
   mac_eth0: 00:E0:81:B2:C1:E4
   mac_ib: C903000280BC
   mac_eth1: 00:E0:81:B2:C1:E5
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "27"
   switch_ib_card: "0x000b8cffff003054"
   switch_ib_card_pos: "1"
-  pdu_pos: F1
+  pdu_pos: 14
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.13
@@ -371,12 +371,12 @@ griffon-14:
   mac_eth0: 00:E0:81:B1:C0:60
   mac_ib: C903000280CC
   mac_eth1: 00:E0:81:B1:C0:61
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "28"
   switch_ib_card: "0x000b8cffff003054"
   switch_ib_card_pos: "2"
-  pdu_pos: G1
+  pdu_pos: 15
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.14
@@ -400,12 +400,12 @@ griffon-15:
   mac_eth0: 00:E0:81:B2:C4:C4
   mac_ib: C903000280B4
   mac_eth1: 00:E0:81:B2:C4:C5
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "29"
   switch_ib_card: "0x000b8cffff003054"
   switch_ib_card_pos: "3"
-  pdu_pos: H1
+  pdu_pos: 17
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.15
@@ -428,12 +428,12 @@ griffon-16:
   mac_eth0: 00:E0:81:B2:BF:A0
   mac_ib: C9030003303E
   mac_eth1: 00:E0:81:B2:BF:A1
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "30"
   switch_ib_card: "0x000b8cffff003054"
   switch_ib_card_pos: "4"
-  pdu_pos: B2
+  pdu_pos: 18
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.16
@@ -456,12 +456,12 @@ griffon-17:
   mac_eth0: 00:E0:81:B2:C2:18
   mac_ib: C90300033016
   mac_eth1: 00:E0:81:B2:C2:19
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "31"
   switch_ib_card: "0x000b8cffff003054"
   switch_ib_card_pos: "5"
-  pdu_pos: C2
+  pdu_pos: 19
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.17
@@ -484,12 +484,12 @@ griffon-18:
   mac_eth0: 00:E0:81:B2:C2:04
   mac_ib: C9030003302A
   mac_eth1: 00:E0:81:B2:C2:05
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "32"
   switch_ib_card: "0x000b8cffff003054"
   switch_ib_card_pos: "6"
-  pdu_pos: D2
+  pdu_pos: 20
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.18
@@ -512,12 +512,12 @@ griffon-19:
   mac_eth0: 00:E0:81:B2:C5:60
   mac_ib: C90300033036
   mac_eth1: 00:E0:81:B2:C5:61
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "33"
   switch_ib_card: "0x000b8cffff003054"
   switch_ib_card_pos: "7"
-  pdu_pos: E2
+  pdu_pos: 21
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.19
@@ -540,12 +540,12 @@ griffon-20:
   mac_eth0: 00:E0:81:B2:C5:74
   mac_ib: C90300032FCA
   mac_eth1: 00:E0:81:B2:C5:75
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "34"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "2"
-  pdu_pos: F2
+  pdu_pos: 22
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.20
@@ -568,12 +568,12 @@ griffon-21:
   mac_eth0: 00:E0:81:B2:BF:CC
   mac_ib: C9030003304E
   mac_eth1: 00:E0:81:B2:BF:CD
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "35"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "1"
-  pdu_pos: G2
+  pdu_pos: 23
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.21
@@ -596,12 +596,12 @@ griffon-22:
   mac_eth0: 00:E0:81:B2:BF:A6
   mac_ib: C90300033032
   mac_eth1: 00:E0:81:B2:BF:A7
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "36"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "3"
-  pdu_pos: H2
+  pdu_pos: 21
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.22
@@ -624,12 +624,12 @@ griffon-23:
   mac_eth0: 00:E0:81:B2:C1:56
   mac_ib: C9030003302F
   mac_eth1: 00:E0:81:B2:C1:57
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "37"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "4"
-  pdu_pos: B3
+  pdu_pos: 20
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.23
@@ -652,12 +652,12 @@ griffon-24:
   mac_eth0: 00:E0:81:B2:C2:2E
   mac_ib: C90300032FD6
   mac_eth1: 00:E0:81:B2:C2:2F
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "38"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "5"
-  pdu_pos: C3
+  pdu_pos: 19
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.24
@@ -680,12 +680,12 @@ griffon-25:
   mac_eth0: 00:E0:81:B2:BF:E2
   mac_ib: C90300033022
   mac_eth1: 00:E0:81:B2:BF:E3
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "39"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "6"
-  pdu_pos: D3
+  pdu_pos: 18
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.25
@@ -708,12 +708,12 @@ griffon-26:
   mac_eth0: 00:E0:81:B2:C1:C8
   mac_ib: C90300032FD2
   mac_eth1: 00:E0:81:B2:C1:C9
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "40"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "7"
-  pdu_pos: E3
+  pdu_pos: 17
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.26
@@ -736,12 +736,12 @@ griffon-27:
   mac_eth0: 00:E0:81:B2:C0:C4
   mac_ib: C9030003301E
   mac_eth1: 00:E0:81:B2:C0:C5
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "41"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "8"
-  pdu_pos: F3
+  pdu_pos: 15
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.27
@@ -764,12 +764,12 @@ griffon-28:
   mac_eth0: 00:E0:81:B2:C0:E5
   mac_ib: C90300032FDA
   mac_eth1: 00:E0:81:B2:C0:E6
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "42"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "9"
-  pdu_pos: G3
+  pdu_pos: 14
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.28
@@ -792,12 +792,12 @@ griffon-29:
   mac_eth0: 00:E0:81:B2:C4:BO
   mac_ib: C90300033042
   mac_eth1: 00:E0:81:B2:C4:B1
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "43"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "10"
-  pdu_pos: H3
+  pdu_pos: 13
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.29
@@ -820,12 +820,12 @@ griffon-30:
   mac_eth0: 00:E0:81:B2:C0:B4
   mac_ib: C9030003303A
   mac_eth1: 00:E0:81:B2:C0:B5
-  pdu: pdu4
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "1"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "1"
-  pdu_pos: E2
+  pdu_pos: 1
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.30
@@ -848,12 +848,12 @@ griffon-31:
   mac_eth0: 00:E0:81:B2:C2:24
   mac_ib: C9030003305E
   mac_eth1: 00:E0:81:B2:C2:25
-  pdu: pdu4
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "2"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "2"
-  pdu_pos: D2
+  pdu_pos: 2
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.31
@@ -876,12 +876,12 @@ griffon-32:
   mac_eth0: 00:E0:81:B2:C5:9E
   mac_ib: C9030003305A
   mac_eth1: 00:E0:81:B2:C5:9F
-  pdu: pdu4
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "3"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "3"
-  pdu_pos: C2
+  pdu_pos: 3
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.32
@@ -904,12 +904,12 @@ griffon-33:
   mac_eth0: 00:E0:81:B2:BF:FA
   mac_ib: C90300033056
   mac_eth1: 00:E0:81:B2:BF:FB
-  pdu: pdu4
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "4"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "4"
-  pdu_pos: B2
+  pdu_pos: 4
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.33
@@ -932,12 +932,12 @@ griffon-34:
   mac_eth0: 00:E0:81:B2:54:D6
   mac_ib: C90300033052
   mac_eth1: 00:E0:81:B2:54:D7
-  pdu: pdu4
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "5"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "5"
-  pdu_pos: H1
+  pdu_pos: 5
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.34
@@ -960,12 +960,12 @@ griffon-35:
   mac_eth0: 00:E0:81:B2:C4:D4
   mac_ib: C9030003304A
   mac_eth1: 00:E0:81:B2:C4:D5
-  pdu: pdu3
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "6"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "6"
-  pdu_pos: A1
+  pdu_pos: 6
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.35
@@ -988,12 +988,12 @@ griffon-36:
   mac_eth0: 00:E0:81:B2:C0:BE
   mac_ib: C9030003301A
   mac_eth1: 00:E0:81:B2:C0:BF
-  pdu: pdu3
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "7"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "7"
-  pdu_pos: A2
+  pdu_pos: 7
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.36
@@ -1016,12 +1016,12 @@ griffon-37:
   mac_eth0: 00:E0:81:B2:C0:3E
   mac_ib: C90300028058
   mac_eth1: 00:E0:81:B2:C0:3F
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "8"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "8"
-  pdu_pos: A3
+  pdu_pos: 8
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.37
@@ -1044,12 +1044,12 @@ griffon-38:
   mac_eth0: 00:E0:81:B2:C1:D8
   mac_ib: C903000318DC
   mac_eth1: 00:E0:81:B2:C1:D9
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "9"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "9"
-  pdu_pos: C1
+  pdu_pos: 2
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.38
@@ -1072,12 +1072,12 @@ griffon-39:
   mac_eth0: 00:E0:81:B2:C1:FA
   mac_ib: C903000318E8
   mac_eth1: 00:E0:81:B2:C1:FB
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "25"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "10"
-  pdu_pos: D1
+  pdu_pos: 3
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.39
@@ -1100,12 +1100,12 @@ griffon-40:
   mac_eth0: 00:E0:81:B2:C0:CC
   mac_ib: C90300031780
   mac_eth1: 00:E0:81:B2:C0:CD
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "26"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "11"
-  pdu_pos: E1
+  pdu_pos: 4
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.40
@@ -1128,12 +1128,12 @@ griffon-41:
   mac_eth0: 00:E0:81:B2:C4:98
   mac_ib: C903000317D4
   mac_eth1: 00:E0:81:B2:C4:99
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "27"
   switch_ib_card: "0x000b8cffff003055"
   switch_ib_card_pos: "12"
-  pdu_pos: F1
+  pdu_pos: 5
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.41
@@ -1156,12 +1156,12 @@ griffon-42:
   mac_eth0: 00:E0:81:B2:C1:BA
   mac_ib: C903000280D0
   mac_eth1: 00:E0:81:B2:C1:BB
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "28"
   switch_ib_card: "0x000b8cffff0030ff"
   switch_ib_card_pos: "1"
-  pdu_pos: G1
+  pdu_pos: 6
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.42
@@ -1184,12 +1184,12 @@ griffon-43:
   mac_eth0: 00:E0:81:B2:C1:F4
   mac_ib: C903000280B8
   mac_eth1: 00:E0:81:B2:C1:F5
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "29"
   switch_ib_card: "0x000b8cffff0030ff"
   switch_ib_card_pos: "2"
-  pdu_pos: H1
+  pdu_pos: 7
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.43
@@ -1212,12 +1212,12 @@ griffon-44:
   mac_eth0: 00:E0:81:B2:C1:B8
   mac_ib: C903000280D4
   mac_eth1: 00:E0:81:B2:C1:B9
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "30"
   switch_ib_card: "0x000b8cffff0030ff"
   switch_ib_card_pos: "3"
-  pdu_pos: B2
+  pdu_pos: 17
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.44
@@ -1240,12 +1240,12 @@ griffon-45:
   mac_eth0: 00:E0:81:B2:C4:94
   mac_ib: C903000280B0
   mac_eth1: 00:E0:81:B2:C4:95
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "31"
   switch_ib_card: "0x000b8cffff0030ff"
   switch_ib_card_pos: "4"
-  pdu_pos: C2
+  pdu_pos: 18
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.45
@@ -1268,12 +1268,12 @@ griffon-46:
   mac_eth0: 00:E0:81:B1:C4:36
   mac_ib: C903000280A8
   mac_eth1: 00:E0:81:B1:C4:37
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "32"
   switch_ib_card: "0x000b8cffff0030ff"
   switch_ib_card_pos: "5"
-  pdu_pos: D2
+  pdu_pos: 19
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.46
@@ -1296,12 +1296,12 @@ griffon-47:
   mac_eth0: 00:E0:81:B1:C4:CC
   mac_ib: C903000318E0
   mac_eth1: 00:E0:81:B1:C4:CD
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "33"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: E2
+  pdu_pos: 20
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.47
@@ -1324,12 +1324,12 @@ griffon-48:
   mac_eth0: 00:E0:81:B2:C0:8C
   mac_ib: C903000317A4
   mac_eth1: 00:E0:81:B2:C0:8D
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "34"
   switch_ib_card: "0x000b8cffff0030ff"
   switch_ib_card_pos: "7"
-  pdu_pos: F2
+  pdu_pos: 21
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.48
@@ -1352,12 +1352,12 @@ griffon-49:
   mac_eth0: 00:E0:81:B2:C2:2C
   mac_ib: C90300033026
   mac_eth1: 00:E0:81:B2:C2:2D
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "35"
   switch_ib_card: "0x000b8cffff0030ff"
   switch_ib_card_pos: "8"
-  pdu_pos: G2
+  pdu_pos: 22
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.49
@@ -1380,12 +1380,12 @@ griffon-50:
   mac_eth0: 00:E0:81:B2:C2:10
   mac_ib: C903000318D0
   mac_eth1: 00:E0:81:B2:C2:11
-  pdu: pdu3
+  pdu: griffon-pdu3
   switch_eth0: sgriffon2
   switch_pos_eth0: "36"
   switch_ib_card: "0x000b8cffff0030ff"
   switch_ib_card_pos: "9"
-  pdu_pos: H2
+  pdu_pos: 23
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.50
@@ -1408,12 +1408,12 @@ griffon-51:
   mac_eth0: 00:E0:81:B2:C0:9E
   mac_ib: C903000318EC
   mac_eth1: 00:E0:81:B2:C0:9F
-  pdu: pdu3
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "37"
   switch_ib_card: "0x000b8cffff0030ff"
   switch_ib_card_pos: "10"
-  pdu_pos: B3
+  pdu_pos: 21
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.51
@@ -1436,12 +1436,12 @@ griffon-52:
   mac_eth0: 00:E0:81:B2:C4:A8
   mac_ib: C90300027F84
   mac_eth1: 00:E0:81:B2:C4:A9
-  pdu: pdu3
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "38"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: C3
+  pdu_pos: 20
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.52
@@ -1464,12 +1464,12 @@ griffon-53:
   mac_eth0: 00:E0:81:B2:C0:30
   mac_ib: C903000280C4
   mac_eth1: 00:E0:81:B2:C0:31
-  pdu: pdu3
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "39"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: D3
+  pdu_pos: 19
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.53
@@ -1492,12 +1492,12 @@ griffon-54:
   mac_eth0: 00:E0:81:B2:C2:2A
   mac_ib: C903000318C4
   mac_eth1: 00:E0:81:B2:C2:2B
-  pdu: pdu3
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "40"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: E3
+  pdu_pos: 18
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.54
@@ -1520,12 +1520,12 @@ griffon-55:
   mac_eth0: 00:E0:81:B2:C2:88
   mac_ib: C90300031784
   mac_eth1: 00:E0:81:B2:C2:89
-  pdu: pdu3
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "41"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: F3
+  pdu_pos: 17
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.55
@@ -1548,12 +1548,12 @@ griffon-56:
   mac_eth0: 00:E0:81:B2:C1:DC
   mac_ib: C9030003176C
   mac_eth1: 00:E0:81:B2:C1:DD
-  pdu: pdu3
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "42"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: G3
+  pdu_pos: 15
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.56
@@ -1576,12 +1576,12 @@ griffon-57:
   mac_eth0: 00:E0:81:B2:BF:EC
   mac_ib: C9030003173C
   mac_eth1: 00:E0:81:B2:BF:ED
-  pdu: pdu3
+  pdu: griffon-pdu4
   switch_eth0: sgriffon2
   switch_pos_eth0: "43"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: H3
+  pdu_pos: 14
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.57
@@ -1604,12 +1604,12 @@ griffon-58:
   mac_eth0: 00:E0:81:B2:C0:28
   mac_ib: C9030003179C
   mac_eth1: 00:E0:81:B2:C0:29
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "1"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: G2
+  pdu_pos: 1
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.58
@@ -1632,12 +1632,12 @@ griffon-59:
   mac_eth0: 00:E0:81:B2:C1:F8
   mac_ib: C90300031730
   mac_eth1: 00:E0:81:B2:C1:F9
-  pdu: pdu1
+  pdu: griffon-pdu1
   switch_eth0: sgriffon1
   switch_pos_eth0: "2"
   switch_ib_card: "0x000b8cffff00304d"
   switch_ib_card_pos: "5"
-  pdu_pos: F2
+  pdu_pos: 2
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.59
@@ -1660,12 +1660,12 @@ griffon-60:
   mac_eth0: 00:E0:81:B2:BF:F4
   mac_ib: C90300031740
   mac_eth1: 00:E0:81:B2:BF:F5
-  pdu: pdu1
+  pdu: griffon-pdu2
   switch_eth0: sgriffon1
   switch_pos_eth0: "3"
   switch_ib_card: "0x000b8cffff00304d"
   switch_ib_card_pos: "6"
-  pdu_pos: E2
+  pdu_pos: 5
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.60
@@ -1688,12 +1688,12 @@ griffon-61:
   mac_eth0: 00:E0:81:B2:C1:E2
   mac_ib: C90300031804
   mac_eth1: 00:E0:81:B2:C1:E3
-  pdu: pdu6
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "4"
   switch_ib_card: "0x000b8cffff00304d"
   switch_ib_card_pos: "7"
-  pdu_pos: D2
+  pdu_pos: 3
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.61
@@ -1716,12 +1716,12 @@ griffon-62:
   mac_eth0: 00:E0:81:B2:C1:D6
   mac_ib: C9030003185C
   mac_eth1: 00:E0:81:B2:C1:D7
-  pdu: pdu6
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "5"
   switch_ib_card: "0x000b8cffff00304d"
   switch_ib_card_pos: "8"
-  pdu_pos: C2
+  pdu_pos: 2
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.62
@@ -1744,12 +1744,12 @@ griffon-63:
   mac_eth0: 00:E0:81:B1:C3:84
   mac_ib: C903000317B4
   mac_eth1: 00:E0:81:B1:C3:85
-  pdu: pdu6
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "6"
   switch_ib_card: "0x000b8cffff00304d"
   switch_ib_card_pos: "9"
-  pdu_pos: B2
+  pdu_pos: 1
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.63
@@ -1772,12 +1772,12 @@ griffon-64:
   mac_eth0: 00:E0:81:B2:C2:48
   mac_ib: C90300033012
   mac_eth1: 00:E0:81:B2:C2:49
-  pdu: pdu6
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "7"
   switch_ib_card: "0x000b8cffff00304d"
   switch_ib_card_pos: "10"
-  pdu_pos: B3
+  pdu_pos: 8
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.64
@@ -1800,12 +1800,12 @@ griffon-65:
   mac_eth0: 00:E0:81:B1:C4:D4
   mac_ib: C90300031750
   mac_eth1: 00:E0:81:B1:C4:D5
-  pdu: pdu6
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "8"
   switch_ib_card: "0x000b8cffff00304d"
   switch_ib_card_pos: "11"
-  pdu_pos: C3
+  pdu_pos: 2
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.65
@@ -1828,12 +1828,12 @@ griffon-66:
   mac_eth0: 00:E0:81:B2:C0:2E
   mac_ib: C90300031968
   mac_eth1: 00:E0:81:B2:C0:2F
-  pdu: pdu6
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "9"
   switch_ib_card: "0x000b8cffff00304d"
   switch_ib_card_pos: "12"
-  pdu_pos: D3
+  pdu_pos: 3
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.66
@@ -1856,12 +1856,12 @@ griffon-67:
   mac_eth0: 00:E0:81:B2:BF:F2
   mac_ib: C903000317DC
   mac_eth1: 00:E0:81:B2:BF:F3
-  pdu: pdu6
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "10"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "1"
-  pdu_pos: H1
+  pdu_pos: 4
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.67
@@ -1884,12 +1884,12 @@ griffon-68:
   mac_eth0: 00:E0:81:B2:C1:70
   mac_ib: C90300031858
   mac_eth1: 00:E0:81:B2:C1:71
-  pdu: pdu6
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "11"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "2"
-  pdu_pos: G1
+  pdu_pos: 5
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.68
@@ -1912,12 +1912,12 @@ griffon-69:
   mac_eth0: 00:E0:81:B2:C1:3A
   mac_ib: C903000317B0
   mac_eth1: 00:E0:81:B2:C1:3B
-  pdu: pdu6
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "12"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "3"
-  pdu_pos: A1
+  pdu_pos: 6
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.69
@@ -1940,12 +1940,12 @@ griffon-70:
   mac_eth0: 00:E0:81:B2:BF:8A
   mac_ib: C90300031810
   mac_eth1: 00:E0:81:B2:BF:8B
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "13"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "4"
-  pdu_pos: A2
+  pdu_pos: 7
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.70
@@ -1968,12 +1968,12 @@ griffon-71:
   mac_eth0: 00:E0:81:B2:BF:CE
   mac_ib: C90300031824
   mac_eth1: 00:E0:81:B2:BF:CF
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "14"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "5"
-  pdu_pos: A3
+  pdu_pos: 8
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.71
@@ -1996,12 +1996,12 @@ griffon-72:
   mac_eth0: 00:E0:81:B2:C4:D6
   mac_ib: C90300032FCE
   mac_eth1: 00:E0:81:B2:C4:D7
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "15"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "6"
-  pdu_pos: B1
+  pdu_pos: 9
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.72
@@ -2024,12 +2024,12 @@ griffon-73:
   mac_eth0: 00:E0:81:B2:C4:BA
   mac_ib: C903000319FC
   mac_eth1: 00:E0:81:B2:C4:BB
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "25"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "7"
-  pdu_pos: C1
+  pdu_pos: 10
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.73
@@ -2052,12 +2052,12 @@ griffon-74:
   mac_eth0: 00:E0:81:B2:C0:94
   mac_ib: C90300031890
   mac_eth1: 00:E0:81:B2:C0:95
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "26"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "8"
-  pdu_pos: D1
+  pdu_pos: 11
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.74
@@ -2080,12 +2080,12 @@ griffon-75:
   mac_eth0: 00:E0:81:B2:C1:D2
   mac_ib: C90300031874
   mac_eth1: 00:E0:81:B2:C1:D3
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "27"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "9"
-  pdu_pos: E1
+  pdu_pos: 13
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.75
@@ -2108,12 +2108,12 @@ griffon-76:
   mac_eth0: 00:E0:81:B2:C1:24
   mac_ib: C90300031974
   mac_eth1: 00:E0:81:B2:C1:25
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "28"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "10"
-  pdu_pos: F1
+  pdu_pos: 14
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.76
@@ -2136,12 +2136,12 @@ griffon-77:
   mac_eth0: 00:E0:81:B2:BF:F0
   mac_ib: C903000318B8
   mac_eth1: 00:E0:81:B2:BF:F1
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "29"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "11"
-  pdu_pos: G1
+  pdu_pos: 15
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.77
@@ -2164,12 +2164,12 @@ griffon-78:
   mac_eth0: 00:E0:81:B2:C2:44
   mac_ib: C903000317AC
   mac_eth1: 00:E0:81:B2:C2:45
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "30"
   switch_ib_card: "0x000b8cffff003107"
   switch_ib_card_pos: "12"
-  pdu_pos: H1
+  pdu_pos: 17
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.78
@@ -2192,12 +2192,12 @@ griffon-79:
   mac_eth0: 00:E0:81:B2:C4:B8
   mac_ib: C90300031808
   mac_eth1: 00:E0:81:B2:C4:B9
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "31"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: B2
+  pdu_pos: 18
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.79
@@ -2220,12 +2220,12 @@ griffon-80:
   mac_eth0: 00:E0:81:B2:BF:EE
   mac_ib: C90300031800
   mac_eth1: 00:E0:81:B2:BF:EF
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "32"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: C2
+  pdu_pos: 19
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.80
@@ -2248,12 +2248,12 @@ griffon-81:
   mac_eth0: 00:E0:81:B2:C5:72
   mac_ib: C90300031860
   mac_eth1: 00:E0:81:B2:C5:73
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "33"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: D2
+  pdu_pos: 20
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.81
@@ -2276,12 +2276,12 @@ griffon-82:
   mac_eth0: 00:E0:81:B2:C1:7E
   mac_ib: C903000319F8
   mac_eth1: 00:E0:81:B2:C1:7F
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "34"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: E2
+  pdu_pos: 21
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.82
@@ -2304,12 +2304,12 @@ griffon-83:
   mac_eth0: 00:E0:81:B2:C2:40
   mac_ib: C903000319F4
   mac_eth1: 00:E0:81:B2:C2:41
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "35"
   switch_ib_card: "0x000b8cffff003101"
   switch_ib_card_pos: "12"
-  pdu_pos: F2
+  pdu_pos: 22
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.83
@@ -2332,12 +2332,12 @@ griffon-84:
   mac_eth0: 00:E0:81:B2:C2:4E
   mac_ib: C9030003180C
   mac_eth1: 00:E0:81:B2:C2:4F
-  pdu: pdu5
+  pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "36"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: G2
+  pdu_pos: 23
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.84
@@ -2360,12 +2360,12 @@ griffon-85:
   mac_eth0: 00:E0:81:B2:C5:BC
   mac_ib: C903000319F0
   mac_eth1: 00:E0:81:B2:C5:BD
-  pdu: pdu5
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "37"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: H2
+  pdu_pos: 21
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.85
@@ -2388,12 +2388,12 @@ griffon-86:
   mac_eth0: 00:E0:81:B2:C2:3A
   mac_ib: C90300031A00
   mac_eth1: 00:E0:81:B2:C2:3B
-  pdu: pdu5
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "38"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: B3
+  pdu_pos: 20
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.86
@@ -2416,12 +2416,12 @@ griffon-87:
   mac_eth0: 00:E0:81:B2:BF:82
   mac_ib: C90300031A04
   mac_eth1: 00:E0:81:B2:BF:83
-  pdu: pdu5
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "39"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: C3
+  pdu_pos: 19
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.87
@@ -2444,12 +2444,12 @@ griffon-88:
   mac_eth0: 00:E0:81:B2:C4:CE
   mac_ib: C90300031A18
   mac_eth1: 00:E0:81:B2:C4:CF
-  pdu: pdu5
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "40"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: D3
+  pdu_pos: 18
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.88
@@ -2472,12 +2472,12 @@ griffon-89:
   mac_eth0: 00:E0:81:B2:C5:D4
   mac_ib: C90300031A64
   mac_eth1: 00:E0:81:B2:C5:D5
-  pdu: pdu5
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "41"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: E3
+  pdu_pos: 17
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.89
@@ -2500,12 +2500,12 @@ griffon-90:
   mac_eth0: 00:E0:81:B2:C0:46
   mac_ib: C90300031A20
   mac_eth1: 00:E0:81:B2:C0:47
-  pdu: pdu5
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "42"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: F3
+  pdu_pos: 15
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.90
@@ -2528,12 +2528,12 @@ griffon-91:
   mac_eth0: 00:E0:81:B5:8F:94
   mac_ib: C90300031A0C
   mac_eth1: 00:E0:81:B5:8F:95
-  pdu: pdu5
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "43"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: G3
+  pdu_pos: 14
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.91
@@ -2556,12 +2556,12 @@ griffon-92:
   mac_eth0: 00:E0:81:B2:BF:DE
   mac_ib: C90300031A08
   mac_eth1: 00:E0:81:B2:BF:DF
-  pdu: pdu5
+  pdu: griffon-pdu6
   switch_eth0: sgriffon3
   switch_pos_eth0: "44"
   switch_ib_card: ""
   switch_ib_card_pos: ""
-  pdu_pos: H3
+  pdu_pos: 13
   switch_eth1: ""
   switch_pos_eth1: ""
   ip_ipmi: 172.28.154.92