From b260203d8147af96e802c9435c7c9e49f4de7c1d Mon Sep 17 00:00:00 2001
From: Cyril Constantin <>
Date: Thu, 22 Oct 2009 10:36:26 +0200
Subject: [PATCH] [nancy] correct previously bad generated files

---
 .../nancy/clusters/grelon/nodes/grelon-1.json | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-10.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-100.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-101.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-102.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-103.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-104.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-105.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-106.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-107.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-108.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-109.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-11.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-110.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-111.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-112.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-113.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-114.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-115.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-116.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-117.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-118.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-119.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-12.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-120.json     | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-13.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-14.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-15.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-16.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-17.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-18.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-19.json      | 28 +++++++++----------
 .../nancy/clusters/grelon/nodes/grelon-2.json | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-20.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-21.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-22.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-23.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-24.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-25.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-26.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-27.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-28.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-29.json      | 28 +++++++++----------
 .../nancy/clusters/grelon/nodes/grelon-3.json | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-30.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-31.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-32.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-33.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-34.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-35.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-36.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-37.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-38.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-39.json      | 28 +++++++++----------
 .../nancy/clusters/grelon/nodes/grelon-4.json | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-40.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-41.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-42.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-43.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-44.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-45.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-46.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-47.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-48.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-49.json      | 28 +++++++++----------
 .../nancy/clusters/grelon/nodes/grelon-5.json | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-50.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-51.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-52.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-53.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-54.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-55.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-56.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-57.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-58.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-59.json      | 28 +++++++++----------
 .../nancy/clusters/grelon/nodes/grelon-6.json | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-60.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-61.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-62.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-63.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-64.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-65.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-66.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-67.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-68.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-69.json      | 28 +++++++++----------
 .../nancy/clusters/grelon/nodes/grelon-7.json | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-70.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-71.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-72.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-73.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-74.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-75.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-76.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-77.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-78.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-79.json      | 28 +++++++++----------
 .../nancy/clusters/grelon/nodes/grelon-8.json | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-80.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-81.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-82.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-83.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-84.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-85.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-86.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-87.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-88.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-89.json      | 28 +++++++++----------
 .../nancy/clusters/grelon/nodes/grelon-9.json | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-90.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-91.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-92.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-93.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-94.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-95.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-96.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-97.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-98.json      | 28 +++++++++----------
 .../clusters/grelon/nodes/grelon-99.json      | 28 +++++++++----------
 .../clusters/griffon/nodes/griffon-1.json     | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-10.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-11.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-12.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-13.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-14.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-15.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-16.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-17.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-18.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-19.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-2.json     | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-20.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-21.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-22.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-23.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-24.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-25.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-26.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-27.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-28.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-29.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-3.json     | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-30.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-31.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-32.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-33.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-34.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-35.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-36.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-37.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-38.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-39.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-4.json     | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-40.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-41.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-42.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-43.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-44.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-45.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-46.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-47.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-48.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-49.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-5.json     | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-50.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-51.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-52.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-53.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-54.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-55.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-56.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-57.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-58.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-59.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-6.json     | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-60.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-61.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-62.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-63.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-64.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-65.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-66.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-67.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-68.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-69.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-7.json     | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-70.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-71.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-72.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-73.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-74.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-75.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-76.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-77.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-78.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-79.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-8.json     | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-80.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-81.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-82.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-83.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-84.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-85.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-86.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-87.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-88.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-89.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-9.json     | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-90.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-91.json    | 22 +++++++--------
 .../clusters/griffon/nodes/griffon-92.json    | 22 +++++++--------
 212 files changed, 2692 insertions(+), 2692 deletions(-)

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 4a3beb19dd7..729e4413ec2 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.101",
-      "mac": null,
+      "mac": "00:18:FE:FA:63:6E",
       "network_address": "grelon-1.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.101",
+      "mac": "00:18:FE:FA:63:6F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.101",
+      "mac": "00:18:FE:FA:64:4D",
+      "pdu": "pdu71",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "1",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHR4",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b21195ddd38..346667a159c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.110",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:26",
       "network_address": "grelon-10.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.110",
+      "mac": "00:18:FE:FA:45:27",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.110",
+      "mac": "00:18:FE:FA:54:ED",
+      "pdu": "pdu72",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "10",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHP7",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 21452c167b0..df28c679735 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.200",
-      "mac": null,
+      "mac": "00:18:FE:FA:53:B8",
       "network_address": "grelon-100.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.200",
+      "mac": "00:18:FE:FA:53:B9",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.200",
+      "mac": "00:18:FE:FA:54:C2",
+      "pdu": "pdu32",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "4",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHN9",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 60dedd8d535..b5127751d3f 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.201",
-      "mac": null,
+      "mac": "00:18:FE:FA:43:7A",
       "network_address": "grelon-101.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.201",
+      "mac": "00:18:FE:FA:43:7B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.201",
+      "mac": "00:18:FE:FA:35:4D",
+      "pdu": "pdu31",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "5",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHNB",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d55291c992a..1d7b3d7f23d 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.202",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:1A",
       "network_address": "grelon-102.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.202",
+      "mac": "00:18:FE:FA:44:1B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.202",
+      "mac": "00:18:FE:FA:35:9D",
+      "pdu": "pdu32",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "6",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHND",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 08c2aef7cfa..62329a69037 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.203",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:A0",
       "network_address": "grelon-103.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.203",
+      "mac": "00:18:FE:FA:46:A1",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.203",
+      "mac": "00:18:FE:FA:55:AA",
+      "pdu": "pdu31",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "7",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHNE",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 8dd1fdc5f4b..b4820571f18 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.204",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:8C",
       "network_address": "grelon-104.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.204",
+      "mac": "00:18:FE:FA:46:8D",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.204",
+      "mac": "00:18:FE:FA:55:A0",
+      "pdu": "pdu32",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "8",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHNJ",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 8d011d67c4e..5cf9513fc40 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.205",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:2C",
       "network_address": "grelon-105.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.205",
+      "mac": "00:18:FE:FA:44:2D",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.205",
+      "mac": "00:18:FE:FA:35:A6",
+      "pdu": "pdu31",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "9",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHL7",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 c6f1f85bfc1..9ff8559472c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.206",
-      "mac": null,
+      "mac": "00:18:FE:28:AF:54",
       "network_address": "grelon-106.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.206",
+      "mac": "00:18:FE:28:AF:55",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.206",
+      "mac": "00:18:FE:28:BE:3B",
+      "pdu": "pdu32",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "10",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHL1",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 91391a5a42e..2f00cf0fc1c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.207",
-      "mac": null,
+      "mac": "00:18:FE:FA:63:5A",
       "network_address": "grelon-107.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.207",
+      "mac": "00:18:FE:FA:63:5B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.207",
+      "mac": "00:18:FE:FA:64:43",
+      "pdu": "pdu31",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "11",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLA",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 bf5abbc37ee..bd5cc2bbf8a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.208",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:54",
       "network_address": "grelon-108.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.208",
+      "mac": "00:18:FE:FA:52:55",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.208",
+      "mac": "00:18:FE:FA:54:10",
+      "pdu": "pdu32",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "12",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLC",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 77beb3619d8..27673fbdf7c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.209",
-      "mac": null,
+      "mac": "00:18:FE:FA:63:6C",
       "network_address": "grelon-109.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.209",
+      "mac": "00:18:FE:FA:63:6D",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.209",
+      "mac": "00:18:FE:FA:64:4C",
+      "pdu": "pdu31",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "13",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLH",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b5b9d3bfb81..5415346e526 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.111",
-      "mac": null,
+      "mac": "00:18:FE:FA:42:0E",
       "network_address": "grelon-11.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.111",
+      "mac": "00:18:FE:FA:42:0F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.111",
+      "mac": "00:18:FE:FA:34:96",
+      "pdu": "pdu71",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "11",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHP9",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 02ab49269d8..626e23b227b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.210",
-      "mac": null,
+      "mac": "00:18:FE:FA:25:78",
       "network_address": "grelon-110.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.210",
+      "mac": "00:18:FE:FA:25:79",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.210",
+      "mac": "00:18:FE:FA:32:7D",
+      "pdu": "pdu32",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "14",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLW",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 7bae35276f4..70dffa637c1 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.211",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:D2",
       "network_address": "grelon-111.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.211",
+      "mac": "00:18:FE:FA:45:D3",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.211",
+      "mac": "00:18:FE:FA:55:43",
+      "pdu": "pdu31",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "15",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLM",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 61a380a028e..78b517adaea 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.212",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:18",
       "network_address": "grelon-112.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.212",
+      "mac": "00:18:FE:FA:44:19",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.212",
+      "mac": "00:18:FE:FA:35:9C",
+      "pdu": "pdu32",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "16",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLY",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 2a9b59e1043..7be57334e16 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.213",
-      "mac": null,
+      "mac": "00:18:FE:FA:36:B0",
       "network_address": "grelon-113.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.213",
