diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
index dc40efa1066d8a1352f4d9e4f0a71916ebf1f83b..68547e7291c4063b60e9bf86a83092a1d057137d 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.101",
+      "mac": "00:18:FE:FA:63:6E",
       "network_address": "grelon-1.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.101",
+      "mac": "00:18:FE:FA:63:6F",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.101",
+      "pdu": "pdu71",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "1",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
index 5b95ffe3d01650bbd9fa734160de02642c727572..66c4ea2a721273d92c770c4c13ba70be69cebe18 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.110",
+      "mac": "00:18:FE:FA:45:26",
       "network_address": "grelon-10.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.110",
+      "mac": "00:18:FE:FA:45:27",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.110",
+      "pdu": "pdu72",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "10",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
index 88b9d570ef1575662a50b089ebdc8f84e14dfb7d..6891bd8c290731a70b3ebd7cf3c569ea5257d51d 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.200",
+      "mac": "00:18:FE:FA:53:B8",
       "network_address": "grelon-100.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.200",
+      "mac": "00:18:FE:FA:53:B9",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.200",
+      "pdu": "pdu32",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "4",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
index ca95accb6645f670b5191ac2b4ff7510b92d744d..f7c1edafdcc2dbbf9e1d998e4a861759395ceec0 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.201",
+      "mac": "00:18:FE:FA:43:7A",
       "network_address": "grelon-101.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.201",
+      "mac": "00:18:FE:FA:43:7B",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.201",
+      "pdu": "pdu31",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "5",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
index 088218250a9e8fc70cd81d5d84cad86bfb4c3efb..6a097de6914ea02957e417e4d0c987e7aa081f9b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.202",
+      "mac": "00:18:FE:FA:44:1A",
       "network_address": "grelon-102.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.202",
+      "mac": "00:18:FE:FA:44:1B",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.202",
+      "pdu": "pdu32",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "6",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
index 2f69a1d060077e4c25b62a045e90b159821ed881..e095774663db242fb72f40a71b4bff51f51fbdc5 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.203",
+      "mac": "00:18:FE:FA:46:A0",
       "network_address": "grelon-103.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.203",
+      "mac": "00:18:FE:FA:46:A1",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.203",
+      "pdu": "pdu31",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "7",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
index 05f947085d75fddcc14ff1471810457fd9172c64..e8e75d5913c6b0d5f614659ba324f25cb731c4be 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.204",
+      "mac": "00:18:FE:FA:46:8C",
       "network_address": "grelon-104.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.204",
+      "mac": "00:18:FE:FA:46:8D",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.204",
+      "pdu": "pdu32",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "8",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
index 94fe20016de4b0d90b3ef74443d019b3026a768e..f89a59690b8bb3757aa324d938256c62b62432b1 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.205",
+      "mac": "00:18:FE:FA:44:2C",
       "network_address": "grelon-105.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.205",
+      "mac": "00:18:FE:FA:44:2D",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.205",
+      "pdu": "pdu31",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "9",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
index e9de76ab106c5b9e08c7466c3cec084d252aaaec..dba61a48b760eb3d8ce0d708fc2f159bbee7bdd8 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.206",
+      "mac": "00:18:FE:28:AF:54",
       "network_address": "grelon-106.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.206",
+      "mac": "00:18:FE:28:AF:55",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.206",
+      "pdu": "pdu32",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "10",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
index 3dd65fb566104f7afebaf5265f20440d46c67bfb..d67ce475e117ad76994528f1e1de48eca38923a8 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.207",
+      "mac": "00:18:FE:FA:63:5A",
       "network_address": "grelon-107.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.207",
+      "mac": "00:18:FE:FA:63:5B",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.207",
+      "pdu": "pdu31",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "11",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
index e98f51236434a47f4a874d307cb2769c84e8f7a4..82e353a55f49ea5f1cd45b2701656a38a8e8d2a8 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.208",
+      "mac": "00:18:FE:FA:52:54",
       "network_address": "grelon-108.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.208",
+      "mac": "00:18:FE:FA:52:55",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.208",
+      "pdu": "pdu32",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "12",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
index 248de6f10caf5745ba2704e52c294aaf6a5c00b4..5866df739bb83db7ba111106cee09e88750d0238 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.209",
+      "mac": "00:18:FE:FA:63:6C",
       "network_address": "grelon-109.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.209",
+      "mac": "00:18:FE:FA:63:6D",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.209",
+      "pdu": "pdu31",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "13",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
index 763d61f25cfa7b45eaac881336a6625d5187b32f..7751fe5122838185924e31910f01d25bea06c52a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.111",
+      "mac": "00:18:FE:FA:42:0E",
       "network_address": "grelon-11.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.111",
+      "mac": "00:18:FE:FA:42:0F",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.111",
+      "pdu": "pdu71",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "11",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
index 7a40c74a2d80048491fabc6ea95348052500db0a..995446b32593541228a12ef42e00def2f11604c9 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.210",
+      "mac": "00:18:FE:FA:25:78",
       "network_address": "grelon-110.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.210",
+      "mac": "00:18:FE:FA:25:79",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.210",
+      "pdu": "pdu32",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "14",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
index 59217e66c0078e3573296d44b917f32c8d23bbf3..04107d4e10b969250661567eab201d7f3ae21d36 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.211",
+      "mac": "00:18:FE:FA:45:D2",
       "network_address": "grelon-111.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.211",
+      "mac": "00:18:FE:FA:45:D3",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.211",
+      "pdu": "pdu31",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "15",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
index 2a46715a8c5bf44238849241ec6e27f08b511a60..7cbd4eb8a89aa625aaa4d7ba9c14bd4c3d55d8d6 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.212",
+      "mac": "00:18:FE:FA:44:18",
       "network_address": "grelon-112.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.212",
+      "mac": "00:18:FE:FA:44:19",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.212",
+      "pdu": "pdu32",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "16",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json
index dce6d9ed3156821a163c630a37375fe4c071ab78..1842dd57fa02a265f78b98e6d1374d9fcbb47104 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.213",
+      "mac": "00:18:FE:FA:36:B0",
       "network_address": "grelon-113.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.213",
+      "mac": "00:18:FE:FA:36:B1",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.213",
+      "pdu": "pdu31",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "17",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json
index 384374ccb11b973d5517581aa4f7243fa22bd455..42c02b34fc89fc2465ed3ba3d4bd5161a02ed4b8 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.214",
+      "mac": "00:17:A4:FF:5D:AA",
       "network_address": "grelon-114.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.214",
+      "mac": "00:17:A4:FF:5D:AB",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.214",
+      "pdu": "pdu32",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "18",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json
index 8c353aba13eb49e57fff06df240b2b25c24043e4..17cec7f4d3ee41807cdd65f30764ae2cc0c17917 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.215",
+      "mac": "00:18:FE:FA:44:D4",
       "network_address": "grelon-115.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.215",
+      "mac": "00:18:FE:FA:44:D5",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.215",
+      "pdu": "pdu31",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "19",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json
index b728bea2197dac1e897200cc15c08164d5cc6d73..8567cadd9f59fa82787aa6b71f456724cf2a5a64 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.216",
+      "mac": "00:18:FE:FA:45:34",
       "network_address": "grelon-116.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.216",
+      "mac": "00:18:FE:FA:45:35",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.216",
+      "pdu": "pdu32",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "20",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json
index d67f0c12b43245456670cf3eeaabea709456e416..07c0337716852f03510dd9288f12383c621bbf92 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.217",
+      "mac": "00:18:FE:FA:63:60",
       "network_address": "grelon-117.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.217",
+      "mac": "00:18:FE:FA:63:61",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.217",
+      "pdu": "pdu31",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "21",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json
index e8f550c86464e03303fbd9664352a1a791f934a8..e78b53d58f3a6c09b639f7b624140bec0818acbf 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.218",
+      "mac": "00:18:FE:FA:44:DE",
       "network_address": "grelon-118.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.218",
+      "mac": "00:18:FE:FA:44:DF",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.218",
+      "pdu": "pdu32",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "22",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json
index 490d6ca7ca6e9ce4949a11c23fbef73a2a3dc928..da8a58c30cfd36c6b5d41514b565aa0893af6c58 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.219",
+      "mac": "00:18:FE:FA:52:7C",
       "network_address": "grelon-119.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.219",
+      "mac": "00:18:FE:FA:52:7D",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.219",
+      "pdu": "pdu31",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "23",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json
index 4dab6c45b81a28fe0ada04af538bcf416ef8ffb6..73f0c13e91e9f1cb6105a6186511618fdf246f9e 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.112",
+      "mac": "00:18:FE:FA:52:48",
       "network_address": "grelon-12.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.112",
+      "mac": "00:18:FE:FA:52:49",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.112",
+      "pdu": "pdu72",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "12",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json
index 141d2f3a53b4839a869319ebcb756dd741042b00..94a169e1d5388ea8e4da7fc5d1d5510d69bcfcff 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.220",
+      "mac": "00:18:FE:FA:46:2A",
       "network_address": "grelon-120.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.220",
+      "mac": "00:18:FE:FA:46:2B",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.220",
+      "pdu": "pdu32",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "24",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json
index dc44efceaf98c0a71773573c7fc69d77fc8eb669..e91c63a44a8308606aea917e057fd09f23a1b889 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.113",
+      "mac": "00:18:FE:FA:46:26",
       "network_address": "grelon-13.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.113",
+      "mac": "00:18:FE:FA:46:27",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.113",
+      "pdu": "pdu71",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "13",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json
index 43bb9f72cc1c5e28dabcd5e223b41f4b053d1b25..654aa9280ee59654e61b60e30dee4e76aad04070 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.114",
+      "mac": "00:18:FE:FA:36:56",
       "network_address": "grelon-14.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.114",
+      "mac": "00:18:FE:FA:36:57",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.114",
+      "pdu": "pdu72",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "14",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json
index ca712ebe7aa418028a7aafce27385556abba07ca..1fb58519c03e123718fd7aa370fcd567e1eea998 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.115",
+      "mac": "00:18:FE:FA:63:48",
       "network_address": "grelon-15.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.115",
