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 4a3beb19dd780fc96f1d478270fd94f577be5288..729e4413ec2e77f490d8358218e5c4c1f5e22348 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 b21195ddd381118601685390fa67feebe654a925..346667a159cf778ad5703646191b23526579b469 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 21452c167b0aeee391de63f2b0188d25078f3762..df28c67973560a505546b79f67c023bbd3f981d9 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 60dedd8d535e4c56b00f12c533aae7073c34952c..b5127751d3f877a9d337aed331dc64841e5ecdc7 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 d55291c992ac0a8e47772e59214832f1f0a17d98..1d7b3d7f23d7fb75fda08f8ba4820daeefa6fb1a 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 08c2aef7cfa1932898ed417fc3e9b4cf6a14d839..62329a69037cacc13fbe74a2759e9f0e04699372 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 8dd1fdc5f4b61401b8d5d115161464f0a89019dc..b4820571f18cc805682f3037f83a321cb15b026c 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 8d011d67c4edb61c5facc2f1e16535be878ca628..5cf9513fc40156e50f5e8eefcf6eb6600fe800e1 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 c6f1f85bfc1416c8502dcbb3cb2af109242053d4..9ff8559472ca9efe60a492da6cc518747099d70c 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 91391a5a42ec6340c905d78f516154b5e00ffa14..2f00cf0fc1c2a15222bf83ccfdd4a9fce0b6af19 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 bf5abbc37ee481db142891582236eb69029d0757..bd5cc2bbf8a44820d12af5ffc58d73137a47c479 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 77beb3619d879e3e2986cca0d4479b9bc39481e2..27673fbdf7c9106da23352e77623ac22e809bbb5 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 b5b9d3bfb81d8775cedceafde0bf3910d994fcf3..5415346e5263c13d1ac21a9d1e63edca078b126e 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 02ab49269d8f30ea964b99d19371bc43a6924b94..626e23b227ba1a5d2bda17a64bd0234afbd08e72 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 7bae35276f4b3904d714df33f86c7e3de7dcf9c6..70dffa637c1b8e28edf98e9ced78984c4a202b1a 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 61a380a028e78fd4993ab4ffdbcb430254d07f52..78b517adaeaf70843a9150bf7bc42951e73532d6 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 2a9b59e104320f27e1bdc785f364cfe199713958..7be57334e1692946e22bb52099d3b6fe650eae2f 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 b9ccf7d05042da2d1332e10529ae82d33db0fb0e..7434c0f2546fefd11538888be56e46d1658a3959 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 ab1899265ad84c6621b9401fbc37746fbff48258..f808b8fc3be42bd50a14f2464928fa71d4ee7528 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 26ef17ce55fc7c27da9fe063b3e6341902ce07c7..1e84ead8cfb6a5c7c8b14b82f5b721335a2f6709 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 264099603f42ba78fddcdc14149f9daf63ce5623..36f112244465b17934e4374419221c7e8cdcf646 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 cc96d901e7fd49c1d2697684b34aff35aff5dfa9..c32ec855bea78bb162378a816426f25ef4e94cc9 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 cda40ac4b5aabeff28780a419a5c6be1ab290a36..90c4ef5ce7cefa75c4527aab238fa27bf4c14247 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 d304ecb72854b45cf80515862fb6853ccbe7cfb2..860b14277961a286c517397c73571043a99f29f5 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 8a4f17b8d296f8e1b8e3824eadb1e7c3b3fdaef0..5db876def059afa9eeb998a6ad18fe70dad54ad8 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 ea22e05cbff9be0d1e303ff1f67ebcbf5feb7255..f158ff7e332a8980e34fca751dbb2699db89e0dc 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 b1d1c3db9d5043230abd1168bb2e98a85a885df6..4f7f905db1a46a9144709b0681646988f7a9e58c 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 559ff1f91cf88485f8061e496db227be902ddb70..6d19f0806fc099e8b2ff4e8b80a44d6b38d0e42a 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 3a1a93cfe0d3daebea35dbab2078a55f71165bf7..01904596d2cd59b80cacdf19d4491e634709bcd9 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 6392e30c560920c6cb311797d61604e1e7b7d412..39f3471f3e5cbc9d8c454f57fd642f751435d3c1 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 d97f58da6b2a4fa34ef57e18c878f72fd0b24303..c5556ed1fbd245273dc38865f94209a9769af102 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 0abf753867d509bc9709cb711e710eb4897f5019..372bd296b27edbd86632f19ba8755c6933add0fb 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 74e0ce7f95e8a1d117918548bdc383690ff13420..a0c04eda2c5d3c8942143a2e5f14d53fc8362069 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 bbd7f818cda5b5d0a354bd49cb870650b79a7cb8..c415cad856e771f3c01927bac32ad5bdf2a8ecca 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 adb7ca70dc44860ba884ac5234d3bf7510176455..6f7ef5a7cd0a81f7a2d72f3af0d4400354ea934b 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 d300e45b9fed0cff7c0a2ab66761cc27e1dfd62a..0129ba5b38855a4eaaa1cec24f2e0622ce6a8c94 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 899368ef4be69f0676a831a81b20cfd6eeae9e58..7c547352dc61e79632adabd296f17981df89891e 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 135b155c63d10aa97e5efdc66efe395eb05104cd..7fc85edc576e3c21cda67e757e652a22ba661507 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 b09a42f24f86eab39f0fd4a0a4b05e21ce507ccc..dd70436353bd04c5f492b125636d2bb66bc95fc3 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 acf05f52872979a430d67995226a85e9d993c7f7..47db7c053501e468a391c442d3d9df3937957bec 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 eda691e8d12a1ca8fd2d56bf23608a26c1b8f2a9..d9613c06b2a33efb0236ded7d9a077611dab917c 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 dc0e9bb7d29e03a7455b8cb62d2e3a6f522bf2fc..851f90c29adee5aa878dae5246f0847b6d67411d 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 fd21f762e47f0a8c763843d31493872d8e265466..19adc33e33a099f87d673252a3324cbf97bfadf3 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 7f29685c3c6462bbb73688439808f48cfec13d49..aeb6cd189d9921e56d8092519d2931dbd222c7fd 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 cc6614d8dd89cd5546397d7979bafe961b243896..eb6ed044fc6ed38bac2d72a9e6ae2dda31d5b5ad 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 61777d91162d21a5d747efbc844fd7facfef0343..0878822d94bd27c7645ad42a5869212d28108166 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 e05ad26b4e6c6d27bff33dc424e948541118242c..797b396aa9b2d71fd459b228877d4ab81fd60f9d 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 1f693de410b523f4047f78aa7160d89cb090a444..c451a73635731162e310e46560491cee627212c0 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 d1d3d0f3c4c84c749a1e02f85325f486284bb24f..aad01835e99203d5b93ddd45a7306f9874fc2ed3 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 85ada5c83c2ef223c81f8f15a743114c021a72a2..57a7e02b48cf08a73862dd8856f6b393cabf15a2 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 dae863bbbfe84a66608953849219a8c2cbc8fab1..0f405e2ae652a352e1960342a4ce38d953f79d94 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 bd1f2dd45a0793a3dcc68aa4ed8f54d3727ee85e..5aa37cbb25f7714b0cb2868f1c1c87c494743626 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 dd15337982f8601d05c52c3de7c67f20927b0628..2397ccca937ec5764188b8746b1c945f0a02cd34 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 72cf14843ca6ad6881286b9ac40ac6c2f0111441..4881fa5c6be8b129490f7e6f76fad9496617404f 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 acd4ded22af8ca29e756bc78cddf4e8b4fab8590..34f1249a40e46b04e49889bbb3b010c46f0f6883 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 644a2acf2528f21e39f8d0695eabffee3c6e358a..ae82f7a10bfd538026eca3bf793ade6a6584af96 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 da417035ea1eb38bd425fe4de58cff246581a4ae..e82a8bb8f0f48939cdb74c8dbfa80c7758b9887a 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 9da43374cc4b79abb36bf240f36f23359326d7a9..7398a8770f20e1571cbaf74aaeec04533169e045 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 dea82f18d9e0944c72d69e4a114b248d923c1ec6..b701704165a4a5e888258a9653ae112e4eed3d8e 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 3d2525481da25f3ae03101bc3bae2e94d327c3f5..a4f3dada41bacdd59b87b3e002033658f2cb84ee 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 0a0f69ef13d2fdaeac0d59aaed8d1d81b228f892..5f09533bef7297a07e076c66dd57adbaa4be21cd 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 b09a3487c48cf3ecd0750df175f4cc9031b751a9..0d137d8ec93a951d94e8d434ff4b3cff2221f8a1 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 81ac214b2697f4c12136481260bae69d568d2d4c..73979dd41445459082f6a4a38a8a39583ed48121 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 040411e411c7a36e98608c275f4bcde6e07af69f..9b9e24bb13d8a25cfb5216d5d748659397da20ab 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 ab985d6622d81fc0a3dcd02753fd6b0d6a4425a2..69752a711e6953d69dce679eabd386c03e5a4c97 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 e60aaeb2d03134e70389396549833efeb14ffe86..7bf0b7ef4b7f55b01339d63c3381801071eac433 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 dd56b28f125eeffac4f9cc9693501d512bbda753..40ef1177f2a43b644e33ae87c21b8a0a05c747c7 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 ac69d4d2609cff3f07472cbeb556e58b4a7f4212..0e43ea95e7781388eb0c2a0c41d4c192fd8d6332 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 547d9b0f15f419613e75ddd5267e7596332d2cd0..2c035701605b5b3a2c20e23a0b1b6a82cdfba31e 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 27acf0f92c32becd96a06153f4c38ca4f3972e61..b12f0468a7fd7d181bc44fc9d395e6fb1217e7c4 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 73a0e6531b2f4b7395e101f924b040dd431ede7b..ee99b0bf1e4015d02fbe71fe9403eee41b2fe87c 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 9958e2f05d963a219a342ae7f6b696a28242c0f4..4b317960bd8fb2fc0dc31d1eded78c7bab12cc1a 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 c359e68c61893a8baff0b03bc96fcc551d6fb14a..bf53d7c14d66358d3c4a47a00342052a322ce739 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 d3784f6f690254e4cddbb09e111de10f8b093904..6ed7d52d0699ab5bfa77f9495d35af0398b02b2b 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 f0b60b5eceff56865328414951dc7f4a6d40d23e..7f576171edcc4dbac6144be7d8d9d0b9f55ea07e 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 0e8de3cb4dca690a72c0bf21c8ed5b5c2f3c2a42..7ab2c28b1623e9838492d9bd7a49ac4157f47df4 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 19fd00208c0a46dc14c9153d76a06a728863ffe6..ae8fea65d081150c73f4255f31072f8f2b618082 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 97559f13b11f4136fb0aa8c7d9fe806c5f2d8ec2..56964284435ce878eacd2180bacc43a6b973d599 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 ef3da363ac17fc9a1e6a9265df40f29cc489a06f..df93092a77274efdbfa7adbd84fae7eab0350bbf 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 aed6c03b155dac53ff48a15abf3479a301e9455d..58011a78fd0cbf2a8a3ed7bbe334b007477ef342 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 b6a46f34ecb5ac36adbd00ea07a856aeb18341a5..8a320861d9cb4b1c5fd3b1726a2c0b05d0eefced 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 00c0aba21369eb3e02e8e25944267cc316a32c77..15e38139ca5d72d13eaebe4cb59fadd04d8e4294 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 592078031bbbb61f6e29a8c9e6f8d44031533f2c..12d9f8fc59c9ec5cc30b715cce4d58b435a616f5 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 7ec46177f6a2651b321951507ec47f38efe5ffed..3d990d14c7bef54d011a6664e698c7900657e9f6 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 223e14d5a49cc4fc119191c5b46b3e7c458572ff..d3b776013ad77577720fbddbd79a179e1b77d22b 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 e7e62d543f92f60de510377905ca32ba43883547..9acbe109c6326e27ea087bda8dfa2f91eff7cf3a 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 0452a830bca51d96d7518b4be0cc44d7e61bc59e..25d6030659e9ad1fc9ff7efa986646d2a99eeb52 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 bd3b6de2b0a5e7538a60572bc5164adc7442b395..ddd884a8a9591e413c8e5ab3754a9aa778e34f3a 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 22398bacafbf6f206de5e973557a05bc54dbf683..bb1872827cac47ab08766475d91278d1147ff616 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 b6a195cd7f4ae1aac0e550ea3181fa4b84c5022b..e509aad78197bc67699cc133bd004e8ce84acf6f 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 5cd253db5e57722c4ee7b3c078e7c9191bfe7593..a445e7aef0093739de927199a88bcef5ef8073a4 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 21fdfacd120878d9734ffc0c302d68dea8406ecc..b273fbba5b2ca16f8f6afb7ab65d7c7fef839c13 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 ec4f9118a379c6187c284420a0eae979f004fc7c..0d410782a31eaa245fabf47ed7d9f3ad212a2d00 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 39285260e4ff47a4fa6ccdeff61b34c03168511e..6e3932ba6a171f9af5a9ed9374930155d6ce5c99 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 05ba91ec68c88a4f5c25beea9c501dcc8b9731c9..7b8c6efb1fdb30da349fd81569d549ee992e6db6 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 ecf82aa7adeafb0499f8d40b6ae377749d504bd1..23dcece2a4cb0585412a8774a8d5739331059334 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 66065d39abc8aac5c61d534c790012f2cdc464e7..6a5beb4dac27f9016cba06c92d5407804afb22a6 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 637caf1cd1428ce8f77c36db9e280ff9803eb0e8..6d1f24ce36e5f5a034462b676ba43fcdc0583252 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 90b23d0a6a73a84f5de93658861f26fe2d897c4e..737828781804a562c9ef7aff87b45de550c2507a 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 61551b4d5b3f91397da1cec9cb20b930b0c78c97..99614c85792e55d811bc8da185ddf764119c57d0 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 6e9a6238954ff0f2dea578c8443d57fa065d95d3..66d9dd2bcb5bb1cff2872184479caefb6a7ccf90 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 d6f127d818c4b9e95ea006e5413393b4565c9650..4c3119db632ddd8812c587d71bd85c51083ff242 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 5c9e501a5a01a3e2eda170c5c4abdf09ab33e805..caed68acfe4ca18b7cdde94a83f5995d38790f16 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 fae2af9163e381b04d0ef143c637a01654161e2e..9fc2e39fceaf57b4983eabcc887e7fa4cbc05edc 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 a67dd71ab1d0ceeb96f2719d7158b3362bd4b57a..03dad4b06acb4ca492af8f7f3d8d15daadfe8c01 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 1ddc3338e72a7fbe55212b889e078736d7b7d65d..3524c55ed368fc71293434aaa1bd47922595510d 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 7cacc9cea8ecdf80f02c13862a6c324ddfea843e..89a62b6dbf6208d73c17ebc1125cc803844414c9 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 31dd49d775b8de0a541ba8f9175759a9c93bafb7..9883d8db223034f522c9691870f2e89e884306eb 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 0ee70de6007f97bf224734c187d52164ace3f23a..d3aba799da50aeb8a9c2710f6be800e6be379666 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 455a838a20082c52fce5a0f8054e4dfadcdc559d..2b096211f0d307863bf1bb756b5f760adbd1662a 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 4cf3119c5cbc3b1bc317ad0039cc83b212b9f597..61081366127ea05f75a42cf6ba61f70f3cbf3d8e 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 82ff547cc27f366a7aa3f22102086d27af98de3d..7fd9d4e9612c0aedb894cf180b82f5b3e2e1471f 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 ab5e9af400849fdb56e780d34c8e52db48866c05..d6be5009d2c1133ae3966c2de55296a5dafbf8fc 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 c9a3adea291b335467302daa381b22ab21c4e13a..8fd19db919a5e33d34a2c17b86f0cb0d1c7952e4 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 01c615eeaa882637e98a16475b7add1f4d87eca3..96a4ea86b2ba21e367feb660e889d3bcbdc522b9 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 625877a95fd153190a7c374c80f94eb05cc6a584..438c29e11ed470131859f23c2291938ce12100be 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 dab772842f8e66af256a3c627d98d5a0f920793e..1aaac48e8afdb29d64e93827f660571d4811bed8 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 75b8643c1dff405d9ae25721ac65be6f00026f1b..1c20ec85443fbe4994e72d3c7f5ddc1e216f5643 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 bd0683695677918f7c80341037a5651b47f9a913..310a0143bd30270fe7d70d7824869132d9d73149 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 1c8ff80af084c3d2fac29fd9f333ebe44fc0e407..0cbb1bff9a61c0d1dc31bdd89ecea174ddc7e65e 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 4a5562e3c141b8fba19a547eac65f213fc7a590b..dd2976543546acec49a525ed3617519047d8012b 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 fb7f01bb8faa6247edf0b1fc278b217ba8729e07..d94560628916fae3eff0d5452b9a01c65ea7ec92 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 b22cf02473a7edffb778f3a8cc9d0a03b81b7df2..b312ea897960738a8e3a99d7f0e6bc85bdba8c6e 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 737d6781ef223b1b7a0a99dcbebbae321f6c4c82..9048a93d992a65efecc92269596c92bf1ceac4f3 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 94f59dfc2d49fabcd98fe7f9780ad5bef785c73e..eb4663f76447a38137bade6553dd0f74b9d5ae4e 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 ed8c0a839c0d9ce3a57c417b547ceb0cafb3bf71..2312481ab0ff22eb1b12e8b9575047c6c0024fae 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 9565f707e2b9695a433e8e6de6339b18b1ab7417..101d9ad212bea88165db6e32206e3c7b7f38682d 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 f114319f48cc29455f320c13be5f9db59c45486b..e82889e9b6d88267ad8429e9e12dc52980a51a13 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 0e2ae3930287e8696d0d39d2335fd72bc88b9a4e..de2198caec18e5232d3d7dab8d92b635f7fbaad2 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 346e33400863f5fc52bcd06a8b093693ada1acf4..8fb4e4f279452cca14654f6ed19716d00166cb5c 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 8f0a680ce0a690aa189dbe26ea84bf1b6be54bb4..6204abd773e7d5ad40f65338436c79e99f61b249 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 a821891f2080fe2578cbd3e1ee49aa221ba2420a..aff3a9b071e6958532fa437a791a31d29b457c33 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 be8af01e624df94bbdfcc6e41bc6c36a7d3fedb4..030cb71feb1cc6cbe5e80cd660a1e83cf9e35ed8 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 19018dc7572206db8bf7f278e178018d07117414..e556a08dfdcc526d3f910211d62a8bc75fafe7a5 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 e614356a2385dc76b2d941144610710a6c82dcca..583e454392af513742cd3bc251ea576e31dd6080 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 d5ba05ee7f19a18f02859e659246e3abfd8a58f8..53de86a3c1db8fda0c44dc6c14d217dea41d2958 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 c2f82e2e8b6a5639ea92fb33068333dfa6322c37..1f0a948afb8ba24cbdfffce7028c034f8de2615d 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 79d8872704065a7cd49bb0d6a80c4fb43bd7e9fe..4e961d21c6dffc3b06c7e598cd07311440cf1d3b 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 2c74673bd962461bdbbe5a161a634e2e9646f7dd..c7c70f7911e4657f2d3548bcab57d397c6651493 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 77ed027ae28ea5bb3290ca9ae13d5aa05f624c2f..b8adfa7351e1dfe7abf0c57ef6d099a4cea56f93 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 9fd147d28c33b5df85a45a95c33191e1c4b01159..23502ef2f33f2e8f6b1d2044cbaa465a2d4e5178 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 261d7f3bfa734e245cf940e45993013eefc96a59..bbe0fb0c03655bd71d69a7b4126a2d9dcb1b6605 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 8cafe651a7f5e51f907378e3d8350fe9d0b1979a..cfdc43bfb770c2f490f36a123654785b1367fb6b 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 75b170ac6b85e268764393f343687c805b5beee3..b965bcfe044577b560a9c1cc53d7c7581e5d0e89 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 2311790bff622d1481ae6ba9f902054865dd238f..45aa02a96ad04ab1e34ae3ac17a19541349380c3 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 b2b4e32974157fa93fb3f6db047da993878693d7..047803c04270b5bc64afecb146380c50bb0d4316 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 c8372306ef9799ca9ed190ba43f550f611dc3368..98d1ac95cfd116e12650f6ebc03836563d8897ca 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 932c8771073c4f787ba4d7576620a46bb00d34e0..19267f23945b988eff1d33c1c9e45bfe27114dd8 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 3e106c3ed3c37604b1e404d8c9790460e396679b..1799c5fd9782d79cfb777af48adf17e2172e574c 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 d58c266c228958d25bb992c7782b0fdc48addad0..95afe32302d8c88bb14654802a71abad34c3875b 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 7954c9f8b84353f35f0a0ba19de0c2f6e08b774d..09f32b734ab1d53844498b601769860fecaff4ec 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 178dcccd898f70e3950d02c8c65949a6b8866f46..c131bf529319fe9dd944e137895c4d8dd42d617b 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 16102329031a52850a79316f62fba977450b6722..995abfd18fcb0210b67710febdf22dad91a9719b 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 850572a63c2cc4d8e6e92b9769df3d7bbeb810ca..71d2c56afa3ba8e820803cd6207f44e08f35fddf 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 1d4e6f13908f79e1db154dd135c39a5eb39d1033..634e585b9e3b86142a099caa186c7350718f7ec2 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 f76c34f3580b0a7224cb5b707d696e1ac3e9f6ba..341ec2297aa7632d990c096ff90364fbd3c33543 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 4d93eada8dbae77ce177a2e9c75c50acb02c2885..11aabbfc31f0fe1ae8c302f44eb962167bc1c0fd 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 2ca66696e81994ea45778c50077f1962d29358d0..cff779ac382003881de5bb0f8addac25a911d930 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 f52de2c4572e441b9d9cf5eaa3d274303f09fbf7..f03ffe5fe7c8e32f6c215304662811a604343d1c 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 1c9d6081843eaa2bcb5c31d0a45a0027790293c4..4c5cb86426030a89ee62e655806153b837188599 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 ff26c8a070b268dab9bbd268dcb23733f352d52f..0d6eca5ff6f5a623001105ce762f1e2112f0e1b1 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 bfc08f6557e77f1a08c31a8e8fdecaaca3432616..715c35dc159cd94ae50ee07c81564b95a68b5996 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 9b7b4c654e85b6f27cb1a7913da5ae9dd5919675..b75d2023545dcaa51cd45bf5eb3257fbd2f35dd9 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 a342dc06d5f7cfaae8851c8699346fdbdcfd8c65..2570c2c0bf32a3a3cc019c810a89085bfcb86627 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 684aeacd1c419a16a23a146f695668f817d9da87..89699ec4d780338871a98c04262ad545c2922c54 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 c4c2ec2549443f89cd2c13fbd5a7cf34e28114ac..3ea4c400460eef541f5f0115da8ebce259706880 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 a0c5da6b2feccd98846cbe41456611eb3f22f138..6353bc87c33fb836a0aaea5d7212d3d948b1a785 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 4632a67987377176693a42faad2f667d7bcd495a..c4a08515af2a15023d13e51a4237815ae9c92455 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 3b9f6a2b1c06e3c694dd3e2287738730626c605c..5112a5053be9b041da30d9bd9baa4c316b47c88f 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 06549af125d20b972ca3f6d5db6c602a0a839deb..c00c9863b020399212de62687827ed5a1458e843 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 f807f21c2b6983421114854e206a550be2e57cac..7840126dfcd54eeefe41227fd93219bb550ca531 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 4734cdce4f9094453d5e7b176fac9c2014b8b55c..8eabf55894088ca79aaf0467a0b94da3a37e23b4 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 3c4537ebf43478248198a4ab871c881458f0ced1..0b78dad0dce12428df9df3f01fb05d36481a422e 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 3720b6ccae0e2916ec4a2cad763da14eb1b9e5e8..d3ac01520330ad77faf0930621f831a7b1f33c51 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 a165a01828efa3d1744dd9a977d54a772fc9b7da..d540b13f140a95ef231f424eded07e2307cadf85 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 0a373954129d33804b80faa020e1d00fdbcb1a98..0746f16ce2b4955a6f4b455b7ce52b697c76b4b9 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 3ee086b63fc3af7111b25d2da0dd75f8c1500c67..0f8ccfeb30980e1b38545def4ab9053f9bb20760 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 c38dac9b5b2e5948521df5e30610d342bea8b57b..53a74f1f61b070ef5870d95364a2f9bdbf6214c9 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 f1d4a86bf704ca7c8eec59551ea1cb9bb6befa3c..1bb4401a375bd72dcd6c885951673e7a21f38ea3 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 fab177e3ee9839655aa3a9431808e9013c7e99c1..84cfe70c18b20080858ab2927c24c7bbd096767b 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 c16b601810d7c2290aa22ccc2b028258b113fe0d..194acd434dd89f8a5a8f7173874cac39136f4273 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 d63b568ed27cc8a70de0be895436b7665802a8dc..81ecf6ff28841f1e37eb63ae17c81573676eb749 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 0bb5e0392862e7b2bfb0648faf2780e41fe7f6d8..e5c470e43e8ce72dc18f39ea634c8c1b67f28c43 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 ca18a1e5aa790ea95c5859e89b1bde3dae2427b3..93366a67f2e9eb6984e5dd38a6900dc901f4a600 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 0807a027c8f6a23da9c18c4d2a83fd0e2c24d0b9..647b406ee79997beb6a7764f21aee199979f39e6 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 354b0053e760f47a4b45e01aa2f7befe6cf4c450..26c6ea2adefd0e0a54dd88edb660b15624851e5c 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 a1f4fdcdc977379d1c071db0cc2cce4aae2c45f5..7ab8f07305d8ad19168f15a124e786f18b5b2267 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 5c6135754d80d3b6c19976766d68b039bac58c51..cba89b55e6e85b996882a3776b08a17f2de62af9 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 3411125035ed63cbca01dcb19c3bfedf9bc748d5..5596f442fb197cb3c8e0a93f65d32d725dd183c6 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 440bdee22a77c33d8cc41b5f073e8cc9ec72c613..90e92e2ed6591d58c12f805aafb3400a645824f4 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 491a59e4670840af7a5ea5c09fe58dd208ef9730..b978b060e76008c3562f88ba9ebab6a7528ec356 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 27c307fb07b3fcbe80d57a428d6d14acee043498..73b8641d7dd3138aa7a25bbb45b53686ad78eca0 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 79b0a14bb25e03f757ce3ff6c0903e2ffe8eda84..6d7c63009c2466b44ee95179e9e57f1d73675cb6 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 54271a5939c74b0991ad496d18e1b05792bd1a2e..bef9509a7ebea0e3897e06cae8dab2a2eb4b48e4 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 12200cd4cc0d49d8877044276d50da3b6d1f1e79..ad4b4987f5dae24dc01d32b4800c2ef567ed2206 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 54221467186d4743024e33e308e172a756615258..c640399b8cc9e22a3878c196248672e574bc36b4 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 5bed0337fa75c8f2bd4725c17b2e3ba580e3f25d..2e165d401a92d5ed3bfef68c88abd946dfefc412 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 c981a990c5243a8e99213a5a98b14bd60006e866..1ab4ebded9deef33a8e59f723e3ee5baffe00aff 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 79308909a704ead23f0f6649d874dd85c19a09f7..8d73453bba672fffed0120a4dc6f403a0df152af 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 77ff45e07372926d5eb5cb91410792c123a6a242..6768dbfb54fecd15ae3e6a5c57bd9f678cf50af0 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 80a10b97f9bebc08b17f4a43eb8c3611922fdcf4..cc83dc48ca471eb70a85c0807acd5d1772ac5248 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 88acf7e59828a7f7cd9e57d3a1e3f54f18bc25b4..8f8888b44560eada5b896888ffad0fb91544ac71 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 e19d90ceb378f3c1d42549fc8f2acd910031cf81..6e39f760b877541e2e042dc37fd882a11eed78db 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 d3ed3031dc4836c59ea5d6398a6d43eaf6cd456b..79d9a86e92a3f48e179fb6a0851309ef15f9c5aa 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 46d802893300b08a3a0d8898f64dcd7edcf1427e..7f23e23c4b662cd07f34a66a6f8bc2463e9c6ff8 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 86d0bff0d0accd382212fd49940a91aff300cf76..4e501e6dcbe94eb511f81a6ff8853cb8d9617f35 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 7ce26205e7534f6bdfc3d97c7306aa9c54907cfd..89d4ee7d32f05214183c5c205ddb62650d2ce935 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 ac0b197215fefebc84d4b6bc62220328b72a3d42..d9b85585ff44d8e157254ae9a810af2db8579512 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 5cd45d1f6457fb2e605f17b5fd31ee058aa619d8..7dd22c8b7242ac31c9e2b3be1e8519a1ceeb7f05 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 7cd7988f628cb7793b2a8b42d01a96e9daa705c1..e0c400b046a1454ba27824512084a1929e84076e 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 57519023cd3a913b27bf0dc9bfc49ac0b27ec5ad..2e451abc741bf321217dab313853220e2a761b13 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 b92ecafdf6d3c36cbd085f7104e52f3171bae70c..946849349835e1ebe6d4cc1d7455f0022d37c7e0 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",