+      "mac": "00:18:FE:FA:36:B1",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.213",
+      "mac": "00:18:FE:FA:34:67",
+      "pdu": "pdu31",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "17",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHM2",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b9ccf7d0504..7434c0f2546 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.214",
-      "mac": null,
+      "mac": "00:17:A4:FF:5D:AA",
       "network_address": "grelon-114.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.214",
+      "mac": "00:17:A4:FF:5D:AB",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.214",
+      "mac": "00:17:A4:FF:6C:56",
+      "pdu": "pdu32",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "18",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHM6",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ab1899265ad..f808b8fc3be 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.215",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:D4",
       "network_address": "grelon-115.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.215",
+      "mac": "00:18:FE:FA:44:D5",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.215",
+      "mac": "00:18:FE:FA:35:F9",
+      "pdu": "pdu31",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "19",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHMB",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 26ef17ce55f..1e84ead8cfb 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.216",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:34",
       "network_address": "grelon-116.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.216",
+      "mac": "00:18:FE:FA:45:35",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.216",
+      "mac": "00:18:FE:FA:54:F4",
+      "pdu": "pdu32",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "20",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHME",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 264099603f4..36f11224446 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.217",
-      "mac": null,
+      "mac": "00:18:FE:FA:63:60",
       "network_address": "grelon-117.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.217",
+      "mac": "00:18:FE:FA:63:61",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.217",
+      "mac": "00:18:FE:FA:64:46",
+      "pdu": "pdu31",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "21",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHML",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 cc96d901e7f..c32ec855bea 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.218",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:DE",
       "network_address": "grelon-118.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.218",
+      "mac": "00:18:FE:FA:44:DF",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.218",
+      "mac": "00:18:FE:FA:35:FF",
+      "pdu": "pdu32",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "22",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHMP",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 cda40ac4b5a..90c4ef5ce7c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.219",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:7C",
       "network_address": "grelon-119.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.219",
+      "mac": "00:18:FE:FA:52:7D",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.219",
+      "mac": "00:18:FE:FA:54:24",
+      "pdu": "pdu31",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "23",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHMT",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d304ecb7285..860b1427796 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.112",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:48",
       "network_address": "grelon-12.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.112",
+      "mac": "00:18:FE:FA:52:49",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.112",
+      "mac": "00:18:FE:FA:54:0A",
+      "pdu": "pdu72",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "12",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPB",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 8a4f17b8d29..5db876def05 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.220",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:2A",
       "network_address": "grelon-120.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.220",
+      "mac": "00:18:FE:FA:46:2B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.220",
+      "mac": "00:18:FE:FA:55:6F",
+      "pdu": "pdu32",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "24",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHN3",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ea22e05cbff..f158ff7e332 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.113",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:26",
       "network_address": "grelon-13.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.113",
+      "mac": "00:18:FE:FA:46:27",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.113",
+      "mac": "00:18:FE:FA:55:6D",
+      "pdu": "pdu71",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "13",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPD",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b1d1c3db9d5..4f7f905db1a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.114",
-      "mac": null,
+      "mac": "00:18:FE:FA:36:56",
       "network_address": "grelon-14.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.114",
+      "mac": "00:18:FE:FA:36:57",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.114",
+      "mac": "00:18:FE:FA:34:3A",
+      "pdu": "pdu72",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "14",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPE",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 559ff1f91cf..6d19f0806fc 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.115",
-      "mac": null,
+      "mac": "00:18:FE:FA:63:48",
       "network_address": "grelon-15.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.115",
+      "mac": "00:18:FE:FA:63:49",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.115",
+      "mac": "00:18:FE:FA:64:3A",
+      "pdu": "pdu71",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "15",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPH",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 3a1a93cfe0d..01904596d2c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.116",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:7E",
       "network_address": "grelon-16.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.116",
+      "mac": "00:18:FE:FA:45:7F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.116",
+      "mac": "00:18:FE:FA:55:19",
+      "pdu": "pdu72",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "16",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPL",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 6392e30c560..39f3471f3e5 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.117",
-      "mac": null,
+      "mac": "00:18:FE:FA:43:DE",
       "network_address": "grelon-17.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.117",
+      "mac": "00:18:FE:FA:43:DF",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.117",
+      "mac": "00:18:FE:FA:35:7F",
+      "pdu": "pdu71",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "17",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPN",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d97f58da6b2..c5556ed1fbd 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.118",
-      "mac": null,
+      "mac": "00:18:FE:28:3E:B6",
       "network_address": "grelon-18.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.118",
+      "mac": "00:18:FE:28:3E:B7",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.118",
+      "mac": "00:18:FE:28:5E:B5",
+      "pdu": "pdu72",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "18",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPP",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 0abf753867d..372bd296b27 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.119",
-      "mac": null,
+      "mac": "00:18:FE:FA:25:AE",
       "network_address": "grelon-19.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.119",
+      "mac": "00:18:FE:FA:25:AF",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.119",
+      "mac": "00:18:FE:FA:32:99",
+      "pdu": "pdu71",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "19",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPS",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 74e0ce7f95e..a0c04eda2c5 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.102",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:48",
       "network_address": "grelon-2.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.102",
+      "mac": "00:18:FE:FA:46:49",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.102",
+      "mac": "00:18:FE:FA:55:7E",
+      "pdu": "pdu72",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "2",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHNN",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 bbd7f818cda..c415cad856e 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.120",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:30",
       "network_address": "grelon-20.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.120",
+      "mac": "00:18:FE:FA:52:31",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.120",
+      "mac": "00:18:FE:FA:53:FE",
+      "pdu": "pdu72",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "20",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPV",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 adb7ca70dc4..6f7ef5a7cd0 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.121",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:BE",
       "network_address": "grelon-21.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.121",
+      "mac": "00:18:FE:FA:44:BF",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.121",
+      "mac": "00:18:FE:FA:35:EE",
+      "pdu": "pdu71",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "21",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHPX",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d300e45b9fe..0129ba5b388 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.122",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:06",
       "network_address": "grelon-22.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.122",
+      "mac": "00:18:FE:FA:45:07",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.122",
+      "mac": "00:18:FE:FA:54:DD",
+      "pdu": "pdu72",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "22",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHR1",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 899368ef4be..7c547352dc6 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.123",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:20",
       "network_address": "grelon-23.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.123",
+      "mac": "00:18:FE:FA:45:21",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.123",
+      "mac": "00:18:FE:FA:54:EA",
+      "pdu": "pdu71",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "23",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHR3",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 135b155c63d..7fc85edc576 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.124",
-      "mac": null,
+      "mac": "00:18:FE:FA:63:42",
       "network_address": "grelon-24.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.124",
+      "mac": "00:18:FE:FA:63:43",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.124",
+      "mac": "00:18:FE:FA:64:37",
+      "pdu": "pdu72",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "24",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHNL",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b09a42f24f8..dd70436353b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.125",
-      "mac": null,
+      "mac": "00:18:FE:FA:53:22",
       "network_address": "grelon-25.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.125",
+      "mac": "00:18:FE:FA:53:23",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.125",
+      "mac": "00:18:FE:FA:54:77",
+      "pdu": "pdu61",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "1",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKN7",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 acf05f52872..47db7c05350 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.126",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:88",
       "network_address": "grelon-26.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.126",
+      "mac": "00:18:FE:FA:52:89",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.126",
+      "mac": "00:18:FE:FA:54:2A",
+      "pdu": "pdu62",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "2",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKNN",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 eda691e8d12..d9613c06b2a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.127",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:A2",
       "network_address": "grelon-27.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.127",
+      "mac": "00:18:FE:FA:44:A3",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.127",
+      "mac": "00:18:FE:FA:35:E0",
+      "pdu": "pdu61",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "3",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKND",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 dc0e9bb7d29..851f90c29ad 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.128",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:12",
       "network_address": "grelon-28.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.128",
+      "mac": "00:18:FE:FA:52:13",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.128",
+      "mac": "00:18:FE:FA:53:EF",
+      "pdu": "pdu62",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "4",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKNE",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 fd21f762e47..19adc33e33a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.129",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:DA",
       "network_address": "grelon-29.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.129",
+      "mac": "00:18:FE:FA:46:DB",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.129",
+      "mac": "00:18:FE:FA:55:C7",
+      "pdu": "pdu61",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "5",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKNH",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 7f29685c3c6..aeb6cd189d9 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.103",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:1E",
       "network_address": "grelon-3.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.103",
+      "mac": "00:18:FE:FA:45:1F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.103",
+      "mac": "00:18:FE:FA:54:E9",
+      "pdu": "pdu71",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "3",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHNP",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 cc6614d8dd8..eb6ed044fc6 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.130",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:1E",
       "network_address": "grelon-30.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.130",
+      "mac": "00:18:FE:FA:52:1F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.130",
+      "mac": "00:18:FE:FA:53:F5",
+      "pdu": "pdu62",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "6",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKNK",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 61777d91162..0878822d94b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.131",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:E0",
       "network_address": "grelon-31.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.131",