+      "mac": "00:18:FE:FA:63:49",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.115",
+      "pdu": "pdu71",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "15",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json
index 99f9b874152a4ab6ab7bde282f4cd55aa0d009fe..8e98a66289d13a9d824da90d0165d071da8a26b3 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.116",
+      "mac": "00:18:FE:FA:45:7E",
       "network_address": "grelon-16.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.116",
+      "mac": "00:18:FE:FA:45:7F",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.116",
+      "pdu": "pdu72",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "16",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json
index 1e1e0c6c54610d48aa24c26fa207062b611f1dba..630567ea22a6e9155a4b27a9f0e8a203581b8675 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.117",
+      "mac": "00:18:FE:FA:43:DE",
       "network_address": "grelon-17.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.117",
+      "mac": "00:18:FE:FA:43:DF",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.117",
+      "pdu": "pdu71",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "17",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json
index 09ad252d1388334d744720b57612d0c41f7f2b30..c0ae727202b3efd010cac750b5bd2e3e943e670c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.118",
+      "mac": "00:18:FE:28:3E:B6",
       "network_address": "grelon-18.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.118",
+      "mac": "00:18:FE:28:3E:B7",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.118",
+      "pdu": "pdu72",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "18",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json
index e2f24addc511a92a288fc5e297640f322f2686a6..e2d6d60f1307825ae191f232fc0d892e029b727d 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.119",
+      "mac": "00:18:FE:FA:25:AE",
       "network_address": "grelon-19.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.119",
+      "mac": "00:18:FE:FA:25:AF",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.119",
+      "pdu": "pdu71",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "19",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json
index 28467bb8da3dfd214d96eb3c85de2733978a6e13..18fb1c9f5e60e8c515900a1a5df61bd25b6866c9 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.102",
+      "mac": "00:18:FE:FA:46:48",
       "network_address": "grelon-2.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.102",
+      "mac": "00:18:FE:FA:46:49",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.102",
+      "pdu": "pdu72",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "2",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json
index 2469400cd3c97a4bcd5c5e1274deed9b15da6edb..7dfa845dc5c5c048bb1f38207db80edc6df189cf 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.120",
+      "mac": "00:18:FE:FA:52:30",
       "network_address": "grelon-20.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.120",
+      "mac": "00:18:FE:FA:52:31",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.120",
+      "pdu": "pdu72",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "20",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json
index 78c38c9b1192f862ac08f35cf42876e025ee1c06..4d42a4ea70580702132290172294561f25a6319a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.121",
+      "mac": "00:18:FE:FA:44:BE",
       "network_address": "grelon-21.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.121",
+      "mac": "00:18:FE:FA:44:BF",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.121",
+      "pdu": "pdu71",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "21",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json
index 91b99b77e72ad5a93f5c7f9d03752e3ba588061e..7332035a1350c5a33273bafc3d3f2a8721e10672 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.122",
+      "mac": "00:18:FE:FA:45:06",
       "network_address": "grelon-22.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.122",
+      "mac": "00:18:FE:FA:45:07",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.122",
+      "pdu": "pdu72",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "22",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json
index a6182ca94af2d3b683f26bf6dab5436e2144cb2c..34d6b3ed3a660293bbac1e8a01a555cfd27f420c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.123",
+      "mac": "00:18:FE:FA:45:20",
       "network_address": "grelon-23.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.123",
+      "mac": "00:18:FE:FA:45:21",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.123",
+      "pdu": "pdu71",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "23",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json
index c608f6738ac5645eb07df700a60e1a5b998f2af7..3b347049c1e45c00f1e86a01e5d0de2e906a269b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.124",
+      "mac": "00:18:FE:FA:63:42",
       "network_address": "grelon-24.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.124",
+      "mac": "00:18:FE:FA:63:43",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.124",
+      "pdu": "pdu72",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "24",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json
index 940507f993b8ad77d86bf712cad6c8d3d4c435a8..ea63c2f9a0a8b638078a16431f4e70954dace5c6 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.125",
+      "mac": "00:18:FE:FA:53:22",
       "network_address": "grelon-25.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.125",
+      "mac": "00:18:FE:FA:53:23",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.125",
+      "pdu": "pdu61",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "1",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json
index 86c22c9f02208ea1b26594920bd7814eb23de8af..770abac8e4fc2389976197e10d10403b2840796e 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.126",
+      "mac": "00:18:FE:FA:52:88",
       "network_address": "grelon-26.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.126",
+      "mac": "00:18:FE:FA:52:89",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.126",
+      "pdu": "pdu62",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "2",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json
index 92326bd858565f8e26a93a7b5d8cbf46d4aab246..f5875cb333afa59776010f8efee309dd72dedde7 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.127",
+      "mac": "00:18:FE:FA:44:A2",
       "network_address": "grelon-27.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.127",
+      "mac": "00:18:FE:FA:44:A3",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.127",
+      "pdu": "pdu61",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "3",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json
index 6de7e2bdde006e401abd6d0b78caad4c2ebf92a6..13c147c41d8eb457f565fe1de00fe18548f83edd 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.128",
+      "mac": "00:18:FE:FA:52:12",
       "network_address": "grelon-28.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.128",
+      "mac": "00:18:FE:FA:52:13",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.128",
+      "pdu": "pdu62",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "4",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json
index 86a413c412b310fa0e117b74e596775f34092775..d4c121a99f15296f9a9e82ab91f1b1941e1b5f38 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.129",
+      "mac": "00:18:FE:FA:46:DA",
       "network_address": "grelon-29.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.129",
+      "mac": "00:18:FE:FA:46:DB",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.129",
+      "pdu": "pdu61",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "5",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json
index 6daa63063cac264dd637c4ba95dd4b66df0c5327..3f7b3ab2c5e190881e90ad5a0630cc104bba3009 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.103",
+      "mac": "00:18:FE:FA:45:1E",
       "network_address": "grelon-3.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.103",
+      "mac": "00:18:FE:FA:45:1F",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.103",
+      "pdu": "pdu71",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "3",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json
index 1e5cb19e9d6b5d6b711bc03854819380960038b0..4c5fb456ae42534dd7644f6193c9eb07f91d0aa9 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.130",
+      "mac": "00:18:FE:FA:52:1E",
       "network_address": "grelon-30.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.130",
+      "mac": "00:18:FE:FA:52:1F",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.130",
+      "pdu": "pdu62",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "6",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json
index 472a3455cba9d943c0e197ab5d07945da9b1ca09..8c4237299411af241b50d8949b3bbd2bee815d64 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.131",
+      "mac": "00:18:FE:FA:46:E0",
       "network_address": "grelon-31.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.131",
+      "mac": "00:18:FE:FA:46:E1",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.131",
+      "pdu": "pdu61",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "7",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json
index 647add7625f31215e3c6735579f5419d10e73b6d..f9f407790821854b74fee59116c0a722b3567359 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.132",
+      "mac": "00:18:FE:FA:46:92",
       "network_address": "grelon-32.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.132",
+      "mac": "00:18:FE:FA:46:93",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.132",
+      "pdu": "pdu62",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "8",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json
index a1ff6f0e5067c6e70709b7ac5a5608a6eb1aea8c..d8d196aac04147f90c9bc4b015e5c9b5ddf12b76 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.133",
+      "mac": "00:18:FE:FA:52:2A",
       "network_address": "grelon-33.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.133",
+      "mac": "00:18:FE:FA:52:2B",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.133",
+      "pdu": "pdu61",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "9",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json
index 124039c792cdb10726843d5faa67d0807c66f938..f323999261b75d93814d09658645da2506126d57 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.134",
+      "mac": "00:18:FE:FA:53:1A",
       "network_address": "grelon-34.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.134",
+      "mac": "00:18:FE:FA:53:1B",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.134",
+      "pdu": "pdu62",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "10",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json
index 45ddbbc2ea2ddc8d7721c354a6d05019f0cb952b..f7c174c9dce6db23a53f18f74d2968ac94735dbf 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.135",
+      "mac": "00:18:FE:FA:52:08",
       "network_address": "grelon-35.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.135",
+      "mac": "00:18:FE:FA:52:09",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.135",
+      "pdu": "pdu61",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "11",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json
index 4e8ec17430f6b24d7abfabdcf44b279ef44c23a1..5982a15dd03595fea91128836cf848673a55754b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.136",
+      "mac": "00:18:FE:FA:52:84",
       "network_address": "grelon-36.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.136",
+      "mac": "00:18:FE:FA:52:85",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.136",
+      "pdu": "pdu62",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "12",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json
index 0df0df8885a54375470e38c32ec76b1654e1023e..3220d3ea36816e33f3b9d793d7b85dfd85c9047e 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.137",
+      "mac": "00:18:FE:FA:42:E4",
       "network_address": "grelon-37.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.137",
+      "mac": "00:18:FE:FA:42:E5",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.137",
+      "pdu": "pdu61",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "13",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json
index 281e51cfb8d00cdffbdea72278ecb237d0ada026..48f4344f3d3110ba24955b52f1cf8651b4f7cba0 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.138",
+      "mac": "00:18:FE:FA:53:9A",
       "network_address": "grelon-38.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.138",
+      "mac": "00:18:FE:FA:53:9B",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.138",
+      "pdu": "pdu62",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "14",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json
index 336b5a0819a38d9c86ac4b7cdc29079bd088ec3f..3c9a02c2b5a835dc2e817632f191ef58adf3fea1 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.139",
+      "mac": "00:18:FE:FA:45:E2",
       "network_address": "grelon-39.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.139",
+      "mac": "00:18:FE:FA:45:E3",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.139",
+      "pdu": "pdu61",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "15",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json
index ed771de79165a5a932fb6a956948451af89d1bf7..bfc667b0f08ed22ee1311d5c33418d5bc5c543b2 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.104",
+      "mac": "00:18:FE:FA:63:62",
       "network_address": "grelon-4.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.104",