+      "mac": "00:18:FE:FA:46:E1",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.131",
+      "mac": "00:18:FE:FA:55:D9",
+      "pdu": "pdu61",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "7",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKNA",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 e05ad26b4e6..797b396aa9b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.132",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:92",
       "network_address": "grelon-32.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.132",
+      "mac": "00:18:FE:FA:46:93",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.132",
+      "mac": "00:18:FE:FA:55:A3",
+      "pdu": "pdu62",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "8",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKNP",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 1f693de410b..c451a736357 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.133",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:2A",
       "network_address": "grelon-33.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.133",
+      "mac": "00:18:FE:FA:52:2B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.133",
+      "mac": "00:18:FE:FA:53:FB",
+      "pdu": "pdu61",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "9",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKNS",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d1d3d0f3c4c..aad01835e99 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.134",
-      "mac": null,
+      "mac": "00:18:FE:FA:53:1A",
       "network_address": "grelon-34.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.134",
+      "mac": "00:18:FE:FA:53:1B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.134",
+      "mac": "00:18:FE:FA:54:73",
+      "pdu": "pdu62",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "10",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKNW",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 85ada5c83c2..57a7e02b48c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.135",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:08",
       "network_address": "grelon-35.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.135",
+      "mac": "00:18:FE:FA:52:09",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.135",
+      "mac": "00:18:FE:FA:53:EA",
+      "pdu": "pdu61",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "11",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKNX",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 dae863bbbfe..0f405e2ae65 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.136",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:84",
       "network_address": "grelon-36.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.136",
+      "mac": "00:18:FE:FA:52:85",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.136",
+      "mac": "00:18:FE:FA:54:28",
+      "pdu": "pdu62",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "12",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKP3",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 bd1f2dd45a0..5aa37cbb25f 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.137",
-      "mac": null,
+      "mac": "00:18:FE:FA:42:E4",
       "network_address": "grelon-37.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.137",
+      "mac": "00:18:FE:FA:42:E5",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.137",
+      "mac": "00:18:FE:FA:35:02",
+      "pdu": "pdu61",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "13",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKP5",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 dd15337982f..2397ccca937 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.138",
-      "mac": null,
+      "mac": "00:18:FE:FA:53:9A",
       "network_address": "grelon-38.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.138",
+      "mac": "00:18:FE:FA:53:9B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.138",
+      "mac": "00:18:FE:FA:54:B3",
+      "pdu": "pdu62",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "14",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKMD",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 72cf14843ca..4881fa5c6be 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.139",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:E2",
       "network_address": "grelon-39.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.139",
+      "mac": "00:18:FE:FA:45:E3",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.139",
+      "mac": "00:18:FE:FA:55:4B",
+      "pdu": "pdu61",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "15",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKMH",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 acd4ded22af..34f1249a40e 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.104",
-      "mac": null,
+      "mac": "00:18:FE:FA:63:62",
       "network_address": "grelon-4.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.104",
+      "mac": "00:18:FE:FA:63:63",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.104",
+      "mac": "00:18:FE:FA:64:47",
+      "pdu": "pdu72",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "4",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHNT",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 644a2acf252..ae82f7a10bf 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.140",
-      "mac": null,
+      "mac": "00:18:FE:28:9E:BA",
       "network_address": "grelon-40.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.140",
+      "mac": "00:18:FE:28:9E:BB",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.140",
+      "mac": "00:18:FE:28:9F:E7",
+      "pdu": "pdu62",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "16",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKMK",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 da417035ea1..e82a8bb8f0f 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.141",
-      "mac": null,
+      "mac": "00:18:FE:FA:42:B2",
       "network_address": "grelon-41.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.141",
+      "mac": "00:18:FE:FA:42:B3",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.141",
+      "mac": "00:18:FE:FA:34:E8",
+      "pdu": "pdu61",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "17",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKN9",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 9da43374cc4..7398a8770f2 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.142",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:04",
       "network_address": "grelon-42.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.142",
+      "mac": "00:18:FE:FA:52:05",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.142",
+      "mac": "00:18:FE:FA:53:E8",
+      "pdu": "pdu62",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "18",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKMR",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 dea82f18d9e..b701704165a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.143",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:D6",
       "network_address": "grelon-43.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.143",
+      "mac": "00:18:FE:FA:52:D7",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.143",
+      "mac": "00:18:FE:FA:54:51",
+      "pdu": "pdu61",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "19",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKMY",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 3d2525481da..a4f3dada41b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.144",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:DC",
       "network_address": "grelon-44.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.144",
+      "mac": "00:18:FE:FA:45:DD",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.144",
+      "mac": "00:18:FE:FA:55:48",
+      "pdu": "pdu62",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "20",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKMT",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 0a0f69ef13d..5f09533bef7 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.145",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:02",
       "network_address": "grelon-45.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.145",
+      "mac": "00:18:FE:FA:45:03",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.145",
+      "mac": "00:18:FE:FA:54:DB",
+      "pdu": "pdu61",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "21",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKN1",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b09a3487c48..0d137d8ec93 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.146",
-      "mac": null,
+      "mac": "00:18:FE:FA:53:B2",
       "network_address": "grelon-46.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.146",
+      "mac": "00:18:FE:FA:53:B3",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.146",
+      "mac": "00:18:FE:FA:54:BF",
+      "pdu": "pdu62",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "22",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKMP",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 81ac214b269..73979dd4144 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.147",
-      "mac": null,
+      "mac": "00:18:FE:FA:36:F2",
       "network_address": "grelon-47.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.147",
+      "mac": "00:18:FE:FA:36:F3",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.147",
+      "mac": "00:18:FE:FA:34:88",
+      "pdu": "pdu61",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "23",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKML",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 040411e411c..9b9e24bb13d 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.148",
-      "mac": null,
+      "mac": "00:18:FE:FA:53:AE",
       "network_address": "grelon-48.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.148",
+      "mac": "00:18:FE:FA:53:AF",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon2",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.148",
+      "mac": "00:18:FE:FA:54:BD",
+      "pdu": "pdu62",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade2",
+      "switch_port": "24",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YKMW",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ab985d6622d..69752a711e6 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.149",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:A0",
       "network_address": "grelon-49.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.149",
+      "mac": "00:18:FE:FA:44:A1",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.149",
+      "mac": "00:18:FE:FA:35:DF",
+      "pdu": "pdu51",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "1",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048J",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 e60aaeb2d03..7bf0b7ef4b7 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.105",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:42",
       "network_address": "grelon-5.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.105",
+      "mac": "00:18:FE:FA:52:43",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.105",
+      "mac": "00:18:FE:FA:54:07",
+      "pdu": "pdu71",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "5",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHNW",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 dd56b28f125..40ef1177f2a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.150",
-      "mac": null,
+      "mac": "00:19:BB:EB:03:5A",
       "network_address": "grelon-50.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.150",
+      "mac": "00:19:BB:EB:03:5B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.150",
+      "mac": "00:19:BB:EB:06:6F",
+      "pdu": "pdu52",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "2",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048M",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ac69d4d2609..0e43ea95e77 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.151",
-      "mac": null,
+      "mac": "00:18:FE:28:EC:3A",
       "network_address": "grelon-51.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.151",
+      "mac": "00:18:FE:28:EC:3B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.151",
+      "mac": "00:18:FE:28:EC:78",
+      "pdu": "pdu51",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "3",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048P",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 547d9b0f15f..2c035701605 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.152",
-      "mac": null,
+      "mac": "00:19:BB:EB:04:60",
       "network_address": "grelon-52.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.152",
+      "mac": "00:19:BB:EB:04:61",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.152",
+      "mac": "00:19:BB:EB:06:F2",
+      "pdu": "pdu52",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "4",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048S",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 27acf0f92c3..b12f0468a7f 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.153",
-      "mac": null,
+      "mac": "00:19:BB:EB:04:4C",
       "network_address": "grelon-53.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.153",
+      "mac": "00:19:BB:EB:04:4D",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.153",
+      "mac": "00:19:BB:EB:06:E8",
+      "pdu": "pdu51",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "5",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048V",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 73a0e6531b2..ee99b0bf1e4 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.154",
-      "mac": null,
+      "mac": "00:19:BB:EB:03:4E",
       "network_address": "grelon-54.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.154",
+      "mac": "00:19:BB:EB:03:4F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.154",
+      "mac": "00:19:BB:EB:06:69",
+      "pdu": "pdu52",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "6",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048X",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 9958e2f05d9..4b317960bd8 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.155",
-      "mac": null,
+      "mac": "00:19:BB:EB:03:AE",
       "network_address": "grelon-55.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.155",
+      "mac": "00:19:BB:EB:03:AF",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.155",
+      "mac": "00:19:BB:EB:06:99",
+      "pdu": "pdu51",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "7",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490490",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 c359e68c618..bf53d7c14d6 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.156",
-      "mac": null,
+      "mac": "00:19:BB:EB:03:8C",
       "network_address": "grelon-56.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.156",
+      "mac": "00:19:BB:EB:03:8D",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.156",
+      "mac": "00:19:BB:EB:06:88",
+      "pdu": "pdu52",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "8",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490492",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d3784f6f690..6ed7d52d069 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.157",
-      "mac": null,
+      "mac": "00:19:BB:EB:C4:06",
       "network_address": "grelon-57.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.157",
+      "mac": "00:19:BB:EB:C4:07",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.157",
+      "mac": "00:19:BB:EB:C5:72",
+      "pdu": "pdu51",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "9",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490494",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 f0b60b5ecef..7f576171edc 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.158",
-      "mac": null,
+      "mac": "00:19:BB:EB:C3:54",
       "network_address": "grelon-58.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.158",
+      "mac": "00:19:BB:EB:C3:55",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.158",
+      "mac": "00:19:BB:EB:C5:19",
+      "pdu": "pdu52",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "10",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490496",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 0e8de3cb4dc..7ab2c28b162 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.159",
-      "mac": null,
+      "mac": "00:19:BB:EB:C4:38",
       "network_address": "grelon-59.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.159",
+      "mac": "00:19:BB:EB:C4:39",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.159",
+      "mac": "00:19:BB:EB:C5:8B",
+      "pdu": "pdu51",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "11",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490498",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 19fd00208c0..ae8fea65d08 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.106",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:9E",
       "network_address": "grelon-6.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.106",
+      "mac": "00:18:FE:FA:45:9F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.106",
+      "mac": "00:18:FE:FA:55:29",
+      "pdu": "pdu72",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "6",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHNY",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 97559f13b11..56964284435 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.160",
-      "mac": null,
+      "mac": "00:19:BB:EB:C3:5E",
       "network_address": "grelon-60.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.160",
+      "mac": "00:19:BB:EB:C3:5F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.160",
+      "mac": "00:19:BB:EB:C5:1E",
+      "pdu": "pdu52",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "12",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649049A",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ef3da363ac1..df93092a772 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.161",
-      "mac": null,
+      "mac": "00:19:BB:EB:C3:60",
       "network_address": "grelon-61.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.161",
+      "mac": "00:19:BB:EB:C3:61",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.161",
+      "mac": "00:19:BB:EB:C5:1F",
+      "pdu": "pdu51",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "13",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649049C",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 aed6c03b155..58011a78fd0 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.162",
-      "mac": null,
+      "mac": "00:19:BB:EB:C3:5C",
       "network_address": "grelon-62.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.162",
+      "mac": "00:19:BB:EB:C3:5D",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.162",
+      "mac": "00:19:BB:EB:C5:1D",
+      "pdu": "pdu52",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "14",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649049E",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b6a46f34ecb..8a320861d9c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.163",
-      "mac": null,
+      "mac": "00:17:A4:FF:8E:D2",
       "network_address": "grelon-63.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.163",
+      "mac": "00:17:A4:FF:8E:D3",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.163",
+      "mac": "00:17:A4:FF:AE:0F",
+      "pdu": "pdu51",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "15",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649047X",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 00c0aba2136..15e38139ca5 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.164",
-      "mac": null,
+      "mac": "00:18:FE:FA:36:A6",
       "network_address": "grelon-64.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.164",
+      "mac": "00:18:FE:FA:36:A7",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.164",
+      "mac": "00:18:FE:FA:34:62",
+      "pdu": "pdu52",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "16",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490480",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 592078031bb..12d9f8fc59c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.165",
-      "mac": null,
+      "mac": "00:19:BB:EB:03:DA",
       "network_address": "grelon-65.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.165",
+      "mac": "00:19:BB:EB:03:DB",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.165",
+      "mac": "00:19:BB:EB:06:AF",
+      "pdu": "pdu51",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "17",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490481",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 7ec46177f6a..3d990d14c7b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.166",
-      "mac": null,
+      "mac": "00:18:FE:FA:73:18",
       "network_address": "grelon-66.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.166",
+      "mac": "00:18:FE:FA:73:19",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.166",
+      "mac": "00:18:FE:FA:64:F6",
+      "pdu": "pdu52",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "18",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490484",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 223e14d5a49..d3b776013ad 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.167",
-      "mac": null,
+      "mac": "00:19:BB:EB:C3:58",
       "network_address": "grelon-67.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.167",
+      "mac": "00:19:BB:EB:C3:59",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.167",
+      "mac": "00:19:BB:EB:C5:1B",
+      "pdu": "pdu51",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "19",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490486",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 e7e62d543f9..9acbe109c63 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.168",
-      "mac": null,
+      "mac": "00:18:FE:29:B0:A8",
       "network_address": "grelon-68.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.168",
+      "mac": "00:18:FE:29:B0:A9",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.168",
+      "mac": "00:18:FE:29:F0:0D",
+      "pdu": "pdu52",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "20",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB86490488",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 0452a830bca..25d6030659e 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.169",
-      "mac": null,
+      "mac": "00:19:BB:EB:03:E0",
       "network_address": "grelon-69.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.169",
+      "mac": "00:19:BB:EB:03:E1",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.169",
+      "mac": "00:19:BB:EB:06:B2",
+      "pdu": "pdu51",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "21",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048A",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 bd3b6de2b0a..ddd884a8a95 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.107",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:C0",
       "network_address": "grelon-7.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.107",
+      "mac": "00:18:FE:FA:45:C1",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.107",
+      "mac": "00:18:FE:FA:55:3A",
+      "pdu": "pdu71",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "7",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHP1",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 22398bacafb..bb1872827ca 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.170",
-      "mac": null,
+      "mac": "00:19:BB:EB:C3:F0",
       "network_address": "grelon-70.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.170",
+      "mac": "00:19:BB:EB:C3:F1",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.170",
+      "mac": "00:19:BB:EB:C5:67",
+      "pdu": "pdu52",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "22",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048B",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b6a195cd7f4..e509aad7819 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.171",
-      "mac": null,
+      "mac": "00:19:BB:EB:C3:74",
       "network_address": "grelon-71.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.171",
+      "mac": "00:19:BB:EB:C3:75",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.171",
+      "mac": "00:19:BB:EB:C5:29",
+      "pdu": "pdu51",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "23",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048E",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 5cd253db5e5..a445e7aef00 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.172",
-      "mac": null,
+      "mac": "00:19:BB:EB:C3:76",
       "network_address": "grelon-72.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.172",
+      "mac": "00:19:BB:EB:C3:77",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon3",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.172",
+      "mac": "00:19:BB:EB:C5:2A",
+      "pdu": "pdu52",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade3",
+      "switch_port": "24",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649048H",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 21fdfacd120..b273fbba5b2 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.173",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:AA",
       "network_address": "grelon-73.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.173",
+      "mac": "00:18:FE:FA:44:AB",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.173",
+      "mac": "00:18:FE:FA:35:E4",
+      "pdu": "pdu41",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "1",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHMR",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ec4f9118a37..0d410782a31 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.174",
-      "mac": null,
+      "mac": "00:18:FE:FA:42:5A",
       "network_address": "grelon-74.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.174",
+      "mac": "00:18:FE:FA:42:5B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.174",
+      "mac": "00:18:FE:FA:34:BC",
+      "pdu": "pdu42",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "2",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKB",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 39285260e4f..6e3932ba6a1 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.175",
-      "mac": null,
+      "mac": "00:18:FE:FA:42:E8",
       "network_address": "grelon-75.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.175",
+      "mac": "00:18:FE:FA:42:E9",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.175",
+      "mac": "00:18:FE:FA:35:04",
+      "pdu": "pdu41",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "3",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKD",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 05ba91ec68c..7b8c6efb1fd 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.176",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:98",
       "network_address": "grelon-76.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "4",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.176",
+      "mac": "00:18:FE:FA:52:99",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "28",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.176",
+      "mac": "00:18:FE:FA:54:32",
+      "pdu": "pdu42",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "4",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKF",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ecf82aa7ade..23dcece2a4c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.177",
-      "mac": null,
+      "mac": "00:18:FE:FA:43:A8",
       "network_address": "grelon-77.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "5",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.177",
+      "mac": "00:18:FE:FA:43:A9",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "29",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.177",
+      "mac": "00:18:FE:FA:35:64",
+      "pdu": "pdu41",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "5",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKJ",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 66065d39abc..6a5beb4dac2 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.178",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:58",
       "network_address": "grelon-78.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "6",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.178",
+      "mac": "00:18:FE:FA:45:59",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "30",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.178",
+      "mac": "00:18:FE:FA:55:06",
+      "pdu": "pdu42",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "6",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKL",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 637caf1cd14..6d1f24ce36e 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.179",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:C4",
       "network_address": "grelon-79.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "7",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.179",
+      "mac": "00:18:FE:FA:46:C5",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "31",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.179",
+      "mac": "00:18:FE:FA:55:BC",
+      "pdu": "pdu41",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "7",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKN",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 90b23d0a6a7..73782878180 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.108",
-      "mac": null,
+      "mac": "00:18:FE:FA:45:DA",
       "network_address": "grelon-8.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.108",
+      "mac": "00:18:FE:FA:45:DB",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.108",
+      "mac": "00:18:FE:FA:55:47",
+      "pdu": "pdu72",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "8",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHP3",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 61551b4d5b3..99614c85792 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.180",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:D6",
       "network_address": "grelon-80.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "8",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.180",