+      "mac": "00:18:FE:FA:63:63",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.104",
+      "pdu": "pdu72",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "4",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json
index 2a3347bd3790a558b43f6c15ac030e27c6c25103..1375a05b4481cda4108a65e5b3937e35867f2432 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.140",
+      "mac": "00:18:FE:28:9E:BA",
       "network_address": "grelon-40.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.140",
+      "mac": "00:18:FE:28:9E:BB",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.140",
+      "pdu": "pdu62",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "16",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json
index b52043d0c19029ca840487f9567daff6db86919c..75d460e69216aa6ce08f0c4e207ee0f42dd36377 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.141",
+      "mac": "00:18:FE:FA:42:B2",
       "network_address": "grelon-41.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.141",
+      "mac": "00:18:FE:FA:42:B3",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.141",
+      "pdu": "pdu61",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "17",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json
index fd42ac6be1ecff850705c593573b7f968cf9cd88..d66b0def9156a48406d0e49000782ce9bbde53fb 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.142",
+      "mac": "00:18:FE:FA:52:04",
       "network_address": "grelon-42.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.142",
+      "mac": "00:18:FE:FA:52:05",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.142",
+      "pdu": "pdu62",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "18",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json
index ba51a1bad0eb6eaf29529b4c2a737cb1f682d7e1..3aa7af26f63bd5f4413bb7549be3a406a2383b33 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.143",
+      "mac": "00:18:FE:FA:52:D6",
       "network_address": "grelon-43.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.143",
+      "mac": "00:18:FE:FA:52:D7",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.143",
+      "pdu": "pdu61",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "19",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json
index 804baac30f38499c6e534149df30e09219e22074..7c9179b3908e32565ba821c9bd8360811e91a0e2 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.144",
+      "mac": "00:18:FE:FA:45:DC",
       "network_address": "grelon-44.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.144",
+      "mac": "00:18:FE:FA:45:DD",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.144",
+      "pdu": "pdu62",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "20",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json
index 1e14731f367bdefe97cabc55788a9227a23af9fd..f7ad13d4cae71c76475e52d54780dd4f6eb9b891 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.145",
+      "mac": "00:18:FE:FA:45:02",
       "network_address": "grelon-45.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.145",
+      "mac": "00:18:FE:FA:45:03",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.145",
+      "pdu": "pdu61",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "21",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json
index 6712b660c2e95af5e3c00f53ed9e53edc8d9009c..9882f635f49decf4af5f279aea9284b9c24b5524 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.146",
+      "mac": "00:18:FE:FA:53:B2",
       "network_address": "grelon-46.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.146",
+      "mac": "00:18:FE:FA:53:B3",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.146",
+      "pdu": "pdu62",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "22",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json
index e445404b7ceacf52d5e7c5b4b532d0d5d5e55bfe..3fc5d42a8c9e7d0d12673b4879feeb17f63386e1 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.147",
+      "mac": "00:18:FE:FA:36:F2",
       "network_address": "grelon-47.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.147",
+      "mac": "00:18:FE:FA:36:F3",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.147",
+      "pdu": "pdu61",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "23",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json
index 2bd95ed9373a2fb171ab6b30b5eec7ab785e888a..a30f5a7368f6213cb018c51bdb1bb207f6f21556 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.148",
+      "mac": "00:18:FE:FA:53:AE",
       "network_address": "grelon-48.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon2",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.148",
+      "mac": "00:18:FE:FA:53:AF",
       "rate": 1000000000,
+      "switch": "sgrelon2",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.148",
+      "pdu": "pdu62",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade2",
+      "switch_port": "24",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json
index 6faacfa972549c3f6039393fb33374fe4eb0a498..4f1a7578c90d550e65015b6c63853eda8f7e43dc 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.149",
+      "mac": "00:18:FE:FA:44:A0",
       "network_address": "grelon-49.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.149",
+      "mac": "00:18:FE:FA:44:A1",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.149",
+      "pdu": "pdu51",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "1",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json
index 08c6befb889d2b00e2f3509295f25cc17cb59b54..b6b25ca948f65a20f91528f3cd5c7662d3bf0bc8 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.105",
+      "mac": "00:18:FE:FA:52:42",
       "network_address": "grelon-5.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.105",
+      "mac": "00:18:FE:FA:52:43",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.105",
+      "pdu": "pdu71",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "5",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json
index 24f7820aaf7629ed0047e202baa81d873dfbc085..1edca911aed64eb1f9e54c06520ecc7955a4a308 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.150",
+      "mac": "00:19:BB:EB:03:5A",
       "network_address": "grelon-50.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.150",
+      "mac": "00:19:BB:EB:03:5B",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.150",
+      "pdu": "pdu52",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "2",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json
index 42c8601232733fd50f4e1ba96ed5395db5ae1bf2..2497c820f615ac5e063993e5eddba4cbd6840786 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.151",
+      "mac": "00:18:FE:28:EC:3A",
       "network_address": "grelon-51.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.151",
+      "mac": "00:18:FE:28:EC:3B",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.151",
+      "pdu": "pdu51",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "3",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json
index da55085f42c512c8bae9d3c7d1435c684df0cdce..bf429ff476c22f62478fb00162635f43a359a0de 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.152",
+      "mac": "00:19:BB:EB:04:60",
       "network_address": "grelon-52.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.152",
+      "mac": "00:19:BB:EB:04:61",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.152",
+      "pdu": "pdu52",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "4",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json
index d83ae76b3b56bf8ee8e053eb5b8396f00850c0fd..6602e59c4565154fa4c063cd9f77c0848b3c34a4 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.153",
+      "mac": "00:19:BB:EB:04:4C",
       "network_address": "grelon-53.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.153",
+      "mac": "00:19:BB:EB:04:4D",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.153",
+      "pdu": "pdu51",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "5",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json
index 1b184bd41c9c7e3e4cab6d673fcbc3145a9cfbab..f9bd7f2a3cff16890c42b7d2b078d5c7f50e1157 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.154",
+      "mac": "00:19:BB:EB:03:4E",
       "network_address": "grelon-54.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.154",
+      "mac": "00:19:BB:EB:03:4F",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.154",
+      "pdu": "pdu52",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "6",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json
index dc38a057ee57c7d39f067963c43231b116b1d7a2..4c6c711cffb20574ecf381edc7dc039b519f0afe 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.155",
+      "mac": "00:19:BB:EB:03:AE",
       "network_address": "grelon-55.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.155",
+      "mac": "00:19:BB:EB:03:AF",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.155",
+      "pdu": "pdu51",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "7",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json
index 6bf2340dabc751e9df9dbccc074417b212def0c7..9311e7eb7638f3bc2fa669b8cf84572413f299d3 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.156",
+      "mac": "00:19:BB:EB:03:8C",
       "network_address": "grelon-56.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.156",
+      "mac": "00:19:BB:EB:03:8D",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.156",
+      "pdu": "pdu52",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "8",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json
index 0569fae24757361e191b22c04ccc5dba426725b1..546b48a655492987e455d8dd31506c5db159f5a2 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.157",
+      "mac": "00:19:BB:EB:C4:06",
       "network_address": "grelon-57.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.157",
+      "mac": "00:19:BB:EB:C4:07",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.157",
+      "pdu": "pdu51",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "9",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json
index e5b895d9280af170ae4835abd3fe3d6288794a27..b1d9100037958635d34472904aea5f8005a71200 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.158",
+      "mac": "00:19:BB:EB:C3:54",
       "network_address": "grelon-58.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.158",
+      "mac": "00:19:BB:EB:C3:55",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.158",
+      "pdu": "pdu52",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "10",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json
index f1bbf29db7ad9f5918359bf619164a95c3143d4d..9af8d57a040ad3689570e429c19d26cd5cddc6c8 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.159",
+      "mac": "00:19:BB:EB:C4:38",
       "network_address": "grelon-59.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.159",
+      "mac": "00:19:BB:EB:C4:39",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.159",
+      "pdu": "pdu51",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "11",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json
index edb4940ecfa93aefbdb3f7c541bcdf7b42b98fd0..929ea609c70ff532852bf1d6c2f151efb0cd9e95 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.106",
+      "mac": "00:18:FE:FA:45:9E",
       "network_address": "grelon-6.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.106",
+      "mac": "00:18:FE:FA:45:9F",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.106",
+      "pdu": "pdu72",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "6",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json
index 946d05e5a206a2e703e4c9166e55807dc3c04aa8..47b6605aea9e4bd1199bd0fcb52f9c60d5000fb3 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.160",
+      "mac": "00:19:BB:EB:C3:5E",
       "network_address": "grelon-60.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.160",
+      "mac": "00:19:BB:EB:C3:5F",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.160",
+      "pdu": "pdu52",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "12",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json
index 1ed8060c3a63aa4fec87a2a1be6388c526863117..3539319f96f03d385f4bd2d586b75548f82419c1 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.161",
+      "mac": "00:19:BB:EB:C3:60",
       "network_address": "grelon-61.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.161",
+      "mac": "00:19:BB:EB:C3:61",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.161",
+      "pdu": "pdu51",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "13",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json
index 35989b74da4aaae636c4a7a31f382facbd6710e3..c6d7e4367490b1744bd4183893c546b9bd9f6126 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.162",
+      "mac": "00:19:BB:EB:C3:5C",
       "network_address": "grelon-62.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.162",
+      "mac": "00:19:BB:EB:C3:5D",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.162",
+      "pdu": "pdu52",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "14",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json
index eace777f6d42fd50999bbcbc1a40533238476245..c34af0750f9a4d5d5f395af0ac1102171abcfb09 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.163",
+      "mac": "00:17:A4:FF:8E:D2",
       "network_address": "grelon-63.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.163",
+      "mac": "00:17:A4:FF:8E:D3",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.163",
+      "pdu": "pdu51",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "15",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json
index 22fc8b97033399c834d568b434026195650c690b..97bbbc3756df91f2ab083abedcbd56b1a4b989cc 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.164",
+      "mac": "00:18:FE:FA:36:A6",
       "network_address": "grelon-64.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.164",