+      "mac": "00:18:FE:FA:46:D7",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "32",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.180",
+      "mac": "00:18:FE:FA:55:C5",
+      "pdu": "pdu42",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "8",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKR",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 6e9a6238954..66d9dd2bcb5 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.181",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:40",
       "network_address": "grelon-81.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.181",
+      "mac": "00:18:FE:FA:46:41",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.181",
+      "mac": "00:18:FE:FA:55:7A",
+      "pdu": "pdu41",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "9",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKT",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d6f127d818c..4c3119db632 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.182",
-      "mac": null,
+      "mac": "00:18:FE:FA:43:3E",
       "network_address": "grelon-82.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "10",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.182",
+      "mac": "00:18:FE:FA:43:3F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "34",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.182",
+      "mac": "00:18:FE:FA:35:2F",
+      "pdu": "pdu42",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "10",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKW",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 5c9e501a5a0..caed68acfe4 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.183",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:6C",
       "network_address": "grelon-83.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "11",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.183",
+      "mac": "00:18:FE:FA:52:6D",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "35",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.183",
+      "mac": "00:18:FE:FA:54:1C",
+      "pdu": "pdu41",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "11",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHKY",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 fae2af9163e..9fc2e39fcea 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.184",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:20",
       "network_address": "grelon-84.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "12",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.184",
+      "mac": "00:18:FE:FA:52:21",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "36",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.184",
+      "mac": "00:18:FE:FA:53:F6",
+      "pdu": "pdu42",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "12",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHL2",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 a67dd71ab1d..03dad4b06ac 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.185",
-      "mac": null,
+      "mac": "00:18:FE:FA:24:3A",
       "network_address": "grelon-85.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "13",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.185",
+      "mac": "00:18:FE:FA:24:3B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "37",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.185",
+      "mac": "00:18:FE:FA:32:32",
+      "pdu": "pdu41",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "13",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHL4",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 1ddc3338e72..3524c55ed36 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.186",
-      "mac": null,
+      "mac": "00:18:FE:FA:25:14",
       "network_address": "grelon-86.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "14",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.186",
+      "mac": "00:18:FE:FA:25:15",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "38",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.186",
+      "mac": "00:18:FE:FA:32:F1",
+      "pdu": "pdu42",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "14",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHL8",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 7cacc9cea8e..89a62b6dbf6 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.187",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:9A",
       "network_address": "grelon-87.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "15",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.187",
+      "mac": "00:18:FE:FA:44:9B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "39",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.187",
+      "mac": "00:18:FE:FA:35:DC",
+      "pdu": "pdu41",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "15",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLD",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 31dd49d775b..9883d8db223 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.188",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:C4",
       "network_address": "grelon-88.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "16",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.188",
+      "mac": "00:18:FE:FA:44:C5",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "40",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.188",
+      "mac": "00:18:FE:FA:35:F1",
+      "pdu": "pdu42",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "16",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLL",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 0ee70de6007..d3aba799da5 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.189",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:F2",
       "network_address": "grelon-89.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "17",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.189",
+      "mac": "00:18:FE:FA:44:F3",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "41",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.189",
+      "mac": "00:18:FE:FA:34:3D",
+      "pdu": "pdu41",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "17",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLR",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 455a838a200..2b096211f0d 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.109",
-      "mac": null,
+      "mac": "00:18:FE:FA:53:2A",
       "network_address": "grelon-9.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "9",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.109",
+      "mac": "00:18:FE:FA:53:2B",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon1",
+      "switch_port": "33",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.109",
+      "mac": "00:18:FE:FA:54:7B",
+      "pdu": "pdu71",
+      "pdu_port": "X2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade1",
+      "switch_port": "9",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHP4",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 4cf3119c5cb..61081366127 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.190",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:B6",
       "network_address": "grelon-90.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "18",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.190",
+      "mac": "00:18:FE:FA:44:B7",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "42",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.190",
+      "mac": "00:18:FE:FA:35:EA",
+      "pdu": "pdu42",
+      "pdu_port": "X3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "18",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHLV",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 82ff547cc27..7fd9d4e9612 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.191",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:B2",
       "network_address": "grelon-91.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "19",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.191",
+      "mac": "00:18:FE:FA:44:B3",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "43",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.191",
+      "mac": "00:18:FE:FA:35:E8",
+      "pdu": "pdu41",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "19",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHM3",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ab5e9af4008..d6be5009d2c 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.192",
-      "mac": null,
+      "mac": "00:18:FE:FA:23:3C",
       "network_address": "grelon-92.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "20",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.192",
+      "mac": "00:18:FE:FA:23:3D",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "44",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.192",
+      "mac": "00:18:FE:FA:33:C4",
+      "pdu": "pdu42",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "20",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHM7",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 c9a3adea291..8fd19db919a 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.193",
-      "mac": null,
+      "mac": "00:18:FE:FA:43:88",
       "network_address": "grelon-93.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "21",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.193",
+      "mac": "00:18:FE:FA:43:89",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "45",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.193",
+      "mac": "00:18:FE:FA:35:54",
+      "pdu": "pdu41",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "21",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHMA",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 01c615eeaa8..96a4ea86b2b 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.194",
-      "mac": null,
+      "mac": "00:18:FE:FA:43:7E",
       "network_address": "grelon-94.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "22",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.194",
+      "mac": "00:18:FE:FA:43:7F",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "46",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.194",
+      "mac": "00:18:FE:FA:35:4F",
+      "pdu": "pdu42",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "22",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHMF",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 625877a95fd..438c29e11ed 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.195",
-      "mac": null,
+      "mac": "00:18:FE:FA:43:AE",
       "network_address": "grelon-95.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "23",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.195",
+      "mac": "00:18:FE:FA:43:AF",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "47",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.195",
+      "mac": "00:18:FE:FA:35:67",
+      "pdu": "pdu41",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "23",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHMK",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 dab772842f8..1aaac48e8af 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.196",
-      "mac": null,
+      "mac": "00:18:FE:FA:44:AE",
       "network_address": "grelon-96.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "24",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.196",
+      "mac": "00:18:FE:FA:44:AF",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon4",
+      "switch_port": "48",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.196",
+      "mac": "00:18:FE:FA:35:E6",
+      "pdu": "pdu42",
+      "pdu_port": "X4",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade4",
+      "switch_port": "24",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHK9",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 75b8643c1df..1c20ec85443 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.197",
-      "mac": null,
+      "mac": "00:18:FE:FA:52:50",
       "network_address": "grelon-97.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "1",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.197",
+      "mac": "00:18:FE:FA:52:51",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "25",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.197",
+      "mac": "00:18:FE:FA:54:0E",
+      "pdu": "pdu31",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "1",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHMY",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 bd068369567..310a0143bd3 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.198",
-      "mac": null,
+      "mac": "00:18:FE:FA:53:12",
       "network_address": "grelon-98.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "2",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.198",
+      "mac": "00:18:FE:FA:53:13",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "26",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.198",
+      "mac": "00:18:FE:FA:54:6F",
+      "pdu": "pdu32",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "2",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHN5",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 1c8ff80af08..0cbb1bff9a6 100755
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.199",
-      "mac": null,
+      "mac": "00:18:FE:FA:46:94",
       "network_address": "grelon-99.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "3",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
@@ -26,24 +26,24 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": null,
-      "mac": null,
+      "ip": "172.28.55.199",
+      "mac": "00:18:FE:FA:46:95",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrelon5",
+      "switch_port": "27",
       "vendor": "Broadcom",
       "version": "BCM5721"
     },
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.199",
+      "mac": "00:18:FE:FA:55:A4",
+      "pdu": "pdu31",
+      "pdu_port": "X1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrenade5",
+      "switch_port": "3",
       "vendor": "hp_ilo",
       "version": "no"
     }
@@ -65,7 +65,7 @@
     "vendor": "Intel",
     "version": "5110"
   },
-  "serial": null,
+  "serial": "GB8649YHN7",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 4a5562e3c14..dd297654354 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.1",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:88",
       "network_address": "griffon-1.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "1",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000318F0",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.1",
+      "mac": "00:E0:81:4F:E3:13",
+      "pdu": "pdu1",
+      "pdu_port": "A1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "1",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530006",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 fb7f01bb8fa..d9456062891 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.10",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:A4",
       "network_address": "griffon-10.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "10",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300027F58",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.10",
+      "mac": "00:E0:81:4F:CA:9E",
+      "pdu": "pdu2",
+      "pdu_port": "H1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "10",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530015",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b22cf02473a..b312ea89796 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.11",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:4C",
       "network_address": "griffon-11.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "25",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300028008",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.11",
+      "mac": "00:E0:81:4F:E3:70",
+      "pdu": "pdu1",
+      "pdu_port": "D1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "25",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530016",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 737d6781ef2..9048a93d992 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.12",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:9E",
       "network_address": "griffon-12.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "26",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280DC",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.12",
+      "mac": "00:E0:81:4F:CA:8B",
+      "pdu": "pdu1",
+      "pdu_port": "E1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "26",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530017",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 94f59dfc2d4..eb4663f7644 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.13",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:E4",
       "network_address": "griffon-13.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "27",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280BC",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.13",
+      "mac": "00:E0:81:4F:E2:D4",
+      "pdu": "pdu1",
+      "pdu_port": "F1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "27",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530018",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ed8c0a839c0..2312481ab0f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.14",
-      "mac": null,
+      "mac": "00:E0:81:B1:C0:60",
       "network_address": "griffon-14.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "28",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280CC",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.14",
+      "mac": "00:E0:81:4F:E2:C5",
+      "pdu": "pdu1",
+      "pdu_port": "G1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "28",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530019",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 9565f707e2b..101d9ad212b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.15",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:C4",
       "network_address": "griffon-15.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "29",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280B4",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.15",
+      "mac": "00:E0:81:4F:E3:87",
+      "pdu": "pdu1",
+      "pdu_port": "H1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "29",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530020",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 f114319f48c..e82889e9b6d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.16",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:A0",
       "network_address": "griffon-16.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "30",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003303E",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.16",
+      "mac": "00:E0:81:4F:E2:D8",
+      "pdu": "pdu1",
+      "pdu_port": "B2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "30",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530021",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 0e2ae393028..de2198caec1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.17",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:18",
       "network_address": "griffon-17.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "31",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300033016",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.17",
+      "mac": "00:E0:81:4F:E3:6A",
+      "pdu": "pdu1",
+      "pdu_port": "C2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "31",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530022",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 346e3340086..8fb4e4f2794 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.18",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:04",
       "network_address": "griffon-18.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "32",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003302A",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.18",
+      "mac": "00:E0:81:4F:CB:0E",
+      "pdu": "pdu1",
+      "pdu_port": "D2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "32",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530023",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 8f0a680ce0a..6204abd773e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.19",
-      "mac": null,
+      "mac": "00:E0:81:B2:C5:60",
       "network_address": "griffon-19.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "33",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300033036",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.19",
+      "mac": "00:E0:81:4F:E3:00",
+      "pdu": "pdu1",
+      "pdu_port": "E2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "33",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530024",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 a821891f208..aff3a9b071e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.2",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:BC",
       "network_address": "griffon-2.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "2",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300028064",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.2",
+      "mac": "00:E0:81:4F:E2:FC",
+      "pdu": "pdu1",
+      "pdu_port": "A2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "2",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530007",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 be8af01e624..030cb71feb1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.20",
-      "mac": null,
+      "mac": "00:E0:81:B2:C5:74",
       "network_address": "griffon-20.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "34",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300032FCA",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.20",
+      "mac": "00:E0:81:4F:CA:8E",
+      "pdu": "pdu1",
+      "pdu_port": "F2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "34",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530025",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 19018dc7572..e556a08dfdc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.21",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:CC",
       "network_address": "griffon-21.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "35",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003304E",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.21",
+      "mac": "00:E0:81:4F:E2:FB",
+      "pdu": "pdu1",
+      "pdu_port": "G2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "35",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530026",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 e614356a238..583e454392a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.22",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:A6",
       "network_address": "griffon-22.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "36",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300033032",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.22",
+      "mac": "00:E0:81:4F:CB:02",
+      "pdu": "pdu1",
+      "pdu_port": "H2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "36",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530027",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d5ba05ee7f1..53de86a3c1d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.23",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:56",
       "network_address": "griffon-23.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "37",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003302F",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.23",
+      "mac": "00:E0:81:4F:CA:7E",
+      "pdu": "pdu1",
+      "pdu_port": "B3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "37",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530028",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 c2f82e2e8b6..1f0a948afb8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.24",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:2E",
       "network_address": "griffon-24.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "38",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300032FD6",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.24",
+      "mac": "00:E0:81:4F:CA:7F",
+      "pdu": "pdu1",
+      "pdu_port": "C3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "38",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530029",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 79d88727040..4e961d21c6d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.25",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:E2",
       "network_address": "griffon-25.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "39",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300033022",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.25",
+      "mac": "00:E0:81:4F:E3:BA",
+      "pdu": "pdu1",
+      "pdu_port": "D3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "39",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530030",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 2c74673bd96..c7c70f7911e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.26",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:C8",
       "network_address": "griffon-26.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "40",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300032FD2",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.26",
+      "mac": "00:E0:81:4F:B5:DA",
+      "pdu": "pdu1",
+      "pdu_port": "E3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "40",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530031",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 77ed027ae28..b8adfa7351e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.27",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:C4",
       "network_address": "griffon-27.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "41",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003301E",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.27",
+      "mac": "00:E0:81:4F:E2:CB",
+      "pdu": "pdu1",
+      "pdu_port": "F3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "41",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530032",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 9fd147d28c3..23502ef2f33 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.28",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:E5",
       "network_address": "griffon-28.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "42",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300032FDA",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.28",
+      "mac": "00:E0:81:4F:CA:8D",
+      "pdu": "pdu1",
+      "pdu_port": "G3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "42",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530033",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 261d7f3bfa7..bbe0fb0c036 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.29",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:BO",
       "network_address": "griffon-29.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "43",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300033042",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.29",
+      "mac": "00:E0:81:4F:E3:71",
+      "pdu": "pdu1",
+      "pdu_port": "H3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "43",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530034",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 8cafe651a7f..cfdc43bfb77 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.3",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:FE",
       "network_address": "griffon-3.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "3",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300027F60",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.3",
+      "mac": "00:E0:81:4F:CB:0A",
+      "pdu": "pdu1",
+      "pdu_port": "A3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "3",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530008",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 75b170ac6b8..b965bcfe044 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.30",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:B4",
       "network_address": "griffon-30.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "1",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003303A",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.30",
+      "mac": "00:E0:81:4F:E3:10",
+      "pdu": "pdu4",
+      "pdu_port": "E2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "1",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530035",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 2311790bff6..45aa02a96ad 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.31",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:24",
       "network_address": "griffon-31.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "2",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003305E",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.31",
+      "mac": "00:E0:81:4F:CB:03",
+      "pdu": "pdu4",
+      "pdu_port": "D2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "2",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530036",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b2b4e329741..047803c0427 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.32",
-      "mac": null,
+      "mac": "00:E0:81:B2:C5:9E",
       "network_address": "griffon-32.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "3",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003305A",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.32",
+      "mac": "00:E0:81:4F:E3:8B",
+      "pdu": "pdu4",
+      "pdu_port": "C2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "3",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530037",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 c8372306ef9..98d1ac95cfd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.33",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:FA",
       "network_address": "griffon-33.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "4",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300033056",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.33",
+      "mac": "00:E0:81:4F:CA:7A",
+      "pdu": "pdu4",
+      "pdu_port": "B2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "4",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530038",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 932c8771073..19267f23945 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.34",
-      "mac": null,
+      "mac": "00:E0:81:B2:54:D6",
       "network_address": "griffon-34.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "5",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300033052",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.34",
+      "mac": "00:E0:81:4F:CB:20",
+      "pdu": "pdu4",
+      "pdu_port": "H1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "5",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530039",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 3e106c3ed3c..1799c5fd978 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.35",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:D4",
       "network_address": "griffon-35.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "6",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003304A",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.35",
+      "mac": "00:E0:81:4F:B5:EA",
+      "pdu": "pdu3",
+      "pdu_port": "A1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "6",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530040",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d58c266c228..95afe32302d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.36",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:BE",
       "network_address": "griffon-36.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "7",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003301A",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.36",
+      "mac": "00:E0:81:4F:B5:E8",
+      "pdu": "pdu3",
+      "pdu_port": "A2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "7",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530041",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 7954c9f8b84..09f32b734ab 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.37",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:3E",
       "network_address": "griffon-37.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "8",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300028058",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.37",
+      "mac": "00:E0:81:4F:E2:D7",
+      "pdu": "pdu3",
+      "pdu_port": "A3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "8",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530042",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 178dcccd898..c131bf52931 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.38",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:D8",
       "network_address": "griffon-38.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "9",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000318DC",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.38",
+      "mac": "00:E0:81:4F:E3:68",
+      "pdu": "pdu3",
+      "pdu_port": "C1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "9",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530043",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 16102329031..995abfd18fc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.39",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:FA",
       "network_address": "griffon-39.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "25",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000318E8",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.39",
+      "mac": "00:E0:81:4F:E2:BF",
+      "pdu": "pdu3",
+      "pdu_port": "D1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "25",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530044",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 850572a63c2..71d2c56afa3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.4",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:E4",
       "network_address": "griffon-4.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "4",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300028068",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.4",
+      "mac": "00:E0:81:4F:E3:7A",
+      "pdu": "pdu2",
+      "pdu_port": "D2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "4",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530009",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 1d4e6f13908..634e585b9e3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.40",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:CC",
       "network_address": "griffon-40.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "26",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031780",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.40",