+      "mac": "00:18:FE:FA:36:A7",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.164",
+      "pdu": "pdu52",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "16",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json
index cc0c67c7946ac2e335cce2ad720a65dea6b27aab..4ef7620874aff06f60b6395d00f7f9a9dfa97613 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.165",
+      "mac": "00:19:BB:EB:03:DA",
       "network_address": "grelon-65.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.165",
+      "mac": "00:19:BB:EB:03:DB",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.165",
+      "pdu": "pdu51",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "17",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json
index 2f4a79807f4a0d1484d5476004c2955b3f8a97bb..bfbe64ecd12898a317d5ff639b54aa1984ea32d4 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.166",
+      "mac": "00:18:FE:FA:73:18",
       "network_address": "grelon-66.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.166",
+      "mac": "00:18:FE:FA:73:19",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.166",
+      "pdu": "pdu52",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "18",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json
index afc4562d90caef69465aa170b3fa93b6502466dc..979aa7d20542c9bdf08c3e78ca546606c6eb8db0 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.167",
+      "mac": "00:19:BB:EB:C3:58",
       "network_address": "grelon-67.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.167",
+      "mac": "00:19:BB:EB:C3:59",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.167",
+      "pdu": "pdu51",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "19",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json
index 9554e054d72b4b892dd9e10a3c21ada169dc17e7..92f6257a663c7b9ded94a88563c276d274805841 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.168",
+      "mac": "00:18:FE:29:B0:A8",
       "network_address": "grelon-68.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.168",
+      "mac": "00:18:FE:29:B0:A9",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.168",
+      "pdu": "pdu52",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "20",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json
index ffbddbe6b78aef31d830e075afceb836ec7642d9..e2d43c410a744f662b890292282f4ce0f8f83bd6 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.169",
+      "mac": "00:19:BB:EB:03:E0",
       "network_address": "grelon-69.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.169",
+      "mac": "00:19:BB:EB:03:E1",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.169",
+      "pdu": "pdu51",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "21",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json
index d048cac38996af6eab20e6d2c680df4fbdef39e1..c2cd372b9b0733afe3ad4dfbb1b3822c0fa38698 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.107",
+      "mac": "00:18:FE:FA:45:C0",
       "network_address": "grelon-7.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.107",
+      "mac": "00:18:FE:FA:45:C1",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.107",
+      "pdu": "pdu71",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "7",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json
index fe219b666a2dd4a20a7667eb3c10ee72701aa0f8..b24a93cc697b316e953dde6c064eba7dde4322a3 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.170",
+      "mac": "00:19:BB:EB:C3:F0",
       "network_address": "grelon-70.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.170",
+      "mac": "00:19:BB:EB:C3:F1",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.170",
+      "pdu": "pdu52",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "22",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json
index 0ae61864f908a6a5c447167434df21d2462b1ea5..892b759e586522778f991c22d00c470c43f51caf 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.171",
+      "mac": "00:19:BB:EB:C3:74",
       "network_address": "grelon-71.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.171",
+      "mac": "00:19:BB:EB:C3:75",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.171",
+      "pdu": "pdu51",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "23",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json
index 79b99472e5ad6640ea00117c2567100d661c303e..3ebc4148dcb10f48235a4e14690c52ec7d66d32e 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.172",
+      "mac": "00:19:BB:EB:C3:76",
       "network_address": "grelon-72.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon3",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.172",
+      "mac": "00:19:BB:EB:C3:77",
       "rate": 1000000000,
+      "switch": "sgrelon3",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.172",
+      "pdu": "pdu52",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade3",
+      "switch_port": "24",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json
index d3f5ab3742e196c09d7b05dc63334afb8bb44f73..f58f03520cac5837b87401a24c3cfc3b7f5b8cf1 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.173",
+      "mac": "00:18:FE:FA:44:AA",
       "network_address": "grelon-73.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.173",
+      "mac": "00:18:FE:FA:44:AB",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.173",
+      "pdu": "pdu41",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "1",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json
index 5b9a7f53817ae91fc73b664903e235e741f0ed9e..af5d7c3a64ed8d145edff74b940a44927c7f8347 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.174",
+      "mac": "00:18:FE:FA:42:5A",
       "network_address": "grelon-74.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.174",
+      "mac": "00:18:FE:FA:42:5B",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.174",
+      "pdu": "pdu42",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "2",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json
index d9a6bbebeaf1762799ca4e4ba7104614f79d5c7f..c1bc2464d7ce38732f06bdcee6f90a53737220eb 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.175",
+      "mac": "00:18:FE:FA:42:E8",
       "network_address": "grelon-75.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.175",
+      "mac": "00:18:FE:FA:42:E9",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.175",
+      "pdu": "pdu41",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "3",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json
index f1833114451f8395a740865cac90a3dc01b43f62..3cc7d7dce5a6da2aa59cbe4dee4e6c25179d8da8 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.176",
+      "mac": "00:18:FE:FA:52:98",
       "network_address": "grelon-76.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.176",
+      "mac": "00:18:FE:FA:52:99",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.176",
+      "pdu": "pdu42",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "4",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json
index 2425c9de594e3eb02c652f7dfbf76262ab80fdc3..53099bac14951c4835b3a633c9521632add8e1c0 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.177",
+      "mac": "00:18:FE:FA:43:A8",
       "network_address": "grelon-77.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.177",
+      "mac": "00:18:FE:FA:43:A9",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.177",
+      "pdu": "pdu41",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "5",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json
index 3bbc77b6b2191460f2237780fa971ec202be4573..bf143964c147c571d23f03d9a4f77563911e4be1 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.178",
+      "mac": "00:18:FE:FA:45:58",
       "network_address": "grelon-78.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.178",
+      "mac": "00:18:FE:FA:45:59",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.178",
+      "pdu": "pdu42",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "6",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json
index b0a281fb219f983169a5bb84920bdfff68404c67..5237d841fb2bda4715079595dc0eb31418af8fde 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.179",
+      "mac": "00:18:FE:FA:46:C4",
       "network_address": "grelon-79.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.179",
+      "mac": "00:18:FE:FA:46:C5",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.179",
+      "pdu": "pdu41",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "7",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json
index 3d0274a956c0af582f0bf0e03403a673f571fe14..e4ef8c86abdf710bbdea7a1cc3719e52a714a1a8 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.108",
+      "mac": "00:18:FE:FA:45:DA",
       "network_address": "grelon-8.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.108",
+      "mac": "00:18:FE:FA:45:DB",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.108",
+      "pdu": "pdu72",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "8",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json
index 9af12f0add5e76cde27bfb2b5cf739f3ea1fcefc..24e61852b5ecb7127e0d078613fd1916740f3436 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.180",
+      "mac": "00:18:FE:FA:46:D6",
       "network_address": "grelon-80.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.180",
+      "mac": "00:18:FE:FA:46:D7",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.180",
+      "pdu": "pdu42",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "8",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json
index 84ea284daa2f250e96ff72fca356eacffcae917d..94f1fab78de0d5ca7351dabf58f5bdd48e55d7a4 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.181",
+      "mac": "00:18:FE:FA:46:40",
       "network_address": "grelon-81.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.181",
+      "mac": "00:18:FE:FA:46:41",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.181",
+      "pdu": "pdu41",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "9",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json
index efb8eb40523c7f52ebebc7176b342797047ba62d..18de860c5a08d9bc402e6f345541fed5982b5b2f 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.182",
+      "mac": "00:18:FE:FA:43:3E",
       "network_address": "grelon-82.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.182",
+      "mac": "00:18:FE:FA:43:3F",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.182",
+      "pdu": "pdu42",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "10",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json
index 4c9de096a5c834ab1fd0a5f418c171615f087290..fc0494e948b05664e60321b1ff97b364611cd38a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.183",
+      "mac": "00:18:FE:FA:52:6C",
       "network_address": "grelon-83.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.183",
+      "mac": "00:18:FE:FA:52:6D",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.183",
+      "pdu": "pdu41",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "11",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json
index 25a8f7a1b54ab64762fb21195410f88fbdd17bb4..6fbdf8df6dac8ff796724b10bd51db493b7fd072 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.184",
+      "mac": "00:18:FE:FA:52:20",
       "network_address": "grelon-84.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.184",
+      "mac": "00:18:FE:FA:52:21",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.184",
+      "pdu": "pdu42",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "12",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json
index ca9f4860f9314948b6c4b278c02dfe0a728749b7..179c4401ca3230c5655d250fafd15c1a20f40629 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.185",
+      "mac": "00:18:FE:FA:24:3A",
       "network_address": "grelon-85.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.185",
+      "mac": "00:18:FE:FA:24:3B",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.185",
+      "pdu": "pdu41",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "13",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json
index 4087e64f84daf4b207a57bac8b3ce2aa9dbde3c9..67de61ecca48d04ddad4ace5a2ae5c63ced86eb1 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.186",
+      "mac": "00:18:FE:FA:25:14",
       "network_address": "grelon-86.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.186",
+      "mac": "00:18:FE:FA:25:15",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.186",
+      "pdu": "pdu42",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "14",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json
index ba6f47067c96ad1a4b17eff0565fa17563db5fa4..aa719ec88714ab565e9799b0bcecf12c1889d75a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.187",
+      "mac": "00:18:FE:FA:44:9A",
       "network_address": "grelon-87.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.187",
+      "mac": "00:18:FE:FA:44:9B",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.187",
+      "pdu": "pdu41",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "15",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json
index f5d1d55c9fa8586710543450d388f804a016ca58..532f6bb19d7eec843e068d7daf9e4a287a5eb512 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.188",
+      "mac": "00:18:FE:FA:44:C4",
       "network_address": "grelon-88.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.188",
+      "mac": "00:18:FE:FA:44:C5",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.188",
+      "pdu": "pdu42",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "16",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json
index ba746b5e23b4bf5743497b6daa2a42e8d539720f..2a9e8c4127ec58147dfcc5c3e08678296d1d15fc 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.189",
+      "mac": "00:18:FE:FA:44:F2",
       "network_address": "grelon-89.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.189",
+      "mac": "00:18:FE:FA:44:F3",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.189",
+      "pdu": "pdu41",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "17",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json
index 835e9684e188563e531633f5c414686a25f97862..767a07488bef94589921c2ceb4a84be96d3ec07a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.109",
+      "mac": "00:18:FE:FA:53:2A",
       "network_address": "grelon-9.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrelon1",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.109",
+      "mac": "00:18:FE:FA:53:2B",
       "rate": 1000000000,
+      "switch": "sgrelon1",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.109",
+      "pdu": "pdu71",
+      "pdu_port": "X2",
+      "rate": 100000000,
+      "switch": "sgrenade1",
+      "switch_port": "9",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json
index 41ce51374e7ad2456a2ba34cf3f3c57f6815243b..4c70202def55da01b0fc00666d3a389ef64cc553 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.190",
+      "mac": "00:18:FE:FA:44:B6",
       "network_address": "grelon-90.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.190",
+      "mac": "00:18:FE:FA:44:B7",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.190",
+      "pdu": "pdu42",
+      "pdu_port": "X3",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "18",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json
index 9cb103f1739d9ceea4584f571d9dbfff847f11dd..e909025dd8fe24ee74c39f9cccf69120d5dc0893 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.191",
+      "mac": "00:18:FE:FA:44:B2",
       "network_address": "grelon-91.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.191",
+      "mac": "00:18:FE:FA:44:B3",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.191",
+      "pdu": "pdu41",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "19",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json
index 02a3c6aecf044e192c5f311fdf421fb71759de09..708aab92a63b9dcfc7685d07322f1173eb0f4e2b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.192",
+      "mac": "00:18:FE:FA:23:3C",
       "network_address": "grelon-92.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.192",
+      "mac": "00:18:FE:FA:23:3D",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.192",
+      "pdu": "pdu42",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "20",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json
index 702220853a76f57476a201c54d15eeb8aa0abfdc..07332663b0fc27147b1ef31a6be024e5e92c3e01 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.193",
+      "mac": "00:18:FE:FA:43:88",
       "network_address": "grelon-93.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.193",
+      "mac": "00:18:FE:FA:43:89",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.193",
+      "pdu": "pdu41",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "21",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json
index a17361a65e40f4f4bb5b75dcc385d44abee34abe..1946b4dac4519ed53c42e6384c39bf12114af726 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.194",
+      "mac": "00:18:FE:FA:43:7E",
       "network_address": "grelon-94.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.194",
+      "mac": "00:18:FE:FA:43:7F",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.194",
+      "pdu": "pdu42",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "22",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json
index aff2da54410c39758e047e4e50cb80e0db7b85db..8f36bd75a7aac9dd6798c0654d7560c65a552754 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.195",
+      "mac": "00:18:FE:FA:43:AE",
       "network_address": "grelon-95.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.195",
+      "mac": "00:18:FE:FA:43:AF",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.195",
+      "pdu": "pdu41",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "23",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json
index 67ab77dcda93efaea4fe847c02c681e223b8313e..291dfcba1e89e185f48329161cb32ecbf00f6dbc 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.196",
+      "mac": "00:18:FE:FA:44:AE",
       "network_address": "grelon-96.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon4",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.196",
+      "mac": "00:18:FE:FA:44:AF",
       "rate": 1000000000,
+      "switch": "sgrelon4",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.196",
+      "pdu": "pdu42",
+      "pdu_port": "X4",
+      "rate": 100000000,
+      "switch": "sgrenade4",
+      "switch_port": "24",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json
index d0f8d3268210d378d5b7c9c422c084530b7cc805..14d4832738c18225e966825cae2d19115a9ddd0e 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.197",
+      "mac": "00:18:FE:FA:52:50",
       "network_address": "grelon-97.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.197",
+      "mac": "00:18:FE:FA:52:51",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.197",
+      "pdu": "pdu31",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "1",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json
index f2bf979997dd302a51274a024ecd22f4cc9d34f3..daa0b86866441f33acf3eb9a294c08aa5522caf7 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.198",
+      "mac": "00:18:FE:FA:53:12",
       "network_address": "grelon-98.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.198",
+      "mac": "00:18:FE:FA:53:13",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.198",
+      "pdu": "pdu32",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "2",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json
index 2225b92d0ba566dd7f744b6cb38d7189c5a0d4e2..239cdea9f32cc2a5dac7b7ea28ec81b106bdf686 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.199",
+      "mac": "00:18:FE:FA:46:94",
       "network_address": "grelon-99.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgrelon1",
+      "switch": "sgrelon5",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -24,9 +26,25 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
+      "ip": "172.28.55.199",
+      "mac": "00:18:FE:FA:46:95",
       "rate": 1000000000,