+      "mac": "00:E0:81:4F:E2:C6",
+      "pdu": "pdu3",
+      "pdu_port": "E1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "26",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530045",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 f76c34f3580..341ec2297aa 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.41",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:98",
       "network_address": "griffon-41.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "27",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000317D4",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.41",
+      "mac": "00:E0:81:4F:B5:E1",
+      "pdu": "pdu3",
+      "pdu_port": "F1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "27",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530046",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 4d93eada8db..11aabbfc31f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.42",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:BA",
       "network_address": "griffon-42.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "28",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280D0",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.42",
+      "mac": "00:E0:81:4F:E3:65",
+      "pdu": "pdu3",
+      "pdu_port": "G1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "28",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530047",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 2ca66696e81..cff779ac382 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.43",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:F4",
       "network_address": "griffon-43.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "29",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280B8",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.43",
+      "mac": "00:E0:81:4F:B5:E4",
+      "pdu": "pdu3",
+      "pdu_port": "H1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "29",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530048",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 f52de2c4572..f03ffe5fe7c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.44",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:B8",
       "network_address": "griffon-44.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "30",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280D4",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.44",
+      "mac": "00:E0:81:4F:E2:B7",
+      "pdu": "pdu3",
+      "pdu_port": "B2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "30",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530049",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 1c9d6081843..4c5cb864260 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.45",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:94",
       "network_address": "griffon-45.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "31",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280B0",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.45",
+      "mac": "00:E0:81:4F:E2:C4",
+      "pdu": "pdu3",
+      "pdu_port": "C2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "31",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530050",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ff26c8a070b..0d6eca5ff6f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.46",
-      "mac": null,
+      "mac": "00:E0:81:B1:C4:36",
       "network_address": "griffon-46.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "32",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280A8",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.46",
+      "mac": "00:E0:81:4F:CA:79",
+      "pdu": "pdu3",
+      "pdu_port": "D2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "32",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530051",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 bfc08f6557e..715c35dc159 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.47",
-      "mac": null,
+      "mac": "00:E0:81:B1:C4:CC",
       "network_address": "griffon-47.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "33",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000318E0",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.47",
+      "mac": "00:E0:81:4F:E3:0A",
+      "pdu": "pdu3",
+      "pdu_port": "E2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "33",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530052",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 9b7b4c654e8..b75d2023545 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.48",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:8C",
       "network_address": "griffon-48.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "34",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000317A4",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.48",
+      "mac": "00:E0:81:4F:CA:80",
+      "pdu": "pdu3",
+      "pdu_port": "F2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "34",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530053",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 a342dc06d5f..2570c2c0bf3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.49",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:2C",
       "network_address": "griffon-49.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "35",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300033026",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.49",
+      "mac": "00:E0:81:4F:E2:C9",
+      "pdu": "pdu3",
+      "pdu_port": "G2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "35",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530054",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 684aeacd1c4..89699ec4d78 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.5",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:FC",
       "network_address": "griffon-5.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "5",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280C0",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.5",
+      "mac": "00:E0:81:4F:E3:8D",
+      "pdu": "pdu2",
+      "pdu_port": "B2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "5",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530010",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 c4c2ec25494..3ea4c400460 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.50",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:10",
       "network_address": "griffon-50.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "36",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000318D0",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.50",
+      "mac": "00:E0:81:4F:E2:FA",
+      "pdu": "pdu3",
+      "pdu_port": "H2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "36",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530055",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 a0c5da6b2fe..6353bc87c33 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.51",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:9E",
       "network_address": "griffon-51.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "37",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000318EC",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.51",
+      "mac": "00:E0:81:4F:E3:92",
+      "pdu": "pdu3",
+      "pdu_port": "B3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "37",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530056",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 4632a679873..c4a08515af2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.52",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:A8",
       "network_address": "griffon-52.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "38",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300027F84",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.52",
+      "mac": "00:E0:81:4F:E3:7E",
+      "pdu": "pdu3",
+      "pdu_port": "C3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "38",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530057",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 3b9f6a2b1c0..5112a5053be 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.53",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:30",
       "network_address": "griffon-53.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "39",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280C4",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.53",
+      "mac": "00:E0:81:4F:E3:56",
+      "pdu": "pdu3",
+      "pdu_port": "D3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "39",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530058",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 06549af125d..c00c9863b02 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.54",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:2A",
       "network_address": "griffon-54.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "40",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000318C4",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.54",
+      "mac": "00:E0:81:4F:B5:EE",
+      "pdu": "pdu3",
+      "pdu_port": "E3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "40",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530059",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 f807f21c2b6..7840126dfcd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.55",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:88",
       "network_address": "griffon-55.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "41",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031784",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.55",
+      "mac": "00:E0:81:4F:E2:F8",
+      "pdu": "pdu3",
+      "pdu_port": "F3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "41",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530060",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 4734cdce4f9..8eabf558940 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.56",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:DC",
       "network_address": "griffon-56.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "42",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003176C",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.56",
+      "mac": "00:E0:81:4F:CA:89",
+      "pdu": "pdu3",
+      "pdu_port": "G3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "42",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530061",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 3c4537ebf43..0b78dad0dce 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.57",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:EC",
       "network_address": "griffon-57.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2",
+      "switch_port": "43",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003173C",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.57",
+      "mac": "00:E0:81:4F:E2:DE",
+      "pdu": "pdu3",
+      "pdu_port": "H3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon2-ipmi",
+      "switch_port": "43",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530062",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 3720b6ccae0..d3ac0152033 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.58",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:28",
       "network_address": "griffon-58.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "1",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003179C",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.58",
+      "mac": "00:E0:81:4F:E2:F3",
+      "pdu": "pdu6",
+      "pdu_port": "G2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "1",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530063",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 a165a01828e..d540b13f140 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.59",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:F8",
       "network_address": "griffon-59.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "2",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031730",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.59",
+      "mac": "00:E0:81:4F:E3:05",
+      "pdu": "pdu6",
+      "pdu_port": "F2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "2",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530064",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 0a373954129..0746f16ce2b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.6",
-      "mac": null,
+      "mac": "00:E0:81:B1:C4:E7",
       "network_address": "griffon-6.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "6",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280AC",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.6",
+      "mac": "00:E0:81:4F:E3:74",
+      "pdu": "pdu2",
+      "pdu_port": "D1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "6",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530011",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 3ee086b63fc..0f8ccfeb309 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.60",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:F4",
       "network_address": "griffon-60.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "3",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031740",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.60",
+      "mac": "00:E0:81:4F:E3:90",
+      "pdu": "pdu6",
+      "pdu_port": "E2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "3",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530065",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 c38dac9b5b2..53a74f1f61b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.61",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:E2",
       "network_address": "griffon-61.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "4",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031804",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.61",
+      "mac": "00:E0:81:4F:E2:F2",
+      "pdu": "pdu6",
+      "pdu_port": "D2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "4",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530066",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 f1d4a86bf70..1bb4401a375 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.62",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:D6",
       "network_address": "griffon-62.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "5",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003185C",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.62",
+      "mac": "00:E0:81:4F:E2:B8",
+      "pdu": "pdu6",
+      "pdu_port": "C2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "5",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530067",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 fab177e3ee9..84cfe70c18b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.63",
-      "mac": null,
+      "mac": "00:E0:81:B1:C3:84",
       "network_address": "griffon-63.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "6",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000317B4",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.63",
+      "mac": "00:E0:81:4F:E3:0B",
+      "pdu": "pdu6",
+      "pdu_port": "B2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "6",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530068",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 c16b601810d..194acd434dd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.64",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:48",
       "network_address": "griffon-64.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "7",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300033012",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.64",
+      "mac": "00:E0:81:4F:E2:CD",
+      "pdu": "pdu6",
+      "pdu_port": "B3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "7",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530069",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d63b568ed27..81ecf6ff288 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.65",
-      "mac": null,
+      "mac": "00:E0:81:B1:C4:D4",
       "network_address": "griffon-65.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "8",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031750",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.65",
+      "mac": "00:E0:81:4F:E2:BC",
+      "pdu": "pdu6",
+      "pdu_port": "C3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "8",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530070",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 0bb5e039286..e5c470e43e8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.66",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:2E",
       "network_address": "griffon-66.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "9",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031968",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.66",
+      "mac": "00:E0:81:4F:CA:78",
+      "pdu": "pdu6",
+      "pdu_port": "D3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "9",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530071",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ca18a1e5aa7..93366a67f2e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.67",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:F2",
       "network_address": "griffon-67.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "10",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000317DC",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.67",
+      "mac": "00:E0:81:4F:B5:F0",
+      "pdu": "pdu6",
+      "pdu_port": "H1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "10",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530072",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 0807a027c8f..647b406ee79 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.68",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:70",
       "network_address": "griffon-68.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "11",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031858",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.68",
+      "mac": "00:E0:81:4F:CA:8F",
+      "pdu": "pdu6",
+      "pdu_port": "G1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "11",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530073",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 354b0053e76..26c6ea2adef 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.69",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:3A",
       "network_address": "griffon-69.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "12",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000317B0",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.69",