+      "switch": "sgrelon5",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.199",
+      "pdu": "pdu31",
+      "pdu_port": "X1",
+      "rate": 100000000,
+      "switch": "sgrenade5",
+      "switch_port": "3",
+      "vendor": "hp_ilo",
+      "version": "no"
     }
   ],
   "operating_system": {
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 ec7373ab77fe3aae5072d9ec1442af8864737727..f0e0142a7e135e7e078f499148bc669f9d266609 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.1",
+      "mac": "00:E0:81:B2:C1:88",
       "network_address": "griffon-1.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "1",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.1",
+      "pdu": "pdu1",
+      "pdu_port": "A1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "1",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 54acc7e610248a312ee03f498e3a1c07db06df33..328b1d26ef70c34f7d1c4fe1815872768888552f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.10",
+      "mac": "00:E0:81:B2:C0:A4",
       "network_address": "griffon-10.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "10",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.10",
+      "pdu": "pdu2",
+      "pdu_port": "H1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "10",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 db60a01bbd005d3550e9125457c33021135bf726..c5abd35d04d6289d714797e7117f58d588c477ca 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.11",
+      "mac": "00:E0:81:B2:C2:4C",
       "network_address": "griffon-11.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "25",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.11",
+      "pdu": "pdu1",
+      "pdu_port": "D1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "25",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 1bced2a78d7086e2cdad4616f64e03bae5e7322f..093bbfafa875531472b625dcfbecd61fe8d8da16 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.12",
+      "mac": "00:E0:81:B2:C1:9E",
       "network_address": "griffon-12.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "26",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.12",
+      "pdu": "pdu1",
+      "pdu_port": "E1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "26",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 8dafc139bc3c3e4140eb3da5b42249abde488cba..1de10c6435630fd9238ce0d5dbfea9b19a6438e3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.13",
+      "mac": "00:E0:81:B2:C1:E4",
       "network_address": "griffon-13.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "27",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.13",
+      "pdu": "pdu1",
+      "pdu_port": "F1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "27",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 41bb0eff352c42530fbe1f1eae99f48e0468b189..6c00600a095c0ddf796b9a2b59df58abfb339428 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.14",
+      "mac": "00:E0:81:B1:C0:60",
       "network_address": "griffon-14.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "28",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.14",
+      "pdu": "pdu1",
+      "pdu_port": "G1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "28",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 cbf7f5f529fc70cbd37749e973617ce133109518..bb70952ca43e66795e1d2298e34687e0851c0fc7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.15",
+      "mac": "00:E0:81:B2:C4:C4",
       "network_address": "griffon-15.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "29",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.15",
+      "pdu": "pdu1",
+      "pdu_port": "H1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "29",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 b799591dc1a88de386660eee63f024759e80c6d6..903ae165d35d759e62ac541fe7537350fb41ac5a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.16",
+      "mac": "00:E0:81:B2:BF:A0",
       "network_address": "griffon-16.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "30",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.16",
+      "pdu": "pdu1",
+      "pdu_port": "B2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "30",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 4f02e7deb8e5dda84445398569362e22197ff0e1..0a4276c45d789a42503e0e9e28ae1bcd768dd70d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.17",
+      "mac": "00:E0:81:B2:C2:18",
       "network_address": "griffon-17.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "31",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.17",
+      "pdu": "pdu1",
+      "pdu_port": "C2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "31",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 04ab3020d284cdbad32ce29451ca6d3b2c65a8e8..9b358d760d39ca7881e32a60477c142da3dbd947 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.18",
+      "mac": "00:E0:81:B2:C2:04",
       "network_address": "griffon-18.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "32",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.18",
+      "pdu": "pdu1",
+      "pdu_port": "D2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "32",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 3476cea6f8cdde517147fb7e68f322d800d1d5ac..6e44b2782221392d0c5dc92db878145e9dbb6fe7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.19",
+      "mac": "00:E0:81:B2:C5:60",
       "network_address": "griffon-19.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "33",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.19",
+      "pdu": "pdu1",
+      "pdu_port": "E2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "33",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 3b1487aca185e5702266d123e5911ebab946ffda..2e3699733713035b3ad0531ba6e87974554cace9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.2",
+      "mac": "00:E0:81:B2:C4:BC",
       "network_address": "griffon-2.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "2",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.2",
+      "pdu": "pdu1",
+      "pdu_port": "A2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "2",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 a621c2f742d668bcf57a78177a2f0af604c1e5e5..e83ed34e58964f041d5a2bc26e6ec4d4609167b9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.20",
+      "mac": "00:E0:81:B2:C5:74",
       "network_address": "griffon-20.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "34",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.20",
+      "pdu": "pdu1",
+      "pdu_port": "F2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "34",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 fbc8dcff0b3bb3bbdd2bfbad0a60268afcae55f3..c3ca3301c683696e3eca98fb645b9df4defc0b6b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.21",
+      "mac": "00:E0:81:B2:BF:CC",
       "network_address": "griffon-21.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "35",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.21",
+      "pdu": "pdu1",
+      "pdu_port": "G2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "35",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 5c05db07b0bfa4fa1c6dff83bc544b9629fdee34..69eb87f05e4e4919666aecec619888b8ba36041a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.22",
+      "mac": "00:E0:81:B2:BF:A6",
       "network_address": "griffon-22.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "36",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.22",
+      "pdu": "pdu1",
+      "pdu_port": "H2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "36",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 c5df392943944e8a8ed727a890d56d8992d97cad..077946585236b2f792c32c311b275ade77d9df8a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.23",
+      "mac": "00:E0:81:B2:C1:56",
       "network_address": "griffon-23.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "37",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.23",
+      "pdu": "pdu1",
+      "pdu_port": "B3",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "37",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 b38dfbc73837a8f5b9b05293bf3eee30bf247ac6..13f6b5829119ed3212a692ce98382b667b6b2543 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.24",
+      "mac": "00:E0:81:B2:C2:2E",
       "network_address": "griffon-24.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "38",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.24",
+      "pdu": "pdu1",
+      "pdu_port": "C3",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "38",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 3ca046733dd083e30b9b584bb511b12de6e1be10..6da9ec757729c3577f0c820417496643bb046c0c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.25",
+      "mac": "00:E0:81:B2:BF:E2",
       "network_address": "griffon-25.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "39",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.25",
+      "pdu": "pdu1",
+      "pdu_port": "D3",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "39",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 f971646430646f9bebd895655f308da370518d3b..9092cd162257794b99d0db6d69981048cdf94ad6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.26",
+      "mac": "00:E0:81:B2:C1:C8",
       "network_address": "griffon-26.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "40",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.26",
+      "pdu": "pdu1",
+      "pdu_port": "E3",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "40",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 9f77038553992278ed3255251b3e2487dd4f2653..f7ecefa6ec36a87c8b1b0c40e413f078f08a831f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.27",
+      "mac": "00:E0:81:B2:C0:C4",
       "network_address": "griffon-27.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "41",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.27",
+      "pdu": "pdu1",
+      "pdu_port": "F3",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "41",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 468ac672a387c9ea535bf3e3cc4db638bc0dea58..e5052e2052cf23da541b735830217e490b8a70af 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.28",
+      "mac": "00:E0:81:B2:C0:E5",
       "network_address": "griffon-28.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "42",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.28",
+      "pdu": "pdu1",
+      "pdu_port": "G3",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "42",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 ff941e34510b973583c7313e7cc3dd3e7ea06998..975f79b2c24852640c4cff54fb905f6ed4fdf360 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.29",
+      "mac": "00:E0:81:B2:C4:BO",
       "network_address": "griffon-29.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "43",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.29",
+      "pdu": "pdu1",
+      "pdu_port": "H3",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "43",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 44aaef99e695bf671820283a2ad6b3d1cf353b72..55dc17b8a771e47c784dc7b8627ff3263747eca2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.3",
+      "mac": "00:E0:81:B2:C1:FE",
       "network_address": "griffon-3.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "3",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.3",
+      "pdu": "pdu1",
+      "pdu_port": "A3",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "3",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 a88b205cdd71c9a8f82b05ac9d1c48cfc2e16805..0c895092812ea018a60a6a5a90c30aacf601505f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.30",
+      "mac": "00:E0:81:B2:C0:B4",
       "network_address": "griffon-30.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "1",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.30",
+      "pdu": "pdu4",
+      "pdu_port": "E2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "1",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 ec2f9a34d305a15b59d15692197921c4eb088770..ce822348d803f571e9bff7eaaab29b60c31f85a9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.31",
+      "mac": "00:E0:81:B2:C2:24",
       "network_address": "griffon-31.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "2",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.31",
+      "pdu": "pdu4",
+      "pdu_port": "D2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "2",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 c5b8c48e8290cb532f3b2bb9a51d2961aa22397f..cecaddc446ff2ff6442dd84f97a26f84b696800f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.32",
+      "mac": "00:E0:81:B2:C5:9E",
       "network_address": "griffon-32.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "3",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.32",
+      "pdu": "pdu4",
+      "pdu_port": "C2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "3",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 4f7defdfd2b510ce92f352ff7a92e9d5ef84722a..853cda0d6c3c227e9a17132b336f9f6a1aac402e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.33",
+      "mac": "00:E0:81:B2:BF:FA",
       "network_address": "griffon-33.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "4",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.33",
+      "pdu": "pdu4",
+      "pdu_port": "B2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "4",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 a2c7674b5142c02af9b25e724f2633d52c3553d7..40f1375fe7db270e2e599ba3ef30a49e87cb0219 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.34",
+      "mac": "00:E0:81:B2:54:D6",
       "network_address": "griffon-34.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "5",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.34",
+      "pdu": "pdu4",
+      "pdu_port": "H1",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "5",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 f2d2e437f89d93c6441529ef3b48083f0570ec73..56182e814a67793a428cb4cd397ecdf3ddab44bf 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.35",
+      "mac": "00:E0:81:B2:C4:D4",
       "network_address": "griffon-35.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "6",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.35",
+      "pdu": "pdu3",
+      "pdu_port": "A1",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "6",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 4563c8191528d43404725be571554950a57be979..a9fada8e49d6cac0ce45165915b0fd9a2d6761e0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.36",
+      "mac": "00:E0:81:B2:C0:BE",
       "network_address": "griffon-36.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "7",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.36",
+      "pdu": "pdu3",
+      "pdu_port": "A2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "7",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 d9895bb380c3024f647394c5394e255dc9083658..245ab9134dc132e0449f857ed92b0583de8fca29 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.37",
+      "mac": "00:E0:81:B2:C0:3E",
       "network_address": "griffon-37.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "8",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.37",
+      "pdu": "pdu3",
+      "pdu_port": "A3",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "8",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 31994bedd1794f6add885d3c03236963605c97ef..8f9d64963bba30958e38590ea5bda29641393e97 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.38",
+      "mac": "00:E0:81:B2:C1:D8",
       "network_address": "griffon-38.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "9",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.38",
+      "pdu": "pdu3",
+      "pdu_port": "C1",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "9",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 4ddb74b66fa5eca38c22790fa766946d662daaba..d7ef0e4fe4ff1b2c0c5bbae528e9fad479b7a9f3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.39",
+      "mac": "00:E0:81:B2:C1:FA",
       "network_address": "griffon-39.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "25",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.39",
+      "pdu": "pdu3",
+      "pdu_port": "D1",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "25",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 8e9edfe781877d63c1b62a9f5c0175de8b013f4e..42f4c4de0bd453dbca91ed8e2a7cb3ed9d1ee093 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.4",
+      "mac": "00:E0:81:B2:BF:E4",
       "network_address": "griffon-4.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "4",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.4",
+      "pdu": "pdu2",
+      "pdu_port": "D2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "4",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 39a658f002dbdf73fe39b48dca2253c8a5a06e71..7e22b9ef8ebdea9e9b72304ab1c36bce2b4efdee 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.40",
+      "mac": "00:E0:81:B2:C0:CC",
       "network_address": "griffon-40.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "26",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.40",
+      "pdu": "pdu3",
+      "pdu_port": "E1",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "26",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 6e8637aeb874a93da6dde28392b6f082007b5100..ded633a352305b0c641d802ce91afdf1250d76aa 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.41",
+      "mac": "00:E0:81:B2:C4:98",
       "network_address": "griffon-41.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "27",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.41",
+      "pdu": "pdu3",
+      "pdu_port": "F1",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "27",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 7454122af5be7b4473c84b509bb83376015799a2..f118c868ce69e5c49e2ac4c529403c2a15a26cfd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.42",
+      "mac": "00:E0:81:B2:C1:BA",
       "network_address": "griffon-42.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "28",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.42",
+      "pdu": "pdu3",
+      "pdu_port": "G1",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "28",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 418e8fc885445643e8f1ab3efb553939fbda5fc1..c9d6acc816b0bfad1ac9acfb164c15b6d979114e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.43",
+      "mac": "00:E0:81:B2:C1:F4",
       "network_address": "griffon-43.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "29",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.43",
+      "pdu": "pdu3",
+      "pdu_port": "H1",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "29",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 167e105baeaa96418e61897d158f1a60f3e6bc8e..421717e9baae0154909d2dc6869ad49baf2cc50f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.44",
+      "mac": "00:E0:81:B2:C1:B8",
       "network_address": "griffon-44.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "30",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.44",
+      "pdu": "pdu3",
+      "pdu_port": "B2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "30",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 3300d3f5555da6a4b1c5a23c9802517a7f5cb987..592e743f7f6b30bdb8f684f8dfe71d9876ab4bdc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.45",
+      "mac": "00:E0:81:B2:C4:94",
       "network_address": "griffon-45.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "31",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.45",
+      "pdu": "pdu3",
+      "pdu_port": "C2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "31",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 649b8e4b49780694aaf5a8336aef249e9e1b55b7..cef0d73c833f20bcadcb60bf08b81a77948f4bf6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.46",
+      "mac": "00:E0:81:B1:C4:36",
       "network_address": "griffon-46.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "32",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.46",
+      "pdu": "pdu3",
+      "pdu_port": "D2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "32",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 5412e0eb0cfabf046c84a03ec05c404c21d14692..e6f3fb028e035b1ebe0ebed088a97ed6a7b463d3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.47",
+      "mac": "00:E0:81:B1:C4:CC",
       "network_address": "griffon-47.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "33",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.47",
+      "pdu": "pdu3",
+      "pdu_port": "E2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "33",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 2b98b4114f7fbe2f88f10297c4f92c3161967701..be6107e3c9e7a6f85e35dd5d55edd60f4d2cbff2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.48",
+      "mac": "00:E0:81:B2:C0:8C",
       "network_address": "griffon-48.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "34",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.48",
+      "pdu": "pdu3",
+      "pdu_port": "F2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "34",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 43d2c21723bd3f0cdd67595027f89da8ed69b1c7..023d8d24768a6745e69b699369fe5d7fc9c042c8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.49",
+      "mac": "00:E0:81:B2:C2:2C",
       "network_address": "griffon-49.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "35",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.49",
+      "pdu": "pdu3",
+      "pdu_port": "G2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "35",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 7ef3ca363849a66bd0c99a23c1291a68e9038196..11ed8b05f82859a8ca508f24e5213f4673815c59 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.5",
+      "mac": "00:E0:81:B2:C1:FC",
       "network_address": "griffon-5.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "5",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.5",
+      "pdu": "pdu2",
+      "pdu_port": "B2",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "5",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 19b555e4ab07565979111fd14d03f48cd59282cf..9c64e72f607731ac5212cbbd721a2f973b1a83b4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.50",
+      "mac": "00:E0:81:B2:C2:10",
       "network_address": "griffon-50.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "36",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.50",
+      "pdu": "pdu3",
+      "pdu_port": "H2",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "36",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 b81da31c1befebb21d6c5c5ff3300d26861fc7b6..40a7fee504a1c91b3c737471e3890b943b06a9b1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.51",
+      "mac": "00:E0:81:B2:C0:9E",
       "network_address": "griffon-51.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "37",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.51",
+      "pdu": "pdu3",
+      "pdu_port": "B3",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "37",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 f98244b57a9b183350f42f324b8d658949d9b3bd..14748944a24046dd297dae86b06fb6af5a603e65 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.52",
+      "mac": "00:E0:81:B2:C4:A8",
       "network_address": "griffon-52.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "38",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.52",
+      "pdu": "pdu3",
+      "pdu_port": "C3",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "38",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 569167ae08822afe63179dd96cb5258687d92d53..cbe0816d564d878538a2fcc45f81e7f73448e759 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.53",
+      "mac": "00:E0:81:B2:C0:30",
       "network_address": "griffon-53.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "39",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.53",
+      "pdu": "pdu3",
+      "pdu_port": "D3",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "39",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 65d299d34d19eed9bd177018ca5668e82fe1ce43..8538953a9526ff932bfdde79fba9e4766193217c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.54",
+      "mac": "00:E0:81:B2:C2:2A",
       "network_address": "griffon-54.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "40",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.54",
+      "pdu": "pdu3",
+      "pdu_port": "E3",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "40",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 39086d612339a54a7ac23b48ce847082e6a5e87d..332eb63e97329e849b1ead93a3727d138d15fc74 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.55",
+      "mac": "00:E0:81:B2:C2:88",
       "network_address": "griffon-55.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "41",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.55",
+      "pdu": "pdu3",
+      "pdu_port": "F3",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "41",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 7c0b4d53e266deda1c9dea1959dcbd963b9c9087..f054e852a9000dc0ea2f77cc969e185c564fd833 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.56",
+      "mac": "00:E0:81:B2:C1:DC",
       "network_address": "griffon-56.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "42",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.56",
+      "pdu": "pdu3",
+      "pdu_port": "G3",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "42",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 7833d4916ddba962d9d72292e2a51c44d79e7f01..35011698bccbb52bf60f9646319f9b7acaa627e4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.57",
+      "mac": "00:E0:81:B2:BF:EC",
       "network_address": "griffon-57.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon2",
+      "switch_port": "43",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.57",
+      "pdu": "pdu3",
+      "pdu_port": "H3",
+      "rate": 100000000,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "43",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 6f1bf44a9d2c246e7929e14b561fb4a4d1175121..924b917109102e5c6111148b30db11cefde567c8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.58",
+      "mac": "00:E0:81:B2:C0:28",
       "network_address": "griffon-58.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "1",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.58",
+      "pdu": "pdu6",
+      "pdu_port": "G2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "1",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 f349790d7a20057d35b0f436084c6358e8212ec1..277c176fb214a174afc183c6b55acfd73447b2bd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.59",
+      "mac": "00:E0:81:B2:C1:F8",
       "network_address": "griffon-59.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "2",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.59",
+      "pdu": "pdu6",
+      "pdu_port": "F2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "2",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 5beda29852c5299af8c0199ba9b9bfc9cdc4a7e3..d43434ce05b5feb2fe58290db19475a97d1413d9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.6",
+      "mac": "00:E0:81:B1:C4:E7",
       "network_address": "griffon-6.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "6",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.6",
+      "pdu": "pdu2",
+      "pdu_port": "D1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "6",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 928e077c1ed2c62eb154c0fea95fb0d0eee1de4e..2ae695d285f8415c40337d306072723c94253651 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.60",
+      "mac": "00:E0:81:B2:BF:F4",
       "network_address": "griffon-60.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "3",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.60",
+      "pdu": "pdu6",
+      "pdu_port": "E2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "3",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 1f07fa75cbbb1404fc812aea74b55aa5c19ec8cc..7a67afc7d59b156e71e3af3c3c7c2f5b7e91ad7a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.61",
+      "mac": "00:E0:81:B2:C1:E2",
       "network_address": "griffon-61.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "4",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.61",
+      "pdu": "pdu6",
+      "pdu_port": "D2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "4",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 5f579497d5ae160d8f334923306a7cad07c0b70b..1b1d9dcdf9d2cf45389c99a2c9bb30c81e36aaa1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.62",
+      "mac": "00:E0:81:B2:C1:D6",
       "network_address": "griffon-62.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "5",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.62",
+      "pdu": "pdu6",
+      "pdu_port": "C2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "5",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 bea826d0f57b5214fd2aa41257081e586de6b976..088c5d4d20b2ef3982a45d12cf7085cf86d70f2a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.63",
+      "mac": "00:E0:81:B1:C3:84",
       "network_address": "griffon-63.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "6",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.63",
+      "pdu": "pdu6",
+      "pdu_port": "B2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "6",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 9a4699601c8e868608597a2eacff96e9711eac13..0654b395c887aecce903f0f9c431a91342ab3593 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.64",
+      "mac": "00:E0:81:B2:C2:48",
       "network_address": "griffon-64.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "7",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.64",
+      "pdu": "pdu6",
+      "pdu_port": "B3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "7",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 de31dde94c89e1597bd8c61d7e4c260b7f6459fe..85887b59a9bb03a8dede725fbf7954761f5a6cdd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.65",
+      "mac": "00:E0:81:B1:C4:D4",
       "network_address": "griffon-65.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "8",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.65",
+      "pdu": "pdu6",
+      "pdu_port": "C3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "8",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 3c2070ff2f7fbe0a8eff62b1cccdf3b468d39110..383af8cc9c8f775e6b94590fd7ff9f0cb84ab333 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.66",
+      "mac": "00:E0:81:B2:C0:2E",
       "network_address": "griffon-66.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "9",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.66",
+      "pdu": "pdu6",
+      "pdu_port": "D3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "9",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 cf94718e85fc605a6208cc8c5d18bc9ac40216a2..469e064c0422c3b3a43211b482fb33ceaacac61f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.67",
+      "mac": "00:E0:81:B2:BF:F2",
       "network_address": "griffon-67.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "10",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.67",
+      "pdu": "pdu6",
+      "pdu_port": "H1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "10",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 c1e92e554e7f3dad79d8c91a0fe90b6d72c09b39..1c56a2799f34a9d332f66ac2dcf57db76d123837 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.68",
+      "mac": "00:E0:81:B2:C1:70",
       "network_address": "griffon-68.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "11",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.68",
+      "pdu": "pdu6",
+      "pdu_port": "G1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "11",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 852a97a8b3a3421ee2f52cfb1778de17aa4522b6..e6533751bc06a3d9bdc912a6b6e98d786eb34ebd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.69",
+      "mac": "00:E0:81:B2:C1:3A",
       "network_address": "griffon-69.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "12",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.69",
+      "pdu": "pdu6",
+      "pdu_port": "A1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "12",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 7f6249ecb2dedcf70f8f0b53b4e78358a175cb7f..687b020a9d80ea791f6007ab45412cb5cdd93dce 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.7",
+      "mac": "00:E0:81:B2:C4:AC",
       "network_address": "griffon-7.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "7",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.7",
+      "pdu": "pdu2",
+      "pdu_port": "E1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "7",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 9d6e4a8137f77ea9e0857dbf2a8d0a313e1da633..096d78553d8de62d8314b83e263384f7ff733f76 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.70",
+      "mac": "00:E0:81:B2:BF:8A",
       "network_address": "griffon-70.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "13",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.70",
+      "pdu": "pdu5",
+      "pdu_port": "A2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "13",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 02f9ecea0dfa5499f1ba670969c3b9b457bd1077..9d5630aa521ec51e356aa8930a762801b75b292b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.71",
+      "mac": "00:E0:81:B2:BF:CE",
       "network_address": "griffon-71.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "14",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.71",
+      "pdu": "pdu5",
+      "pdu_port": "A3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "14",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 8a3e2fc12e63d57690c11c182448cef3d537c8cd..60e8b9a6e70d70ea994ccadc14c764918944eb4b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.72",
+      "mac": "00:E0:81:B2:C4:D6",
       "network_address": "griffon-72.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "15",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.72",
+      "pdu": "pdu5",
+      "pdu_port": "B1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "15",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 19e9286c11c72922eb5002435fc38358d0366b2f..4384eeb56ee5f3411ecc3fa3d28bed11fee91377 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.73",
+      "mac": "00:E0:81:B2:C4:BA",
       "network_address": "griffon-73.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "25",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.73",
+      "pdu": "pdu5",
+      "pdu_port": "C1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "25",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 09370f0ed1fdecf00c5d612f416a76f21eab6531..64e20e2ca72ac78a5627e9b5b28a978abbe17a91 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.74",
+      "mac": "00:E0:81:B2:C0:94",
       "network_address": "griffon-74.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "26",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.74",
+      "pdu": "pdu5",
+      "pdu_port": "D1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "26",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 b7e92bed9f85111882c1f904367afd8de576b6c0..b0356325c8bc1a84218ab4c61ac226ba6684b7ca 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.75",
+      "mac": "00:E0:81:B2:C1:D2",
       "network_address": "griffon-75.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "27",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.75",
+      "pdu": "pdu5",
+      "pdu_port": "E1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "27",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 0392820feb7f44ad451ac270fcc144202dd02ff8..645dc2e05bd4772c53254b8abe657e74c606c55c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.76",
+      "mac": "00:E0:81:B2:C1:24",
       "network_address": "griffon-76.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "28",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.76",
+      "pdu": "pdu5",
+      "pdu_port": "F1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "28",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 386ec93a94338932aa767f62d4199a6c2aaf8193..01ef029c36ec6c0e465b758ec9b67bdfa435ddc7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.77",
+      "mac": "00:E0:81:B2:BF:F0",
       "network_address": "griffon-77.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "29",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.77",
+      "pdu": "pdu5",
+      "pdu_port": "G1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "29",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 3e18e4413e5d984be408c1cfea2ff139eeb50930..187d40b5dbf7723eab1783c153a554f836e181f3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.78",
+      "mac": "00:E0:81:B2:C2:44",
       "network_address": "griffon-78.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "30",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.78",
+      "pdu": "pdu5",
+      "pdu_port": "H1",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "30",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 888086114acf773f8df118f312e790f7580f4cf5..e4e913642eb1aa0152645746a058a0e117e301a3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.79",
+      "mac": "00:E0:81:B2:C4:B8",
       "network_address": "griffon-79.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "31",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.79",
+      "pdu": "pdu5",
+      "pdu_port": "B2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "31",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 1a531399b54333f552b4e8a69e70444f9d4fd8e1..bb4c70b8d77a68f7c6e47a5678f6433b68e28f08 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.8",
+      "mac": "00:E0:81:B2:C4:A0",
       "network_address": "griffon-8.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "8",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.8",
+      "pdu": "pdu2",
+      "pdu_port": "F1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "8",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 cf2370573c903911e491cf7590e461850b4c584a..1648d819f22aa3d81ae2bcf28474f74abfbe1b5b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.80",
+      "mac": "00:E0:81:B2:BF:EE",
       "network_address": "griffon-80.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "32",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.80",
+      "pdu": "pdu5",
+      "pdu_port": "C2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "32",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 ce794227b4b26a5f189f5cd1abb2411e06b6fed7..fcd7d296d0d575ccd5d7a4783a8475788f655b69 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.81",
+      "mac": "00:E0:81:B2:C5:72",
       "network_address": "griffon-81.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "33",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.81",
+      "pdu": "pdu5",
+      "pdu_port": "D2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "33",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 dc9754c848a4a4e5d3fe8fe8305cb2734afd4cea..c5c95549639c7e61564135044080ccb329dfdbf6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.82",
+      "mac": "00:E0:81:B2:C1:7E",
       "network_address": "griffon-82.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "34",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.82",
+      "pdu": "pdu5",
+      "pdu_port": "E2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "34",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 fd8d4910c9bacd756b95badadf2d02865608c7eb..c5ab8064b86cdfca258ac75182bb6e98f88fcfca 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.83",
+      "mac": "00:E0:81:B2:C2:40",
       "network_address": "griffon-83.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "35",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.83",
+      "pdu": "pdu5",
+      "pdu_port": "F2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "35",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 c6c268a1def891111e44b5849fc2b242861ce48a..ec50f5c7429f6018a847b8199aec533bd9d8a11e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.84",
+      "mac": "00:E0:81:B2:C2:4E",
       "network_address": "griffon-84.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "36",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.84",
+      "pdu": "pdu5",
+      "pdu_port": "G2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "36",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 9d943723ea3c78608c1d69b1bc482295f676eb87..996ae28cd294e56b9c2544abf98e7181ec030ba9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.85",
+      "mac": "00:E0:81:B2:C5:BC",
       "network_address": "griffon-85.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "37",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.85",
+      "pdu": "pdu5",
+      "pdu_port": "H2",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "37",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 5eaf7d8b1dce26a25de726910392979c31cef6a9..bd83743a4ed88a119c51269aeabf8dcc2e6fc2fc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.86",
+      "mac": "00:E0:81:B2:C2:3A",
       "network_address": "griffon-86.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "38",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.86",
+      "pdu": "pdu5",
+      "pdu_port": "B3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "38",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 e8357d434c7630aa439fab47b11d1ffa3eea6be1..3baee6a28f3e3f022eaea533bac6becfed7d421d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.87",
+      "mac": "00:E0:81:B2:BF:82",
       "network_address": "griffon-87.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "39",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.87",
+      "pdu": "pdu5",
+      "pdu_port": "C3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "39",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 855049548d02ef043efc0bed8064358e0be955dd..af5a8a04ee6c1c438e4687030e2956d8d296ee81 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.88",
+      "mac": "00:E0:81:B2:C4:CE",
       "network_address": "griffon-88.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "40",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.88",
+      "pdu": "pdu5",
+      "pdu_port": "D3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "40",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 1dc5d2d7f588e0d9832f098cabbaae9f05360d9a..f6a551b6e3dec8fc1515cd2b5190de1913b698af 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.89",
+      "mac": "00:E0:81:B2:C5:D4",
       "network_address": "griffon-89.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "41",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.89",
+      "pdu": "pdu5",
+      "pdu_port": "E3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "41",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 40768d0e28c655502f00387ae8b665c432dbbe5e..2106a79747f6d02d86a791a80f2ae15c1e4c8e2a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.9",
+      "mac": "00:E0:81:B2:C5:76",
       "network_address": "griffon-9.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
+      "switch_port": "9",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.9",
+      "pdu": "pdu2",
+      "pdu_port": "G1",
+      "rate": 100000000,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "9",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 88384815ed84ac0fb01464a93f4671043f5e5c85..74a850909fe5c248f57d84c330a099dddc158d3a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.90",
+      "mac": "00:E0:81:B2:C0:46",
       "network_address": "griffon-90.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "42",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.90",
+      "pdu": "pdu5",
+      "pdu_port": "F3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "42",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 1a6d5296b59ba77e4d66996af2f3b2438d15ed68..86acf3919104daa2daf4981fe4fe15167b9a6ddb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.91",
+      "mac": "00:E0:81:B2:C1:BC",
       "network_address": "griffon-91.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "43",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.91",
+      "pdu": "pdu5",
+      "pdu_port": "G3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "43",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
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 b106d22b5ce953d9e7dd44134375965f3cafbb3c..6352cf62d27cf9510e48a21027130f5a48dc63c1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
@@ -14,9 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.92",
+      "mac": "00:E0:81:B2:BF:DE",
       "network_address": "griffon-92.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sgriffon1",
+      "switch": "sgriffon3",
+      "switch_port": "44",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -36,6 +38,18 @@
       "switch": "ib_switch",
       "vendor": "Mellanox",
       "version": "MT26418"
+    },
+    {
+      "enabled": true,
+      "interface": "Ipmi",
+      "ip": "172.28.154.92",
+      "pdu": "pdu5",
+      "pdu_port": "H3",
+      "rate": 100000000,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "44",
+      "vendor": "tyan",
+      "version": "no"
     }
   ],
   "operating_system": {
diff --git a/generators/input/nancy.rb b/generators/input/nancy.rb
index 4f045090c294bbc1ba3d3ba368c545d9849a4fe0..6a1c06447f9c56dad920673f89e584db17ddb9fd 100755
--- a/generators/input/nancy.rb
+++ b/generators/input/nancy.rb
@@ -11,7 +11,7 @@ site :nancy do |site_uid|
   user_support_contact
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1} +
-    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   
   cluster :grelon do |cluster_uid|
     model "HP ProLiant DL140G3"
@@ -49,10 +49,14 @@ site :nancy do |site_uid|
           {:interface => 'SATA', :size => 80.GB, :driver => "ata_piix"}
           ]
         network_adapters [
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, 
-            :switch => "sgrelon1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :driver => "tg3", :vendor => "Broadcom", :version => "BCM5721"},
-          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5721"}
+          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :mac => lookup('nancy', "#{node_uid}", 'mac_eth0'),
+            :switch => lookup('nancy', "#{node_uid}", 'switch_eth0'), :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :driver => "tg3", :vendor => "Broadcom", :version => "BCM5721", :switch_port => lookup('nancy', "#{node_uid}", 'switch_pos_eth0') },
+          {:interface => 'Ethernet', :rate => 1.G, :enabled => true, :driver => "tg3", :vendor => "Broadcom", :version => "BCM5721", :mac => lookup('nancy', "#{node_uid}", 'mac_eth1'), 
+            :switch => lookup('nancy', "#{node_uid}", 'switch_eth1'), :switch_port => lookup('nancy', "#{node_uid}", 'switch_pos_eth1'), :ip => lookup('nancy', "#{node_uid}", 'ip_eth1') },
+          {:interface => 'Ipmi', :rate => 100.M, :enabled => true, :vendor => "hp_ilo", :version => "no", :ip => lookup('nancy', "#{node_uid}", 'ip_ipmi'),
+            :switch => lookup('nancy', "#{node_uid}", 'switch_ipmi'), :switch_port => lookup('nancy', "#{node_uid}", 'switch_ipmi_pos'),
+            :pdu => lookup('nancy', "#{node_uid}", 'pdu'), :pdu_port => lookup('nancy', "#{node_uid}", 'pdu_pos')  }
           ]
       end
     end