+      "mac": "00:E0:81:4F:B5:DC",
+      "pdu": "pdu6",
+      "pdu_port": "A1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "12",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530074",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 a1f4fdcdc97..7ab8f07305d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.7",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:AC",
       "network_address": "griffon-7.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "7",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300028054",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.7",
+      "mac": "00:E0:81:4F:CA:90",
+      "pdu": "pdu2",
+      "pdu_port": "E1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "7",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530012",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 5c6135754d8..cba89b55e6e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.70",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:8A",
       "network_address": "griffon-70.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "13",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031810",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.70",
+      "mac": "00:E0:81:4F:CA:77",
+      "pdu": "pdu5",
+      "pdu_port": "A2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "13",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530075",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 3411125035e..5596f442fb1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.71",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:CE",
       "network_address": "griffon-71.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "14",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031824",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.71",
+      "mac": "00:E0:81:4F:CB:05",
+      "pdu": "pdu5",
+      "pdu_port": "A3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "14",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530076",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 440bdee22a7..90e92e2ed65 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.72",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:D6",
       "network_address": "griffon-72.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "15",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300032FCE",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.72",
+      "mac": "00:E0:81:4F:B5:F1",
+      "pdu": "pdu5",
+      "pdu_port": "B1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "15",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530077",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 491a59e4670..b978b060e76 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.73",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:BA",
       "network_address": "griffon-73.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "25",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000319FC",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.73",
+      "mac": "00:E0:81:4F:CB:0D",
+      "pdu": "pdu5",
+      "pdu_port": "C1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "25",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530078",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 27c307fb07b..73b8641d7dd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.74",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:94",
       "network_address": "griffon-74.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "26",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031890",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.74",
+      "mac": "00:E0:81:4F:CB:00",
+      "pdu": "pdu5",
+      "pdu_port": "D1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "26",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530079",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 79b0a14bb25..6d7c63009c2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.75",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:D2",
       "network_address": "griffon-75.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "27",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031874",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.75",
+      "mac": "00:E0:81:4F:E3:75",
+      "pdu": "pdu5",
+      "pdu_port": "E1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "27",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530080",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 54271a5939c..bef9509a7eb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.76",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:24",
       "network_address": "griffon-76.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "28",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031974",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.76",
+      "mac": "00:E0:81:4F:B5:E3",
+      "pdu": "pdu5",
+      "pdu_port": "F1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "28",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530081",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 12200cd4cc0..ad4b4987f5d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.77",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:F0",
       "network_address": "griffon-77.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "29",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000318B8",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.77",
+      "mac": "00:E0:81:4F:E2:E0",
+      "pdu": "pdu5",
+      "pdu_port": "G1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "29",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530082",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 54221467186..c640399b8cc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.78",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:44",
       "network_address": "griffon-78.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "30",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000317AC",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.78",
+      "mac": "00:E0:81:4F:E2:E8",
+      "pdu": "pdu5",
+      "pdu_port": "H1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "30",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530083",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 5bed0337fa7..2e165d401a9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.79",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:B8",
       "network_address": "griffon-79.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "31",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031808",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.79",
+      "mac": "00:E0:81:4F:E2:B2",
+      "pdu": "pdu5",
+      "pdu_port": "B2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "31",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530084",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 c981a990c52..1ab4ebded9d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.8",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:A0",
       "network_address": "griffon-8.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "8",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000280C8",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.8",
+      "mac": "00:E0:81:4F:E3:C2",
+      "pdu": "pdu2",
+      "pdu_port": "F1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "8",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530013",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 79308909a70..8d73453bba6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.80",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:EE",
       "network_address": "griffon-80.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "32",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031800",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.80",
+      "mac": "00:E0:81:4F:CA:A6",
+      "pdu": "pdu5",
+      "pdu_port": "C2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "32",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530085",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 77ff45e0737..6768dbfb54f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.81",
-      "mac": null,
+      "mac": "00:E0:81:B2:C5:72",
       "network_address": "griffon-81.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "33",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031860",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.81",
+      "mac": "00:E0:81:4F:CA:7D",
+      "pdu": "pdu5",
+      "pdu_port": "D2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "33",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530086",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 80a10b97f9b..cc83dc48ca4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.82",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:7E",
       "network_address": "griffon-82.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "34",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000319F8",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.82",
+      "mac": "00:E0:81:4F:CB:08",
+      "pdu": "pdu5",
+      "pdu_port": "E2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "34",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530087",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 88acf7e5982..8f8888b4456 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.83",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:40",
       "network_address": "griffon-83.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "35",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000319F4",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.83",
+      "mac": "00:E0:81:4F:CA:9F",
+      "pdu": "pdu5",
+      "pdu_port": "F2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "35",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530088",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 e19d90ceb37..6e39f760b87 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.84",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:4E",
       "network_address": "griffon-84.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "36",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030003180C",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.84",
+      "mac": "00:E0:81:4F:E2:D9",
+      "pdu": "pdu5",
+      "pdu_port": "G2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "36",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530089",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 d3ed3031dc4..79d9a86e92a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.85",
-      "mac": null,
+      "mac": "00:E0:81:B2:C5:BC",
       "network_address": "griffon-85.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "37",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C903000319F0",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.85",
+      "mac": "00:E0:81:4F:B5:E7",
+      "pdu": "pdu5",
+      "pdu_port": "H2",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "37",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530090",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 46d80289330..7f23e23c4b6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.86",
-      "mac": null,
+      "mac": "00:E0:81:B2:C2:3A",
       "network_address": "griffon-86.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "38",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031A00",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.86",
+      "mac": "00:E0:81:4F:CB:0F",
+      "pdu": "pdu5",
+      "pdu_port": "B3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "38",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530091",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 86d0bff0d0a..4e501e6dcbe 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.87",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:82",
       "network_address": "griffon-87.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "39",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031A04",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.87",
+      "mac": "00:E0:81:4F:E2:BD",
+      "pdu": "pdu5",
+      "pdu_port": "C3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "39",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530092",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 7ce26205e75..89d4ee7d32f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.88",
-      "mac": null,
+      "mac": "00:E0:81:B2:C4:CE",
       "network_address": "griffon-88.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "40",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031A18",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.88",
+      "mac": "00:E0:81:4F:E3:8C",
+      "pdu": "pdu5",
+      "pdu_port": "D3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "40",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530093",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 ac0b197215f..d9b85585ff4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.89",
-      "mac": null,
+      "mac": "00:E0:81:B2:C5:D4",
       "network_address": "griffon-89.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "41",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031A64",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.89",
+      "mac": "00:E0:81:4F:E3:81",
+      "pdu": "pdu5",
+      "pdu_port": "E3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "41",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530094",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 5cd45d1f645..7dd22c8b724 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.9",
-      "mac": null,
+      "mac": "00:E0:81:B2:C5:76",
       "network_address": "griffon-9.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1",
+      "switch_port": "9",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C9030002805C",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.9",
+      "mac": "00:E0:81:4F:E2:FE",
+      "pdu": "pdu2",
+      "pdu_port": "G1",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon1-ipmi",
+      "switch_port": "9",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530014",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 7cd7988f628..e0c400b046a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.90",
-      "mac": null,
+      "mac": "00:E0:81:B2:C0:46",
       "network_address": "griffon-90.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "42",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031A20",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.90",
+      "mac": "00:E0:81:4F:CA:FC",
+      "pdu": "pdu5",
+      "pdu_port": "F3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "42",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530095",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 57519023cd3..2e451abc741 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.91",
-      "mac": null,
+      "mac": "00:E0:81:B2:C1:BC",
       "network_address": "griffon-91.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "43",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031A0C",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.91",
+      "mac": "00:E0:81:4F:E3:5F",
+      "pdu": "pdu5",
+      "pdu_port": "G3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "43",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530096",
   "storage_devices": [
     {
       "driver": "ata_piix",
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 b92ecafdf6d..94684934983 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
@@ -14,11 +14,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.28.54.92",
-      "mac": null,
+      "mac": "00:E0:81:B2:BF:DE",
       "network_address": "griffon-92.nancy.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3",
+      "switch_port": "44",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
@@ -34,7 +34,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "Infiniband 20G",
-      "mac": null,
+      "mac": "C90300031A08",
       "rate": 20000000000,
       "switch": "ib_switch",
       "vendor": "Mellanox",
@@ -43,13 +43,13 @@
     {
       "enabled": true,
       "interface": "Ipmi",
-      "ip": null,
-      "mac": null,
-      "pdu": null,
-      "pdu_port": null,
+      "ip": "172.28.154.92",
+      "mac": "00:E0:81:4F:E3:5D",
+      "pdu": "pdu5",
+      "pdu_port": "H3",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgriffon3-ipmi",
+      "switch_port": "44",
       "vendor": "tyan",
       "version": "no"
     }
@@ -71,7 +71,7 @@
     "vendor": "Intel",
     "version": "L5420"
   },
-  "serial": null,
+  "serial": "812530097",
   "storage_devices": [
     {
       "driver": "ata_piix",
-- 
GitLab