@@ -95,11 +99,16 @@ site :nancy do |site_uid|
           ]
         network_adapters [
           {:interface => 'Ethernet', :rate => 1.G, :enabled => true, 
-            :switch => "sgriffon1", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => lookup('nancy', "#{node_uid}", 'switch_eth0'), :mac => lookup('nancy', "#{node_uid}", 'mac_eth0'),
+            :switch_port => lookup('nancy', "#{node_uid}", 'switch_pos_eth0'), 
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
             :driver => "e1000e", :vendor => "intel", :version => "80003ES2LAN"},
           {:interface => 'Ethernet', :rate => 1.G, :enabled => false, :driver => "e1000e", :vendor => "intel", :version => "BCM5721"},
 	  {:interface => 'Infiniband 20G', :rate => 20.G, :enabled => true,
-	    :switch => "ib_switch", :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418" }
+	    :switch => "ib_switch", :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418" },
+          {:interface => 'Ipmi', :rate => 100.M, :enabled => true, :vendor => "tyan", :version => "no", :ip => lookup('nancy', "#{node_uid}", 'ip_ipmi'),
+            :switch => lookup('nancy', "#{node_uid}", 'switch_ipmi'), :switch_port => lookup('nancy', "#{node_uid}", 'switch_ipmi_pos'),
+            :pdu => lookup('nancy', "#{node_uid}", 'pdu'), :pdu_port => lookup('nancy', "#{node_uid}", 'pdu_pos')  }
           ]
       end
     end