diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
index 9528c055c588bbe9ce334a67d6108c0f4bc1d022..e4638389ad035482a1eb545af7944ed412c0d237 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.1",
+      "mac": "00:11:25:91:47:F2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-1-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.1",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-1-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.1",
-      "mac": "00:11:25:c4:35:7e",
+      "mac": "00:11:25:C4:35:7E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.1",
-      "mac": "00:11:25:c4:35:7f",
+      "mac": "00:11:25:C4:35:7F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-1-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
index 02716097d45d7f3f19f119eb2fb664c2385285f1..b935c26f2a150b53e086e1a674c0a6941e7ee932 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.10",
+      "mac": "00:11:25:91:47:58",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-10-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.10",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-10-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.10",
-      "mac": "00:11:25:c4:33:38",
+      "mac": "00:11:25:C4:33:38",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-10.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.10",
-      "mac": "00:11:25:c4:33:39",
+      "mac": "00:11:25:C4:33:39",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-10-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
index 7584806c0f093421511afe3c186f9b2834b791d6..12c161167cb8a297680e9bfe8156ebc44cf0625e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.28",
+      "mac": "00:11:25:91:48:B7",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-100-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.28",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-100-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.28",
-      "mac": "00:11:25:c4:4e:be",
+      "mac": "00:11:25:C4:4E:BE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-100.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.28",
-      "mac": "00:11:25:c4:4e:bf",
+      "mac": "00:11:25:C4:4E:BF",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-100-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
index 4f39a7f1c005bc5f6d1c11059da6a85e6f94e351..223601429460210b27b25757d29ede0ef36f75c9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.29",
+      "mac": "00:11:25:91:45:DF",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-101-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.29",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-101-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.29",
-      "mac": "00:11:25:c4:51:8c",
+      "mac": "00:11:25:C4:51:8C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-101.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.29",
-      "mac": "00:11:25:c4:51:8d",
+      "mac": "00:11:25:C4:51:8D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-101-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
index bd4bd6a328465342af9ac153c9f502294109a863..ef056e47f65e58f23e12d2c0cbc48eab2e943a0f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.30",
+      "mac": "00:11:25:91:49:61",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-102-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.30",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-102-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.30",
-      "mac": "00:11:25:c4:4e:de",
+      "mac": "00:11:25:C4:4E:DE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-102.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.30",
-      "mac": "00:11:25:c4:4e:df",
+      "mac": "00:11:25:C4:4E:DF",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-102-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
index c7a7d863cee17993b897dd2b549c28558fca561a..84a4a7573fb27bf1b1a30669935214d5f6c5c93b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.31",
+      "mac": "00:11:25:91:46:1D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-103-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.31",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-103-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.31",
-      "mac": "00:11:25:c4:4e:fc",
+      "mac": "00:11:25:C4:4E:FC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-103.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.31",
-      "mac": "00:11:25:c4:4e:fd",
+      "mac": "00:11:25:C4:4E:FD",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-103-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
index db5647e91b21361bdd5b77115175461ee2da94e6..326098bb9aec2e84da9c5a1a52667679e611cd0f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.32",
+      "mac": "00:11:25:91:47:78",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-104-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.32",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-104-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.32",
-      "mac": "00:11:25:c4:52:4a",
+      "mac": "00:11:25:C4:52:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-104.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.32",
-      "mac": "00:11:25:c4:52:4b",
+      "mac": "00:11:25:C4:52:4B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-104-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
index 67a1d2679cb8b2a6d3c6150bd320c2fe0aa0e0f0..3961fece0376de1017f820f2d76ba949ffc14495 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.33",
+      "mac": "00:11:25:91:49:14",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-105-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.33",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-105-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.33",
-      "mac": "00:11:25:c4:4f:0a",
+      "mac": "00:11:25:C4:4F:0A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-105.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.33",
-      "mac": "00:11:25:c4:4f:0b",
+      "mac": "00:11:25:C4:4F:0B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-105-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
index 53546928577a1302a025ea7d54dd5429b1cda08e..90cc3b318d3287488058280d2aa804f91d32a029 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.34",
+      "mac": "00:11:25:91:47:6A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-106-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.34",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-106-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.34",
-      "mac": "00:11:25:c4:4e:c2",
+      "mac": "00:11:25:C4:4E:C2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-106.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.34",
-      "mac": "00:11:25:c4:4e:c3",
+      "mac": "00:11:25:C4:4E:C3",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-106-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
index a168bbeeed68b709750a321586055017be7185d2..c29c5399f2b33e9e1b7b255c912d83f81cd6a18f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.35",
+      "mac": "00:11:25:91:48:8A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-107-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.35",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-107-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.35",
-      "mac": "00:11:25:c4:4e:d2",
+      "mac": "00:11:25:C4:4E:D2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-107.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.35",
-      "mac": "00:11:25:c4:4e:d3",
+      "mac": "00:11:25:C4:4E:D3",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-107-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
index 09b79c5f64cccbcd41b813502cd0e7163e39369c..a60b56f617610a6be6c5f2da88772afb6d654189 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.36",
+      "mac": "00:11:25:91:47:DC",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-108-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.36",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-108-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.36",
-      "mac": "00:11:25:c4:51:bc",
+      "mac": "00:11:25:C4:51:BC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-108.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.36",
-      "mac": "00:11:25:c4:51:bd",
+      "mac": "00:11:25:C4:51:BD",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-108-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
index 392c0167b82a3144b8e61dca0d1f204113eef96b..de8bf9e3afc4f5ff6909a47309999bfb036f91e9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.1",
+      "mac": "00:11:25:91:45:F1",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-109-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.1",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-109-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.1",
-      "mac": null,
+      "mac": "00:11:25:C4:53:22",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-109.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.1",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-109-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
index ff9141c5c389c78b658c1212f9194330cdce177c..70a59ec25b08ac2782a7140b8e0f485b2a530117 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.11",
+      "mac": "00:11:25:91:48:EE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-11-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.11",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-11-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.11",
-      "mac": "00:11:25:c4:34:3e",
+      "mac": "00:11:25:C4:34:3E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-11.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.11",
-      "mac": "00:11:25:c4:34:3f",
+      "mac": "00:11:25:C4:34:3F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-11-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
index 590617582ba07ab8cbc0d2bc1c0bb551cab91c92..dba3f44bce3d1b8d2e17dbbed98b9adc97f38bb3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.2",
+      "mac": "00:11:25:91:45:DE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-110-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.2",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-110-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.2",
-      "mac": null,
+      "mac": "00:11:25:C4:51:A4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-110.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.2",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-110-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
index e05281dc08b3a50f4b4002014d06df6987d4fb00..8e11ab3706167be8505408c87c362997131bc87c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.3",
+      "mac": "00:11:25:91:46:7C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-111-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-111-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.3",
-      "mac": null,
+      "mac": "00:11:25:C4:50:30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-111.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.3",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-111-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
index 1692141a7e09cbc680220cc79d8b33d54de3cd42..55178fc6116a84a9f0846adf217092778cf8059d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.4",
+      "mac": "00:11:25:91:48:7F",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-112-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.4",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-112-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.4",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:C6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-112.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.4",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-112-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
index 1fbfbda6eb88982827b3187b0fbad66d6f2ad117..24330d3c3458053c9e31a5de8325af4792b71a51 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.5",
+      "mac": "00:11:25:91:45:9C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-113-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.5",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-113-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.5",
-      "mac": null,
+      "mac": "00:11:25:C4:51:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-113.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.5",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-113-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
index 1cc69eee277943f8f09c0c2824f74b76daf45295..b8d164ed5b1242fa308efda62fd69dcf705d7178 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.6",
+      "mac": "00:11:25:91:47:AA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-114-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.6",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-114-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.6",
-      "mac": null,
+      "mac": "00:11:25:C4:53:00",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-114.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.6",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-114-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
index febd139a860ac42a039eec99de79f564808037dc..92e307d8644244d7c823e8594a26ceb601129f61 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.7",
+      "mac": "00:11:25:91:48:5C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-115-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.7",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-115-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.7",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:44",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-115.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.7",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-115-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
index 56fec61f6fead6abaee5cee3c3f8bdc7857e8a17..f56befeb939018a62c1bf43f5fdc5d66827fe4bf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.8",
+      "mac": "00:11:25:91:45:BA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-116-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.8",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-116-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.8",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-116.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.8",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-116-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
index ea716d441655f9d09ab3455c9c89fbcd042c88cf..c378c3608800bb4febb723474fae2aea62905bba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.9",
+      "mac": "00:11:25:91:45:94",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-117-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.9",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-117-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.9",
-      "mac": null,
+      "mac": "00:11:25:C4:52:EC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-117.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.9",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-117-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
index 37f8581f13dfca0c22421e2536e9fd1a8c7481f1..36ac031bf51cdf0107082a12c6090b0ebd7b09f9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.10",
+      "mac": "00:11:25:91:48:5B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-118-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.10",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-118-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.10",
-      "mac": null,
+      "mac": "00:11:25:C4:53:EA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-118.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.10",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-118-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
index 1a3571565fe131b5811dcd63d8dcb72ae24359bb..df31b98abce677c068c7d121d04be302257c2ba5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.11",
+      "mac": "00:11:25:91:46:15",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-119-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.11",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-119-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.11",
-      "mac": null,
+      "mac": "00:11:25:C4:51:AC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-119.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.11",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-119-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
index 555c714439e457f716f3db25a7a1066c3de1dd77..a8e80b19ec8c0292a6fb66f4004c93ef9df7c735 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.12",
+      "mac": "00:11:25:91:45:B8",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-12-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.12",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-12-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.12",
-      "mac": "00:11:25:c4:35:42",
+      "mac": "00:11:25:C4:35:42",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-12.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.12",
-      "mac": "00:11:25:c4:35:43",
+      "mac": "00:11:25:C4:35:43",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-12-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
index ce7414d52f2ee180e97fc6caecffb48379e8df7e..eaed6049b36a43f1eef0a953b08cfb8e4321126e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.137.12",
+      "mac": "00:11:25:91:48:19",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-120-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.77.12",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-120-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.12",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:D2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-120.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.137.12",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-120-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
index f4adb2338a864da8df1c27d0fcd4ab6e1a64f511..6aaa419289c7a64bb28b17d08fb9c9c3af5ee641 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.13",
+      "mac": "00:11:25:91:48:88",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-121-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.13",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-121-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.13",
-      "mac": null,
+      "mac": "00:11:25:C4:50:1A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-121.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.13",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-121-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
index facfe9b2937f432e85acc9690b8b483ec052399d..88a29c05e37d72fcddb48b35e747731364394cd9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.14",
+      "mac": "00:11:25:91:46:29",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-122-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.14",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-122-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.14",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:84",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-122.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.14",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-122-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
index ce5ad688cf05e179274240c104d2df8dce874620..b6166ac8db7aabd7c83bb80f6977fc6f051c23c5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.15",
+      "mac": "00:11:25:91:45:F2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-123-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.15",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-123-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.15",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:B0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-123.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.15",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-123-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
index 22e61752e8020121ae79afcd78f1ebe3020e6a05..d218ab8083ccb85c4dbe452710752395fde7e69e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.16",
+      "mac": "00:11:25:91:46:6D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-124-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.16",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-124-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.16",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:C8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-124.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.16",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-124-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
index 38e94f05c128881e4d190ea3d1e1304059c8126f..daf96e7add76b7ce90414e0bfccf19f1880dc7de 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.17",
+      "mac": "00:11:25:91:46:45",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-125-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.17",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-125-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.17",
-      "mac": null,
+      "mac": "00:11:25:C4:51:F8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-125.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch03.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.103",
+      "switch_mac": "00:24:f9:3e:a7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.17",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-125-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
index e2049790a0ef2bab86fb05c5ef55dd567b66bf00..45a61eef38db56f4aa5fc88381386059028a441a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.18",
+      "mac": "00:11:25:91:48:37",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-126-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.18",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-126-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.18",
-      "mac": null,
+      "mac": "00:11:25:C4:53:0E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-126.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.18",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-126-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
index 10555df33658212933cf597c676e95cd6238cf5b..2e5da4f956a2eab2e9adeedc7050fbcd7357906c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.19",
+      "mac": "00:11:25:91:46:88",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-127-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.19",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-127-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.19",
-      "mac": "00:11:25:c4:4d:94",
+      "mac": "00:11:25:C4:4D:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-127.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.19",
-      "mac": "00:11:25:c4:4d:95",
+      "mac": "00:11:25:C4:4D:95",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-127-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
index 4bdde2b74e2897617b4fe7e8d398c3bee7c476a7..78c969ff08191689888af7f623c1b7eb1aed4ef5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.20",
+      "mac": "00:11:25:91:46:02",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-128-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.20",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-128-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.20",
-      "mac": "00:11:25:c4:53:18",
+      "mac": "00:11:25:C4:53:18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-128.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.20",
-      "mac": "00:11:25:c4:53:19",
+      "mac": "00:11:25:C4:53:19",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-128-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
index df4ae4f08229ac66f587bf0fd96a38f5e1e940ec..333009ae1431f95360e4b8ed7786510d5362af23 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.21",
+      "mac": "00:11:25:91:45:FB",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-129-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.21",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-129-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.21",
-      "mac": "00:11:25:c4:4d:80",
+      "mac": "00:11:25:C4:4D:80",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-129.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.21",
-      "mac": "00:11:25:c4:4d:81",
+      "mac": "00:11:25:C4:4D:81",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-129-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
index 2ec2e1d8357f82b12980c707e44fb304fed3103f..89c5930db6734bf6025b60ca46860bcf624a800a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.13",
+      "mac": "00:11:25:91:48:02",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-13-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.13",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-13-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.13",
-      "mac": "00:11:25:c4:34:48",
+      "mac": "00:11:25:C4:34:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-13.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.13",
-      "mac": "00:11:25:c4:34:49",
+      "mac": "00:11:25:C4:34:49",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-13-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
index 29ccec2458816ce9405712786ae6e0cec97efb36..2e9f65fcb11d465b9ab66640f6dddf7443120888 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.22",
+      "mac": "00:11:25:91:45:A5",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-130-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.22",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-130-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.22",
-      "mac": "00:11:25:c4:54:6a",
+      "mac": "00:11:25:C4:54:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-130.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.22",
-      "mac": "00:11:25:c4:54:6b",
+      "mac": "00:11:25:C4:54:6B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-130-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
index ea60b23993a2809bb1b319f3c7fd2adeb703c027..a0dc1a55a0da3812543a45c5cef91079ef8b4af8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.23",
+      "mac": "00:11:25:91:46:AA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-131-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.23",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-131-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.23",
-      "mac": "00:11:25:c4:54:86",
+      "mac": "00:11:25:C4:54:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-131.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.23",
-      "mac": "00:11:25:c4:54:87",
+      "mac": "00:11:25:C4:54:87",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-131-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
index 60f695425ead025685d05f6d0a4a0225c76ccd13..4fb828bdaa665f78826478416a1ee6dc72f3db82 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.138.24",
+      "mac": "00:11:25:91:47:E3",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-132-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.78.24",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-132-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.24",
-      "mac": "00:11:25:c4:4e:58",
+      "mac": "00:11:25:C4:4E:58",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-132.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.138.24",
-      "mac": "00:11:25:c4:4e:59",
+      "mac": "00:11:25:C4:4E:59",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-132-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
index 0c33d3161f4537f5d9bb27fa0c6fbfce8fbce0db..e986c2211708b9f47fd55e4baf6c425c55dc9eac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.25",
+      "mac": "00:11:25:91:47:93",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-133-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.25",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-133-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.25",
-      "mac": "00:11:25:c4:4e:82",
+      "mac": "00:11:25:C4:4E:82",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-133.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.25",
-      "mac": "00:11:25:c4:4e:83",
+      "mac": "00:11:25:C4:4E:83",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-133-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
index 9bf52264cf02980f1e8015f9f0184b652d0d9671..bda8ddf8db11de8caaf8b80bf089ec49666fd3c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.26",
+      "mac": "00:11:25:91:48:1D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-134-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.26",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-134-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.26",
-      "mac": "00:11:25:c4:4f:4e",
+      "mac": "00:11:25:C4:4F:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-134.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.26",
-      "mac": "00:11:25:c4:4f:4f",
+      "mac": "00:11:25:C4:4F:4F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-134-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
index d52151db375535fb07024c77f7df3d03100e4be0..9da1948c6e28ac9949cb1870e90b3e7d61e69f90 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.27",
+      "mac": "00:11:25:91:47:6B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-135-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.27",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-135-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.27",
-      "mac": "00:11:25:c4:53:e6",
+      "mac": "00:11:25:C4:53:E6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-135.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.27",
-      "mac": "00:11:25:c4:53:e7",
+      "mac": "00:11:25:C4:53:E7",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-135-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
index abd61ae3e4de631867517a15a27dfb07c43bd717..4134a2979609227017735056a4c6cf8476387d0d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.28",
+      "mac": "00:11:25:91:48:A0",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-136-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.28",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-136-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.28",
-      "mac": "00:11:25:c4:4d:40",
+      "mac": "00:11:25:C4:4D:40",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-136.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.28",
-      "mac": "00:11:25:c4:4d:41",
+      "mac": "00:11:25:C4:4D:41",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-136-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
index 47cfb153e6d9167ed105c086dd82063a466a9d7f..1fab62bb431f76fd185cfae22b2bccb1ed629ad4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.29",
+      "mac": "00:11:25:91:45:C6",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-137-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.29",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-137-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.29",
-      "mac": "00:11:25:c4:4f:e2",
+      "mac": "00:11:25:C4:4F:E2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-137.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.29",
-      "mac": "00:11:25:c4:4f:e3",
+      "mac": "00:11:25:C4:4F:E3",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-137-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
index c15a0168c805e7501865eea20577c0779a76ed23..2dece375a90a272c338c9c08f56f40d1d996fba0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.30",
+      "mac": "00:11:25:91:46:22",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-138-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.30",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-138-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.30",
-      "mac": "00:11:25:c4:4d:4a",
+      "mac": "00:11:25:C4:4D:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-138.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.30",
-      "mac": "00:11:25:c4:4d:4b",
+      "mac": "00:11:25:C4:4D:4B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-138-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
index 42d6345aee03c0961a9bf6b0c3c7dbdde7590a19..638ba43f66e58ee7ff176d78faeb9bc72bc49b06 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.31",
+      "mac": "00:11:25:91:45:CF",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-139-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.31",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-139-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.31",
-      "mac": "00:11:25:c4:38:de",
+      "mac": "00:11:25:C4:38:DE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-139.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.31",
-      "mac": "00:11:25:c4:38:df",
+      "mac": "00:11:25:C4:38:DF",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-139-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
index 29ebaed44fe6703b6e0923cd40466faed64398d2..a7bcfdc69a51ea18be13a6369f2657d8a50407b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.14",
+      "mac": "00:11:25:91:48:91",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-14-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.14",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-14-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.14",
-      "mac": "00:11:25:c4:34:3c",
+      "mac": "00:11:25:C4:34:3C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-14.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.14",
-      "mac": "00:11:25:c4:34:3d",
+      "mac": "00:11:25:C4:34:3D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-14-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
index 7551c476ed1cec79b8218beefd7ba0651fc3aa59..26dd57fa7719bae87705c14b597faf9de2d91ff4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.32",
+      "mac": "00:11:25:91:48:32",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-140-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.32",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-140-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.32",
-      "mac": "00:11:25:c4:24:02",
+      "mac": "00:11:25:C4:24:02",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-140.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.32",
-      "mac": "00:11:25:c4:24:03",
+      "mac": "00:11:25:C4:24:03",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-140-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
index 52d87be55e835deb7d8ce394f774cc92a5a49f33..a7a8f7317eb8c008b542a3f3a7df02be8833b243 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.33",
+      "mac": "00:11:25:91:48:63",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-141-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.33",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-141-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.33",
-      "mac": "00:11:25:c4:3f:a8",
+      "mac": "00:11:25:C4:3F:A8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-141.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.33",
-      "mac": "00:11:25:c4:3f:a9",
+      "mac": "00:11:25:C4:3F:A9",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-141-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
index f83558aa8dc0ecfa7f76fb4d443509c77d6a97bb..c4b53b719118e659e0a03f5b99fb0c83de4b22f8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.34",
+      "mac": "00:11:25:91:46:41",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-142-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.34",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-142-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.34",
-      "mac": "00:11:25:c4:4f:d8",
+      "mac": "00:11:25:C4:4F:D8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-142.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.34",
-      "mac": "00:11:25:c4:4f:d9",
+      "mac": "00:11:25:C4:4F:D9",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-142-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
index 0170cc51d40eb06af88f481038a463b1b050b920..df94f5fd6b504588b7eef05aed33f22a495e5b5c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.35",
+      "mac": "00:11:25:91:48:33",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-143-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear04.orsay.grid5000.fr",
+      "switch_console": "mrv04.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.204",
+      "switch_console_mac": "00:a0:9c:00:12:e4",
+      "switch_ip": "172.26.120.154",
+      "switch_mac": "00:0f:b5:f5:79:2a",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.35",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-143-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.35",
-      "mac": "00:11:25:c4:4f:aa",
+      "mac": "00:11:25:C4:4F:AA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-143.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch02.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.102",
+      "switch_mac": "00:12:00:4c:f5:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.35",
-      "mac": "00:11:25:c4:4f:ab",
+      "mac": "00:11:25:C4:4F:AB",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-143-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
index 022794bf9ba60e9a5b4c5841b5568300b9626891..211ee4311bdad1f6b77fe7384c0468de0b5b4dd0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.139.36",
+      "mac": "00:11:25:91:45:A6",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-144-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.79.36",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-144-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.36",
-      "mac": "00:11:25:c4:50:0e",
+      "mac": "00:11:25:C4:50:0E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-144.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.139.36",
-      "mac": "00:11:25:c4:50:0f",
+      "mac": "00:11:25:C4:50:0F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-144-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
index 15a6363c3390b5ba9cedc601ee2c84c344d86288..73d6c3f64a4645074d83ae921d3230798cd21961 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.1",
+      "mac": "00:11:25:91:45:AD",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-145-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.1",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-145-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.1",
-      "mac": "00:11:25:c4:50:20",
+      "mac": "00:11:25:C4:50:20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-145.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.1",
-      "mac": "00:11:25:c4:50:21",
+      "mac": "00:11:25:C4:50:21",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-145-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
index dee4bf87cf380b9627401b1c6104ff82c206d9ae..a2ea62d4611c2ffdb5a4d0307bddf419f2da52eb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.2",
+      "mac": "00:11:25:91:46:B4",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-146-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.2",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-146-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.2",
-      "mac": "00:11:25:c4:4d:4c",
+      "mac": "00:11:25:C4:4D:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-146.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.2",
-      "mac": "00:11:25:c4:4d:4d",
+      "mac": "00:11:25:C4:4D:4D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-146-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
index ce48bdbb2b5fea416b0b1ce7b956e2f9646dcb17..96c5891602234865a28a9281b144e4d14e77af64 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.3",
+      "mac": "00:11:25:91:47:22",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-147-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-147-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.3",
-      "mac": "00:11:25:c4:4d:fe",
+      "mac": "00:11:25:C4:4D:FE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-147.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.3",
-      "mac": "00:11:25:c4:4d:ff",
+      "mac": "00:11:25:C4:4D:FF",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-147-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
index 701bf048029f3973c92e0ba571d8e1d4354476f1..328fe0e80ba63e72b7bcdd2072e4125c82180537 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.4",
+      "mac": "00:11:25:91:47:FC",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-148-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.4",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-148-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.4",
-      "mac": "00:11:25:c4:51:06",
+      "mac": "00:11:25:C4:51:06",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-148.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.4",
-      "mac": "00:11:25:c4:51:07",
+      "mac": "00:11:25:C4:51:07",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-148-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
index b18d97d0f626fbcb56f43e196c799e05dec7ec2d..da148e28b498efde5c692cea54d1497ba332e6df 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.5",
+      "mac": "00:11:25:91:46:2C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-149-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.5",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-149-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.5",
-      "mac": "00:11:25:c4:4f:c0",
+      "mac": "00:11:25:C4:4F:C0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-149.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.5",
-      "mac": "00:11:25:c4:4f:c1",
+      "mac": "00:11:25:C4:4F:C1",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-149-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
index 1f318b351ff8ba718107fcd3f354a4fac7770338..5cc05020d028ce17641644046638f79c03c5028e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.15",
+      "mac": "00:11:25:91:48:A2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-15-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.15",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-15-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.15",
-      "mac": "00:11:25:c4:35:9b",
+      "mac": "00:11:25:C4:35:9B",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-15.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.15",
-      "mac": "00:11:25:c4:35:9c",
+      "mac": "00:11:25:C4:35:9C",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-15-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
index 33c24f09fe937de5715f3f6a90a6a87e2a858b97..92e22795931efcd752cdf2fbb406efef9185f818 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.6",
+      "mac": "00:11:25:91:47:B4",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-150-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.6",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-150-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.6",
-      "mac": "00:11:25:c4:4f:02",
+      "mac": "00:11:25:C4:4F:02",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-150.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.6",
-      "mac": "00:11:25:c4:4f:03",
+      "mac": "00:11:25:C4:4F:03",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-150-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
index 1ec6260e941db50d19db20c233b6403d33930ee4..beedd40ac4aa89bf507c80d335de03b9c49e1528 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.7",
+      "mac": "00:11:25:91:45:9D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-151-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.7",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-151-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.7",
-      "mac": "00:11:25:c4:53:78",
+      "mac": "00:11:25:C4:53:78",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-151.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.7",
-      "mac": "00:11:25:c4:53:79",
+      "mac": "00:11:25:C4:53:79",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-151-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
index 13f76a2c8d45b875bfa0c02d867143ec40a399f1..e53dbd86b0939da14ece40a62228175b51a89c0c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.8",
+      "mac": "00:11:25:91:49:23",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-152-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.8",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-152-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.8",
-      "mac": "00:11:25:c4:50:b6",
+      "mac": "00:11:25:C4:50:B6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-152.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.8",
-      "mac": "00:11:25:c4:50:b7",
+      "mac": "00:11:25:C4:50:B7",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-152-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
index 452054651257db3f821c14384fae0c8056febf59..5709c777dfa5ad6d71a514dcd416359bd58a1cf4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.9",
+      "mac": "00:11:25:91:46:07",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-153-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.9",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-153-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.9",
-      "mac": "00:11:25:c4:50:a8",
+      "mac": "00:11:25:C4:50:A8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-153.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.9",
-      "mac": "00:11:25:c4:50:a9",
+      "mac": "00:11:25:C4:50:A9",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-153-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
index 5a519c090b1d720a080140179c0aa2ce3e707446..05471da505db5ca7b647a5d15667675549c950c7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.10",
+      "mac": "00:11:25:91:46:DE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-154-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.10",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-154-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.10",
-      "mac": "00:11:25:c4:4d:2a",
+      "mac": "00:11:25:C4:4D:2A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-154.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.10",
-      "mac": "00:11:25:c4:4d:2b",
+      "mac": "00:11:25:C4:4D:2B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-154-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
index 31a43f70f8350d813fee84436de234d4d9adbd01..d65125350571ada1d824e32e3fa66079e5589171 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.11",
+      "mac": "00:11:25:91:48:BA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-155-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.11",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-155-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.11",
-      "mac": "00:11:25:c4:50:a2",
+      "mac": "00:11:25:C4:50:A2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-155.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.11",
-      "mac": "00:11:25:c4:50:a3",
+      "mac": "00:11:25:C4:50:A3",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-155-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
index a308687f0369bdbaf02f83262e38a265b6c92965..70955f0b3b6d14a8000e987bc2b0c40c508c2a7d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.140.12",
+      "mac": "00:11:25:91:48:76",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-156-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.80.12",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-156-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.12",
-      "mac": "00:11:25:c4:0b:06",
+      "mac": "00:11:25:C4:0B:06",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-156.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.140.12",
-      "mac": "00:11:25:c4:0b:07",
+      "mac": "00:11:25:C4:0B:07",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-156-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
index 343c5b415573448d3b0e2abdfe12fd54ef79d459..deffe3e41f92daa3a500539c4a24236a4058156e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.13",
+      "mac": "00:11:25:91:47:71",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-157-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.13",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-157-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.13",
-      "mac": "00:11:25:c4:52:ca",
+      "mac": "00:11:25:C4:52:CA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-157.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.13",
-      "mac": "00:11:25:c4:52:cb",
+      "mac": "00:11:25:C4:52:CB",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-157-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
index db54037bbb8536efc83bead34c1222f5b36b2bc5..e78546a9555f87b243709a88b72b38a014b9f409 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.14",
+      "mac": "00:11:25:91:46:B3",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-158-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.14",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-158-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.14",
-      "mac": "00:11:25:c4:54:46",
+      "mac": "00:11:25:C4:54:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-158.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.14",
-      "mac": "00:11:25:c4:54:47",
+      "mac": "00:11:25:C4:54:47",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-158-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
index 21f3c44423a985ed3ee13e06a11fbffd7e10845d..a65d441ef079fb9baa71e12c07787bdd8c42979c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.15",
+      "mac": "00:11:25:91:48:0D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-159-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.15",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-159-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.15",
-      "mac": "00:11:25:c4:4f:82",
+      "mac": "00:11:25:C4:4F:82",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-159.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.15",
-      "mac": "00:11:25:c4:4f:83",
+      "mac": "00:11:25:C4:4F:83",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-159-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
index 59b1905152cd45ecce9497b4f2f7f2b388c57e82..bf8c62c521e440627a027e8b856877c92c5a6c77 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.16",
+      "mac": "00:11:25:91:45:8E",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-16-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.16",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-16-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.16",
-      "mac": "00:11:25:c4:2e:ce",
+      "mac": "00:11:25:C4:2E:CE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-16.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.16",
-      "mac": "00:11:25:c4:2e:cf",
+      "mac": "00:11:25:C4:2E:CF",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-16-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
index aea75b32f01405d3106b6477647fd7e6deda0fa0..9691a2ef8cfca90eb8f87e1ff9ca6dae5b5c54bb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.16",
+      "mac": "00:11:25:91:46:8D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-160-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.16",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-160-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.16",
-      "mac": "00:11:25:c4:4f:3a",
+      "mac": "00:11:25:C4:4F:3A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-160.orsay.grid5000.fr",
       "rate": 100000000,
-      "switch": null,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.16",
-      "mac": "00:11:25:c4:4f:3b",
+      "mac": "00:11:25:C4:4F:3B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-160-eth1.orsay.grid5000.fr",
-      "rate": 100000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
index f70d7e778368a907ffa86ea295cac362c215e1a8..84c3cb0f8f6f96b7bdc03fc360f545be51d7f881 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.17",
+      "mac": "00:11:25:91:48:B8",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-161-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.17",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-161-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.17",
-      "mac": "00:11:25:c4:4f:8e",
+      "mac": "00:11:25:C4:4F:8E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-161.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.17",
-      "mac": "00:11:25:c4:4f:8f",
+      "mac": "00:11:25:C4:4F:8F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-161-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
index 78bfc3fc39fcafc8bd8db25d58c8295029d79710..a139cc76afbb552b0d10f760072eb73ce6228eee 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.18",
+      "mac": "00:11:25:91:45:FE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-162-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.18",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-162-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.18",
-      "mac": "00:11:25:c4:4e:b8",
+      "mac": "00:11:25:C4:4E:B8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-162.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.18",
-      "mac": "00:11:25:c4:4e:b9",
+      "mac": "00:11:25:C4:4E:B9",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-162-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
index 128d5a728e1756c6a1d302a5349c0a9ee3b594af..bdc8b251edc95730ffb322fc4d4cb2699d9e89bd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.19",
+      "mac": "00:11:25:91:48:34",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-163-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.19",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-163-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.19",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-163.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.19",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-163-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
index 5956c29ec399bc945d9ee65df82f90ec9df4443a..5fef0fe46f1a14e46c09f06dcf341a5b861f32fb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.20",
+      "mac": "00:11:25:91:47:AE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-164-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.20",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-164-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.20",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-164.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.20",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-164-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
index e4120bbac7a13190ab261776498df4034b1b744a..0fd42b86de5d3ce2fac069fe127909f1f47aec0e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.21",
+      "mac": "00:11:25:91:45:D0",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-165-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.21",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-165-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.21",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-165.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.21",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-165-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
index f106fbf148c9157d5e8fca10bb4d99a9cadf23fc..df1f5f8f338f730a31f7dd4965025f33e984fa7d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.22",
+      "mac": "00:11:25:91:47:5C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-166-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.22",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-166-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.22",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-166.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.22",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-166-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
index e795652ebede12b8825c7678b227557b4200b99e..b8ac511290e64e3f69ad5db66196541cd01fa0a0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.23",
+      "mac": "00:11:25:91:46:9C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-167-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.23",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-167-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.23",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-167.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.23",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-167-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
index 8dfd4b4f246384d5242abd5287a278388e0ea9bd..b0a57fd9a75dc345269aa70a5b0663f1970ea08c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.141.24",
+      "mac": "00:11:25:91:49:17",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-168-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.81.24",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-168-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.24",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-168.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.24",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-168-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
index 646421e3bd0855100cef2f25b76b8be897a4318e..882cc459e494e0e1be7e6abb6531628eb3ce0edd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.25",
+      "mac": "00:11:25:91:48:F0",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-169-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.25",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-169-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.25",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-169.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.25",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-169-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
index 74af126a967ac01dbd4ea592142cc0f035676530..a73d6d819a48281b11d27d8424664e52be62fd92 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.17",
+      "mac": "00:11:25:91:49:4A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-17-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.17",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-17-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.17",
-      "mac": "00:11:25:c4:34:56",
+      "mac": "00:11:25:C4:34:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-17.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.17",
-      "mac": "00:11:25:c4:34:57",
+      "mac": "00:11:25:C4:34:57",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-17-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
index 41430620107fc6722f5edaa2e14b0dcf12e7b11a..1a0637b1d04edd22ffc888fa609da786fe3c8212 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.26",
+      "mac": "00:11:25:91:48:3D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-170-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.26",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-170-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.26",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-170.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.26",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-170-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
index 66c91b80a66518579dff0b0cade942b83a56345e..df5115e12e01b7c5e7d29ece00d29b580d0f7667 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.27",
+      "mac": "00:11:25:91:45:FC",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-171-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.27",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-171-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.27",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-171.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.27",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-171-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
index 83c275819732e18cd2937465fa4a3560b8c167f3..d1edcf04a8f8870e3f5dbe692fe2c1f73c5ba228 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.28",
+      "mac": "00:11:25:91:45:92",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-172-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.28",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-172-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.28",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-172.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.28",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-172-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
index 595dfdc707624f531d19af545e8370cbc01ebc16..b1abbe1452b4c334b7fd119bcc467db8bcd9ee38 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.29",
+      "mac": "00:11:25:91:45:EA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-173-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.29",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-173-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.29",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-173.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.29",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-173-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
index 693bdb2beef20a86228e7006302fc7ce0a9760ec..93c463c5b2940fd79738690d509c97d35b1b812a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.30",
+      "mac": "00:11:25:91:45:FA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-174-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.30",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-174-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.30",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-174.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.30",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-174-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
index 82011914b1f870ccda51425645bd26db150e8aed..43b706a7743d3926645a7313b2c39af70d95bcfb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.31",
+      "mac": "00:11:25:91:48:EB",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-175-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.31",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-175-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.31",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-175.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.31",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-175-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
index 3e37e6fa4d4dcb9cc77657c196fb071c09c3c978..00aea36bfb2d550b85d97e3d99611cd37f4abb25 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.32",
+      "mac": "00:11:25:91:48:EA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-176-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.32",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-176-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.32",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-176.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.32",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-176-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
index 4a07f2b1e79784b0d038792a60237ff16a95810e..7b374fc112cec6c303d8acbc86695c0affab1e16 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.33",
+      "mac": "00:11:25:91:47:8B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-177-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.33",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-177-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.33",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-177.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.33",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-177-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
index 43f15e7050a6247b954ddd0763d3e871075544e8..306f58f239d3ffb560f6d4ad6fb1993d4934c744 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.34",
+      "mac": "00:11:25:91:45:C7",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-178-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.34",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-178-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.34",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-178.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.34",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-178-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
index 3911cbb026c755a7a1559ae1818e08d4352d73ca..b62c4b94791ed6f91ef63677c0cc0b2670df7fce 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.35",
+      "mac": "00:11:25:91:46:14",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-179-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear05.orsay.grid5000.fr",
+      "switch_console": "mrv05.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.205",
+      "switch_console_mac": "00:a0:9c:00:10:ae",
+      "switch_ip": "172.26.120.155",
+      "switch_mac": "00:0f:b5:fb:70:a5",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.35",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-179-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.35",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-179.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.35",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-179-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
index 317f34a2983ea2649bc3cf90684fe65ff220dff7..1df79268ac6800ccb9d82dd9d11decaa860c231a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.18",
+      "mac": "00:11:25:91:48:AF",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-18-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.18",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-18-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.18",
-      "mac": "00:11:25:c4:35:7a",
+      "mac": "00:11:25:C4:35:7A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-18.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.18",
-      "mac": "00:11:25:c4:35:7b",
+      "mac": "00:11:25:C4:35:7B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-18-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
index 3f58f2787d617c968bf357d960ef627554871d15..b4a2331647c8ea680a6490f860dde0bf3b3df501 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.142.36",
+      "mac": "00:11:25:91:45:8F",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-180-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.82.36",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-180-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.36",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-180.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.36",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-180-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
index 061ea200689cc3f4c6aeed0e6c24428ad71ae571..0df682eacb2be68018fdac0cf5ac7bbaf8d1aaf3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.1",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-181-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.1",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-181-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.1",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-181.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.1",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-181-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
index 2addc78d2c19063ae74c2cca046d62a801215237..cff4227bc0406ae1e10766822f03bad896f7bcec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.2",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-182-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.2",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-182-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.2",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-182.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.2",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-182-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
index df8864c58a05ce6e7e7a8d08932dec6bcd986812..11750fbacb70d343b4b2ecd3f15ace39adfed47e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.3",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-183-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-183-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.3",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-183.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.3",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-183-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
index 3ca429b5e1bbd5a8668d5eb80a5f4961382478a7..e6ba849eb8f4f748f1f088289e31b565f3f5a9e7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.4",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-184-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.4",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-184-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.4",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-184.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.4",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-184-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
index ab69b1d0586ef077ecb6cbacd5a6396b2a28e03c..9bda6cbd9ce5ec0f3b5ca41fc1cb8cecda018284 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.5",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-185-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.5",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-185-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.5",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-185.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.5",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-185-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
index dd17465c69409324a55227ebb51264cde286e924..a4b0a2804e9a6e5b44e965a3b8d1a31e6492d2f0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.6",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-186-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.6",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-186-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.6",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-186.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.6",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-186-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
index 392162c94ada60d25833773d86952189b9e4d9c3..435ea839231d7f976dfba2b3ec37cd1b2da557a0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.7",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-187-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.7",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-187-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.7",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-187.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.7",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-187-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
index 396f32a6c4ddf61647f8b98ed0eafcec89fc959b..d0363a8d39872f2952006ecda1513a8e3e3b8743 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.8",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-188-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.8",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-188-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.8",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-188.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.8",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-188-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
index 684513ff244c1b27d1723ba64850b6ce6fc2f5b0..b585e2b7a70cee68c40f0787b22c576161ca531a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.9",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-189-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.9",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-189-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.9",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-189.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.9",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-189-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
index bc7832acb7ad68b5ecc0d44e9d2569da76ba1d89..cde53665a8d319d2e3e97a19c22de9c179e56d81 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.19",
+      "mac": "00:11:25:91:49:55",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-19-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.19",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-19-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.19",
-      "mac": "00:11:25:c4:34:4c",
+      "mac": "00:11:25:C4:34:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-19.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.19",
-      "mac": "00:11:25:c4:34:4d",
+      "mac": "00:11:25:C4:34:4D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-19-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
index 617799933009741d7c4c57d060505af29a424f9b..2a3890aea80d2f01a26a28cfba2d3a402cdbe0cb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.10",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-190-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.10",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-190-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.10",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-190.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.10",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-190-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
index 1a077912027dea2d6e3e257128afc1bd5cbda507..5fc919e9881df5bbba0854198504456c42687cbb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.11",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-191-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.11",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-191-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.11",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-191.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.11",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-191-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
index 17255f61f4496720c1b72fe5a9f508f7f3fdbab0..2977cfa3e7e96a8055700689feba6fdd8b90abca 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.143.12",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-192-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.83.12",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-192-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.12",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-192.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.143.12",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-192-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
index c7a1f533d3733e32046be37186f27b5f3ac5ddd2..9846683e6cceac2429a791b76e2f65bc8c059871 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.13",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-193-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.13",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-193-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.13",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-193.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.13",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-193-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
index 18775058fea098208665702ab3852fe73ffb2a0c..0af6ba5873e489ed870a573854c24114133344e9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.14",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-194-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.14",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-194-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.14",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-194.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.14",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-194-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
index b442356d02727d14d466ec2c3824bea803b86ecd..5d334c4149eba7b060cb23cb3d44007e547d9db2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.15",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-195-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.15",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-195-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.15",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-195.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.15",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-195-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
index 2877590c9db2ff2cee245b3d65a66253d116ab81..4f06e518c06294623430df6c755a0293f982866f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.16",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-196-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.16",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-196-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.16",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-196.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.16",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-196-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
index 3ddb5cfac5e2057af5e0844f6c3795dd60b0235d..5e0ab097455f5f1995ef455e81a328f739e87f7e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.17",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-197-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.17",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-197-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.17",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-197.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.17",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-197-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
index 421fd1b47bf93441fb56d32beb89e55d00fab631..a0df9dfaceaf188a47ed76b6e7dfcf5db2304a8c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.18",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-198-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.18",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-198-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.18",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-198.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.18",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-198-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
index c1b04d1ddc93bf2a2fdf2f24d47ecb955ab5323a..6b77352fa0f0e11952cfef298003b490fb39e1ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.19",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-199-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.19",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-199-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.19",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-199.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.19",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-199-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
index 8df77b5cf14cb16381c5da51aed1bdabb35112cd..0a57a7dc5995e548cb7ae5f22d6980003449803e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.2",
+      "mac": "00:11:25:91:48:A7",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-2-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.2",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-2-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.2",
-      "mac": "00:11:25:c4:35:56",
+      "mac": "00:11:25:C4:35:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.2",
-      "mac": "00:11:25:c4:35:57",
+      "mac": "00:11:25:C4:35:57",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-2-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
index a07a334ca4e02e7fdbb70fb8a1cd9ffb8cb4b090..ab1cd7cef930d83133bbdf15011f0814e846d189 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.20",
+      "mac": "00:11:25:91:45:7C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-20-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.20",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-20-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.20",
-      "mac": "00:11:25:c4:35:52",
+      "mac": "00:11:25:C4:35:52",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-20.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.20",
-      "mac": "00:11:25:c4:35:53",
+      "mac": "00:11:25:C4:35:53",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-20-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
index b6b691cd31dae73152d9bcc42af711d959033920..5cece592adbefe56e46541469f95adb1aa2fdea2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.20",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-200-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.20",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-200-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.20",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-200.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.20",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-200-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
index 7ff57311f54d8fefcb654e9e6ac0e242c4dd00de..e2cfb1d087a5352c68a6447a45dd2fa02ebf5918 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.21",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-201-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.21",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-201-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.21",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-201.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.21",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-201-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
index 1188c4cde570e37e54256eb39afd381f68bf4b11..47f83b0b6a8082bce815262753dad60cf026b34e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.22",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-202-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.22",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-202-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.22",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-202.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.22",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-202-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
index 33624cbb976992a8e6c9d0aaebc0b788e2a69ecb..9cf5289d7edd789f1d13d42fa5da8f248d3b7599 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.23",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-203-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.23",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-203-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.23",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-203.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.23",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-203-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
index deec02ef198559b478e3cf9018ac17fb1ded5ad2..9e4bdaf441cd55ec7a0d1c9a74c643d9b70971b4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.144.24",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-204-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.84.24",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-204-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.24",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-204.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.24",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-204-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
index 512a9dbd67def595440d961701c64d832e79ff73..d6d6d832bad63730055b922820b72e4c4837c2fd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.25",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-205-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.25",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-205-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.25",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-205.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.25",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-205-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
index 51437f4c74950dbb22019a2c108d18b5a7a9a67d..a106a6e0e9e4e830aac06eaf738c2e3de94deea5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.26",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-206-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.26",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-206-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.26",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-206.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.26",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-206-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
index af5dae16521cf4e756d141f1b2d1f73bdd9c57bf..09cc940249ec0e6a7852d32c1bb004b8e47dabef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.27",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-207-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.27",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-207-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.27",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-207.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.27",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-207-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
index 24b960e0a82df86ad16444a96743771d0b963119..98d2b87cfa5cbdaa0f7166026b245e6ab9723648 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.28",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-208-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.28",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-208-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.28",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-208.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.28",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-208-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
index 6f6bba8c66c4ae8f3f33daa92b1e2fbb2627cfcd..8f02d60a67ffee37b8dd9db94be856c62f199447 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.29",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-209-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.29",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-209-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.29",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-209.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.29",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-209-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
index 6a923e5187236bf9d42e30aa0da061eaf35efdfa..45415d49145382e9450c8d3bff7eb3829db2b15e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.21",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-21-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.21",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-21-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.21",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-21.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.21",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-21-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
index 81aa5ade590cc4e30fc4c30802f926eaee1665b6..26cff7180ceddb8d20f775dbfd3c854a028acdba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.30",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-210-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.30",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-210-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.30",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-210.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.30",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-210-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
index 0c7a81f1e86dabca2d8494bf41d025eace2e2e8a..ac6e00c981792508c468d2eef194ae0e87468573 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.31",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-211-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.31",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-211-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.31",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-211.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.31",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-211-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
index 56827a30c5892d8d685305a95c07875f70c33c8d..2a71f224febc2b3235cebd9501e4d8c706739338 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.32",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-212-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.32",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-212-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.32",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-212.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.32",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-212-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
index c04ae68630737e344c4719877a08d98750a32327..1239da462ddce506bc29d304922298372db7f000 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.33",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-213-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.33",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-213-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.33",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-213.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.33",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-213-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
index 34e9fd70d4d0305b431aeae0a0fe4fe4be68149b..16ca054186fbacf2ee9753ed22dac7e610de3198 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.34",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-214-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.34",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-214-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.34",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-214.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.34",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-214-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
index 3095e6aeded385180c85d5157b70e8db329bd020..9ead0ea60ac1e7611d4322691e63f9d1f7cbfd66 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.35",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-215-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear06.orsay.grid5000.fr",
+      "switch_console": "mrv06.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.206",
+      "switch_console_mac": "00:a0:9c:00:16:42",
+      "switch_ip": "172.26.120.156",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.35",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-215-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.35",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-215.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.35",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-215-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
index 8e693bf2c016b3a341ebe4dacf4e0009d48c01d6..16a89b68952c7a3b062f8ab417474cf8f2e4199d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.145.36",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-216-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.85.36",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-216-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.36",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-216.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.36",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-216-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
index d67cdf498096267992de4c64c49bac43f24de84b..c2ce15dad49a76828ca1a858cef0b8cc5506bfa3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.1",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-217-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.1",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-217-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.1",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-217.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.1",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-217-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
index c32c1a5defaf5b3187b8c9b9bdd7c1970f422c48..c35cb6f52b415cf42c3ef56ff32962f67d0ba277 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.2",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-218-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.2",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-218-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.2",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-218.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.2",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-218-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
index 81f02f47b3b1ea5a4563155b8ad616925517ec3c..554cfb3a1b5f91baa30d26a4ef1f60af2d0e6abb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.3",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-219-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-219-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.3",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-219.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.3",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-219-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
index 3d9873f9e163196ccc183c437863b2baf57a4049..5a66a02fc8595ecacfc21b24355940e90fd8322b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.22",
+      "mac": "00:11:25:91:49:2A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-22-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.22",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-22-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.22",
-      "mac": "00:11:25:c4:34:5a",
+      "mac": "00:11:25:C4:34:5A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-22.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.22",
-      "mac": "00:11:25:c4:34:5b",
+      "mac": "00:11:25:C4:34:5B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-22-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
index 34a88674dc254f89fa49807d21704cfdd318f2ef..9c9f1745616868891f79f6cb4c74575aff730151 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.4",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-220-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.4",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-220-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.4",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-220.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.4",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-220-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
index 6744dc035357bf9121a8c659bc9f7dd8c083a0df..da652686c25325f5d3669b9c772bf038e9a5f159 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.5",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-221-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.5",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-221-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.5",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-221.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.5",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-221-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
index 884b92e8961104cb513dbda31100813ae26f4fb9..286037e9821497ef00b0bdaaf63fd2fbfd5996e5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.6",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-222-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.6",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-222-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.6",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-222.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.6",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-222-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
index 2e206fd035846f1c43710e2b84382022bd895b3e..07f409d419552592ee8a33a50c80ada1bfb4518f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.7",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-223-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.7",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-223-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.7",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-223.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.7",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-223-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
index d0e8b45bc3c2403d39fd6ebf1fc25213c1aa4226..76cae2a9de113bdff454f6f5b1908051a9984cd4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.8",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-224-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.8",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-224-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.8",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-224.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.8",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-224-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
index 31cb5a46a944a014ec0c4b3a94d04b7df50e4ca3..f64a704b67e43fff8847f0641a4aaf72b99f88b0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.9",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-225-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.9",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-225-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.9",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-225.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.9",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-225-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
index 6901dc1bf35cc1403e65bf9585a643a6e3782b30..24c3f00fd37183ff4aac44843912d29aada195c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.10",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-226-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.10",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-226-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.10",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-226.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.10",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-226-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
index a416a4e32b2fd5cab8784b53d9c5eb7bff83e014..2101046fc23c7c9c9b540af9f6068a274caa46dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.11",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-227-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.11",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-227-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.11",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-227.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.11",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-227-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
index e28fcaa8b6a3515fedd7f23f56a5dd70f3548d52..b0abee1f8920b85bd50f810850ef9c88e5eac10c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.146.12",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-228-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.86.12",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-228-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.12",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-228.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.12",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-228-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
index 98e3bfa916351d88f168410757e1beb0da1744ad..8632c19571e3b9ae4ccf8ab20a2ee4f3899fe064 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.13",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-229-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.13",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-229-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.13",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-229.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.13",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-229-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
index 51e2dfb0a13e82797cd7b7e784060e2a78aa64f7..d8a4251b1392ee14542d0772d317db5631e75748 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.23",
+      "mac": "00:11:25:91:46:B7",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-23-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.23",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-23-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.23",
-      "mac": "00:11:25:c4:34:ea",
+      "mac": "00:11:25:C4:34:EA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-23.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.23",
-      "mac": "00:11:25:c4:34:eb",
+      "mac": "00:11:25:C4:34:EB",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-23-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
index e913f9f5c7cd759a1a01ab913d583ff1451bfd03..07ef40fbc4eb9560afd0bfe3abbdcb35376b0e56 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.14",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-230-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.14",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-230-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.14",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-230.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.14",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-230-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
index 96f4883dd6d56ae6ec837b336bae7354be2f47b9..7bbccd92e3f671a1bea735a781cc4922c8ddddb6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.15",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-231-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.15",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-231-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.15",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-231.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.15",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-231-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
index 56e24fba6dd9cd2aa9f5716220f64a0bad739a79..176277c7e48f90f50272b1121d9e648784215764 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.16",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-232-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.16",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-232-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.16",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-232.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.16",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-232-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
index 5ae20e36b93d60092922976b01bb5d41dd30a5fc..9c5acbc16b54950f5981c23b17df8799f9b01e6b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.17",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-233-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.17",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-233-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.17",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-233.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.17",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-233-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
index 81f7b9e2e0b65caee2d3f290e785794f938d9e61..7a24bb9a88a32c10cedd514d4ce0ceaea184181d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.18",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-234-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.18",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-234-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.18",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-234.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.18",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-234-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
index 09bf38a3ab88cef6dc7d391cc30a1f7c7e07a71e..dfaea21b111d21b31497ec2dcbd2f8e3bc3c3b5e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.19",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-235-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.19",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-235-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.19",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-235.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.19",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-235-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
index 5d8b4c3b92dff49f5cc2cc83dae4735a9ba37eed..796776e8f28db5c069918cd62a5a2b88b3a9e643 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.20",
+      "mac": "00:11:25:91:47:F7",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-236-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.20",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-236-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.20",
-      "mac": "00:11:25:c4:39:ac",
+      "mac": "00:11:25:C4:39:AC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-236.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.20",
-      "mac": "00:11:25:c4:39:ad",
+      "mac": "00:11:25:C4:39:AD",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-236-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
index 58810744196c9014199cd5db3b7e83c980eb9aef..4f5ce4cef661f49eb520915f029f0d4795ee7c1e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.21",
+      "mac": "00:11:25:91:48:45",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-237-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.21",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-237-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.21",
-      "mac": "00:11:25:c4:3c:80",
+      "mac": "00:11:25:C4:3C:80",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-237.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.21",
-      "mac": "00:11:25:c4:3c:81",
+      "mac": "00:11:25:C4:3C:81",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-237-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
index 65938c0417f9feca1b9d6c2a4eff90736c0dc618..1674afb5ae4bb241022fe7a3bcc989e7d07d303a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.22",
+      "mac": "00:11:25:91:48:CF",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-238-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.22",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-238-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.22",
-      "mac": "00:11:25:c4:3c:7e",
+      "mac": "00:11:25:C4:3C:7E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-238.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.22",
-      "mac": "00:11:25:c4:3c:7f",
+      "mac": "00:11:25:C4:3C:7F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-238-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
index e9635a6650b06c92352dfbf58ea9442adafcba7d..15636d8cd52748742aadca46c64e1f96282d7c23 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.23",
+      "mac": "00:11:25:91:48:C1",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-239-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.23",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-239-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.23",
-      "mac": "00:11:25:c4:3f:50",
+      "mac": "00:11:25:C4:3F:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-239.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.23",
-      "mac": "00:11:25:c4:3f:51",
+      "mac": "00:11:25:C4:3F:51",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-239-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
index ab5d16b256b63261db6566dce9e7fcd7b2f1021c..1434252db435aa1a8bc9551ec6e13b3145f85709 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.129.24",
+      "mac": "00:11:25:91:47:39",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-24-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.69.24",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-24-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.24",
-      "mac": "00:11:25:c4:34:50",
+      "mac": "00:11:25:C4:34:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-24.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.129.24",
-      "mac": "00:11:25:c4:34:51",
+      "mac": "00:11:25:C4:34:51",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-24-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
index fc544aa85484d8f4910293575415819cf0a4470e..2fbebd37e498acb813462535b1ee1570a85d0183 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.147.24",
+      "mac": "00:11:25:91:46:09",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-240-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.87.24",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-240-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.24",
-      "mac": "00:11:25:c4:3e:34",
+      "mac": "00:11:25:C4:3E:34",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-240.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.24",
-      "mac": "00:11:25:c4:3e:35",
+      "mac": "00:11:25:C4:3E:35",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-240-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
index 4c8a2037ec792e9ee4f10163d9a8b939082f0a9d..1668e7a32cc207c59db70ded93429ee0f7cd35e0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.25",
+      "mac": "00:11:25:91:46:5D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-241-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.25",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-241-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.25",
-      "mac": "00:11:25:c4:3c:74",
+      "mac": "00:11:25:C4:3C:74",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-241.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.25",
-      "mac": "00:11:25:c4:3c:75",
+      "mac": "00:11:25:C4:3C:75",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-241-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
index b8cc8f706573fec797c743b66dea5a1e0eb6f3ac..6d8a90350b6ba9e3cd4a2481b29745c4a92b4775 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.26",
+      "mac": "00:11:25:91:48:AD",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-242-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.26",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-242-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.26",
-      "mac": "00:11:25:c4:2b:fc",
+      "mac": "00:11:25:C4:2B:FC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-242.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.26",
-      "mac": "00:11:25:c4:2b:fd",
+      "mac": "00:11:25:C4:2B:FD",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-242-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
index 604a3d02ad862158e5405e4655635d2db93dc60f..19521588803795644f25f98ced1d7e946b255ff9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.27",
+      "mac": "00:11:25:91:46:7A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-243-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.27",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-243-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.27",
-      "mac": "00:11:25:c4:2b:58",
+      "mac": "00:11:25:C4:2B:58",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-243.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.27",
-      "mac": "00:11:25:c4:2b:59",
+      "mac": "00:11:25:C4:2B:59",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-243-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
index 5de884063d8e66736be66dafc19ebb5e3e61ae5e..9fee55ae5209b9711750541b42fa75fdd7a57e6c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.28",
+      "mac": "00:11:25:91:46:A3",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-244-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.28",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-244-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.28",
-      "mac": "00:11:25:c4:10:fa",
+      "mac": "00:11:25:C4:10:FA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-244.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.28",
-      "mac": "00:11:25:c4:10:fb",
+      "mac": "00:11:25:C4:10:FB",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-244-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
index ebe14d0e57833b2891ff7a3694ff3c9255b482ff..bc8a0f888be56a443684f0e6115a7d7d8d1694a6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.29",
+      "mac": "00:11:25:91:47:EA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-245-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.29",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-245-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.29",
-      "mac": "00:11:25:c4:3a:4e",
+      "mac": "00:11:25:C4:3A:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-245.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.29",
-      "mac": "00:11:25:c4:3a:4f",
+      "mac": "00:11:25:C4:3A:4F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-245-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
index 8703893dbc7f83ddc3eec2a656c1f20204422a73..c27b319142226a8b5a6a1f8d5b2b9d68c9b414dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.30",
+      "mac": "00:11:25:91:46:0E",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-246-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.30",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-246-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.30",
-      "mac": "00:11:25:c4:38:e2",
+      "mac": "00:11:25:C4:38:E2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-246.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.30",
-      "mac": "00:11:25:c4:38:e3",
+      "mac": "00:11:25:C4:38:E3",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-246-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
index c84541e19768b0694f9fb66ccf91aaf97dc45463..9ca01ca01da20fd04cd277e32664742469bc9311 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.31",
+      "mac": "00:11:25:91:48:F4",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-247-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.31",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-247-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.31",
-      "mac": "00:11:25:c4:32:76",
+      "mac": "00:11:25:C4:32:76",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-247.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.31",
-      "mac": "00:11:25:c4:32:77",
+      "mac": "00:11:25:C4:32:77",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-247-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
index 66259c090f2906d329a09773ac64dd028c5783e2..e5886f0820ac873b4888f5eae0099af541815684 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.32",
+      "mac": "00:11:25:91:48:3B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-248-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.32",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-248-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.32",
-      "mac": "00:11:25:c4:31:fa",
+      "mac": "00:11:25:C4:31:FA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-248.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.32",
-      "mac": "00:11:25:c4:31:fb",
+      "mac": "00:11:25:C4:31:FB",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-248-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
index 5486739bab8557a19a5961eff83640b7897d0b6f..14bb44d7892a709bc441c25dca53ce4eae9b1cd5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.33",
+      "mac": "00:11:25:91:45:E9",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-249-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.33",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-249-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.33",
-      "mac": "00:11:25:c4:33:40",
+      "mac": "00:11:25:C4:33:40",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-249.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.33",
-      "mac": "00:11:25:c4:33:41",
+      "mac": "00:11:25:C4:33:41",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-249-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
index 59adfcad69db0fb53c5eaf3f3ac3659853b8493e..4ec463acd22ff6eeb5a60c728b5316f717cf04bd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.25",
+      "mac": "00:11:25:91:47:A1",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-25-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.25",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-25-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.25",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-25.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.25",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-25-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
index 13c99f3fe5a1ef241eda8f6887c2ab37410b0e7c..7097224bbc700fe1060e2e1aad934bd8fed23b5d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.34",
+      "mac": "00:11:25:91:45:E8",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-250-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.34",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-250-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.34",
-      "mac": "00:11:25:c4:3b:9a",
+      "mac": "00:11:25:C4:3B:9A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-250.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.34",
-      "mac": "00:11:25:c4:3b:9b",
+      "mac": "00:11:25:C4:3B:9B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-250-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
index 1ce7e289fdaf03f5b04013b3b621c59c76858f58..e9fbd4ed420941bdd5752af8c74eab94de17e5b3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.35",
+      "mac": "00:11:25:91:47:40",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-251-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear07.orsay.grid5000.fr",
+      "switch_console": "mrv07.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.207",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.35",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-251-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.35",
-      "mac": "00:11:25:c4:3f:90",
+      "mac": "00:11:25:C4:3F:90",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-251.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch04.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.35",
-      "mac": "00:11:25:c4:3f:91",
+      "mac": "00:11:25:C4:3F:91",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-251-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
index 3925fba178ae592f5b0604e1331244a1737c0d60..a0b1f26e5b176f14714998e6c74cafe613653ddb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.148.36",
+      "mac": "00:11:25:91:48:28",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-252-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.88.36",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-252-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.36",
-      "mac": "00:11:25:c4:32:5a",
+      "mac": "00:11:25:C4:32:5A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-252.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.148.36",
-      "mac": "00:11:25:c4:32:5b",
+      "mac": "00:11:25:C4:32:5B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-252-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
index b955122420571609d588aa1ddcef7d609fb00f38..bf5111974c1a9cb618e933011616c4a99111f5d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.1",
+      "mac": "00:11:25:91:47:CC",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-253-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.1",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-253-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.1",
-      "mac": "00:11:25:c4:34:68",
+      "mac": "00:11:25:C4:34:68",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-253.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.1",
-      "mac": "00:11:25:c4:34:69",
+      "mac": "00:11:25:C4:34:69",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-253-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
index cfca70d63c95ffc83488e2330999f4dd54f7c023..b66ad4b9532dcefb65810b2aacdcc8146f6f73dd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.2",
+      "mac": "00:11:25:91:46:C7",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-254-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.2",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-254-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.2",
-      "mac": "00:11:25:c4:35:b8",
+      "mac": "00:11:25:C4:35:B8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-254.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.2",
-      "mac": "00:11:25:c4:35:b9",
+      "mac": "00:11:25:C4:35:B9",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-254-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
index 202ec5215c0711a12fe40e26a528ad0a18cdc5ea..05feca4494b8b95218bda9cea91870d53b74b36c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.3",
+      "mac": "00:11:25:91:48:BC",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-255-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-255-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.3",
-      "mac": "00:11:25:c4:09:86",
+      "mac": "00:11:25:C4:09:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-255.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.3",
-      "mac": "00:11:25:c4:09:87",
+      "mac": "00:11:25:C4:09:87",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-255-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
index d98391cc3b0035ed5bc01526182e401cba093b70..dab06a92cef78d92e1099afc42383737b7964a19 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.4",
+      "mac": "00:11:25:91:47:F0",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-256-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.4",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-256-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.4",
-      "mac": "00:11:25:c4:35:90",
+      "mac": "00:11:25:C4:35:90",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-256.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.4",
-      "mac": "00:11:25:c4:35:91",
+      "mac": "00:11:25:C4:35:91",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-256-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
index 9497c9a716ca03ae38d86b169650c1dac21bc7e8..fd6b55311d6e0483f20d37ead3b47cc074297cb0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.5",
+      "mac": "00:11:25:91:47:E2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-257-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.5",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-257-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.5",
-      "mac": "00:11:25:c4:35:62",
+      "mac": "00:11:25:C4:35:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-257.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.5",
-      "mac": "00:11:25:c4:35:63",
+      "mac": "00:11:25:C4:35:63",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-257-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
index 86c135b01d89bfb316fa0c488ed41207c245a9a1..62858355c55bbdc030c713dacc1e4660d6ce0e87 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.6",
+      "mac": "00:11:25:91:47:7C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-258-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.6",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-258-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.6",
-      "mac": "00:11:25:c4:13:1a",
+      "mac": "00:11:25:C4:13:1A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-258.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.6",
-      "mac": "00:11:25:c4:13:1b",
+      "mac": "00:11:25:C4:13:1B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-258-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
index e730688442b1df00a506e800927b74078f5d1913..9974ec15804c6175c3565215db41a1ba2dfd108f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.7",
+      "mac": "00:11:25:91:49:15",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-259-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.7",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-259-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.7",
-      "mac": "00:11:25:c4:35:6a",
+      "mac": "00:11:25:C4:35:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-259.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.7",
-      "mac": "00:11:25:c4:35:6b",
+      "mac": "00:11:25:C4:35:6B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-259-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
index 6afe598b664bc92a232cd1dc5026233f438f8b27..72b6dd52cde26c26e95630f5486bdc7b961accde 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.26",
+      "mac": "00:11:25:91:48:A5",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-26-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.26",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-26-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.26",
-      "mac": "00:11:25:c4:35:a4",
+      "mac": "00:11:25:C4:35:A4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-26.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.26",
-      "mac": "00:11:25:c4:35:a5",
+      "mac": "00:11:25:C4:35:A5",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-26-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
index 296949eea529b0783d7e1d3942c9c8d617a9c448..b02ccf3f0a9081db1c989fde901ef926344749db 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.8",
+      "mac": "00:11:25:91:45:D3",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-260-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.8",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-260-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.8",
-      "mac": "00:11:25:c4:33:82",
+      "mac": "00:11:25:C4:33:82",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-260.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.8",
-      "mac": "00:11:25:c4:33:83",
+      "mac": "00:11:25:C4:33:83",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-260-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
index 788f9e1ecf0332d170043af25a659dd4e4136190..c8acb121754a5024e8d982ad3951fb3616bc5615 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.9",
+      "mac": "00:11:25:91:48:7B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-261-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.9",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-261-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.9",
-      "mac": "00:11:25:c4:2d:72",
+      "mac": "00:11:25:C4:2D:72",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-261.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.9",
-      "mac": "00:11:25:c4:2d:73",
+      "mac": "00:11:25:C4:2D:73",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-261-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
index 56c1170213836ffe8908900c94aadc17a9245fcd..a019b843baf2decc88335a23d6e7b0a22f491814 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.10",
+      "mac": "00:11:25:91:47:46",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-262-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.10",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-262-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.10",
-      "mac": "00:11:25:c4:34:e8",
+      "mac": "00:11:25:C4:34:E8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-262.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.10",
-      "mac": "00:11:25:c4:34:e9",
+      "mac": "00:11:25:C4:34:E9",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-262-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
index c65c2f470f6197a072b5bcdf990f816567dc6d79..329c6ff176a35fa2838ea4c0ab941144a2e3b3c8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.11",
+      "mac": "00:11:25:91:48:07",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-263-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.11",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-263-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.11",
-      "mac": "00:11:25:c4:35:88",
+      "mac": "00:11:25:C4:35:88",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-263.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.11",
-      "mac": "00:11:25:c4:35:89",
+      "mac": "00:11:25:C4:35:89",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-263-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
index 5d864cc207d7b56a48baec984fd378efd5140050..0cd34b3e6bb47531222a3e95de8529bb92cc36a4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.149.12",
+      "mac": "00:11:25:91:48:14",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-264-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.89.12",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-264-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.12",
-      "mac": "00:11:25:c4:33:5e",
+      "mac": "00:11:25:C4:33:5E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-264.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.149.12",
-      "mac": "00:11:25:c4:33:5f",
+      "mac": "00:11:25:C4:33:5F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-264-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
index bb4af6fc35eff4e7a64564e9b331bdb4019b48c8..a6b4125a684f987a08c7cc468239c0731df8b0c0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.13",
+      "mac": "00:11:25:91:46:36",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-265-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.13",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-265-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.13",
-      "mac": null,
+      "mac": "00:11:25:C4:34:64",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-265.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.13",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-265-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
index d4572d8f00d9f8b1b745feb23e9ec89c3fcff02a..f4e0c4d87e289c23798285910c8e2503ae5e48f3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.14",
+      "mac": "00:11:25:91:46:60",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-266-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.14",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-266-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.14",
-      "mac": "00:11:25:c4:34:8a",
+      "mac": "00:11:25:C4:34:8A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-266.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.14",
-      "mac": "00:11:25:c4:34:8b",
+      "mac": "00:11:25:C4:34:8B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-266-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
index a33f445ada40f684a751f7adcebd8b77d124ac89..a854deaf63cb955bb621cf3f1dd6375fa2ba5743 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.15",
+      "mac": "00:11:25:91:45:AE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-267-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.15",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-267-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.15",
-      "mac": null,
+      "mac": "00:11:25:C4:35:36",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-267.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.15",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-267-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
index 25e4c90c718896525402f13c89351d99dfc71fa4..a713723c19023fe6d3bf9bbea536721be19df98a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.16",
+      "mac": "00:11:25:91:45:87",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-268-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.16",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-268-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.16",
-      "mac": "00:11:25:c4:34:4e",
+      "mac": "00:11:25:C4:34:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-268.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.16",
-      "mac": "00:11:25:c4:34:4f",
+      "mac": "00:11:25:C4:34:4F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-268-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
index e9504472f144e7f33eb8a247292c1068473b5e7b..3c57d1c91a87f9970397fb7d83e9f3888021c275 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.17",
+      "mac": "00:11:25:91:46:D0",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-269-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.17",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-269-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.17",
-      "mac": "00:11:25:c4:33:0e",
+      "mac": "00:11:25:C4:33:0E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-269.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.17",
-      "mac": "00:11:25:c4:33:0f",
+      "mac": "00:11:25:C4:33:0F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-269-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
index e05277a12d6f21a42c4802dcbd98a5bf80138eac..46be76f0dd889d8c75a326a2d3e2b567d3917271 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.27",
+      "mac": "00:11:25:91:49:1C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-27-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.27",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-27-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.27",
-      "mac": "00:11:25:c4:31:4e",
+      "mac": "00:11:25:C4:31:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-27.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.27",
-      "mac": "00:11:25:c4:31:4f",
+      "mac": "00:11:25:C4:31:4F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-27-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
index bba88bbb933810df286ef83d9e883e0539fd12c4..3aafa453ac5d4bbaac27bbdaf168adc0aa5904a4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.18",
+      "mac": "00:11:25:91:46:CF",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-270-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.18",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-270-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.18",
-      "mac": "00:11:25:c4:35:48",
+      "mac": "00:11:25:C4:35:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-270.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.18",
-      "mac": "00:11:25:c4:35:49",
+      "mac": "00:11:25:C4:35:49",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-270-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
index ea0c88c385a8725f74aac8a56cdf3584edb678f6..9a012446c6499e03f6befebb6de85665196be15d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.19",
+      "mac": "00:11:25:91:47:7D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-271-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.19",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-271-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.19",
-      "mac": "00:11:25:c4:31:92",
+      "mac": "00:11:25:C4:31:92",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-271.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.19",
-      "mac": "00:11:25:c4:31:93",
+      "mac": "00:11:25:C4:31:93",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-271-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
index 5d4d40102199f061caad58256846423c57a5f113..3336946c7172937594cd7070d38e102f73a9744e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.20",
+      "mac": "00:11:25:91:48:15",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-272-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.20",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-272-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.20",
-      "mac": "00:11:25:c4:2f:20",
+      "mac": "00:11:25:C4:2F:20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-272.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.20",
-      "mac": "00:11:25:c4:2f:21",
+      "mac": "00:11:25:C4:2F:21",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-272-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
index a1daf6f3b476672d2e88ca7d80eb373ca5528652..0d8ed18e5f5181b611f6bd2447d46a605da5d665 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.21",
+      "mac": "00:11:25:91:46:99",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-273-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.21",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-273-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.21",
-      "mac": "00:11:25:c4:32:ee",
+      "mac": "00:11:25:C4:32:EE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-273.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.21",
-      "mac": "00:11:25:c4:32:ef",
+      "mac": "00:11:25:C4:32:EF",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-273-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
index 3189e59a587da6b6a83f2e6b2a52949dcabdd343..5a9f2532f5b59541c345e1bc67172e9488a4b220 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.22",
+      "mac": "00:11:25:91:45:C9",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-274-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.22",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-274-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.22",
-      "mac": "00:11:25:c4:35:c0",
+      "mac": "00:11:25:C4:35:C0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-274.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.22",
-      "mac": "00:11:25:c4:35:c1",
+      "mac": "00:11:25:C4:35:C1",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-274-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
index 3c28bb86cd69c3ee77701cc67d5069947229f265..b6c5a3f73123662978181a2b482eb156c4054778 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.23",
+      "mac": "00:11:25:91:45:F0",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-275-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.23",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-275-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.23",
-      "mac": "00:11:25:c4:11:38",
+      "mac": "00:11:25:C4:11:38",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-275.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.23",
-      "mac": "00:11:25:c4:11:39",
+      "mac": "00:11:25:C4:11:39",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-275-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
index 54ec77262f082fa9f28b9e2064bbd9c6f9a92957..1425f8775c0035aeb5c83dd1ad35e54ebf7dbc3e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.150.24",
+      "mac": "00:09:6B:5E:FB:10",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-276-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.90.24",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-276-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.24",
-      "mac": "00:11:25:c4:35:b6",
+      "mac": "00:11:25:C4:35:B6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-276.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.150.24",
-      "mac": "00:11:25:c4:35:b7",
+      "mac": "00:11:25:C4:35:B7",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-276-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
index 67ddef0acf92b6f166680f554ead3ff610900486..39b83371045b27cf4265926995539353d5e94b97 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.25",
+      "mac": "00:11:25:91:49:5E",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-277-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.25",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-277-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.25",
-      "mac": "00:11:25:c4:34:58",
+      "mac": "00:11:25:C4:34:58",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-277.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.25",
-      "mac": "00:11:25:c4:34:59",
+      "mac": "00:11:25:C4:34:59",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-277-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
index e2aa72e903becdaf72a007c47277197b1e46c255..08ea6599764d57bcfb65f9928abed8b2e8007c37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.26",
+      "mac": "00:11:25:91:47:6C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-278-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.26",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-278-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.26",
-      "mac": "00:11:25:c4:34:46",
+      "mac": "00:11:25:C4:34:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-278.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.26",
-      "mac": "00:11:25:c4:34:47",
+      "mac": "00:11:25:C4:34:47",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-278-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
index ff063bbf8abcf7c27eb68f60d465c44d1698f830..52980c8a17bd51dffbb09e17ed945e4c8d5b761f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.27",
+      "mac": "00:11:25:91:46:42",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-279-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.27",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-279-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.27",
-      "mac": "00:11:25:c4:33:96",
+      "mac": "00:11:25:C4:33:96",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-279.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.27",
-      "mac": "00:11:25:c4:33:97",
+      "mac": "00:11:25:C4:33:97",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-279-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
index b19306f618b7cff9324f650291f054089be9fb21..36a5314aba93161399f145b0b229a0ce1ba60b9b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.28",
+      "mac": "00:11:25:91:49:01",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-28-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.28",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-28-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.28",
-      "mac": "00:11:25:c4:34:6e",
+      "mac": "00:11:25:C4:34:6E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-28.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.28",
-      "mac": "00:11:25:c4:34:6f",
+      "mac": "00:11:25:C4:34:6F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-28-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
index 766c6670f4c980983f9a6794c5bf028aba3e2eb5..0d208f3bd16b65e9fb5f6ead76f7ed73c64c55bf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.28",
+      "mac": "00:11:25:91:46:92",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-280-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.28",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-280-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.28",
-      "mac": "00:11:25:c4:33:20",
+      "mac": "00:11:25:C4:33:20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-280.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.28",
-      "mac": "00:11:25:c4:33:21",
+      "mac": "00:11:25:C4:33:21",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-280-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
index bcb8201ede17a367668e2edfc18f1eb6ea417817..02f8cf614abb444994a61cc1e78dc29100ddf7ee 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.29",
+      "mac": "00:11:25:91:45:7F",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-281-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.29",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-281-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.29",
-      "mac": "00:11:25:c4:33:18",
+      "mac": "00:11:25:C4:33:18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-281.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.29",
-      "mac": "00:11:25:c4:33:19",
+      "mac": "00:11:25:C4:33:19",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-281-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
index addefe5e3f8431157e8fad2f3c9baf8e4b25e371..13adf0718e3b476f3e5829dcb1d9d1ff1eee4ae1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.30",
+      "mac": "00:11:25:91:47:11",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-282-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.30",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-282-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.30",
-      "mac": "00:11:25:c4:31:44",
+      "mac": "00:11:25:C4:31:44",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-282.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.30",
-      "mac": "00:11:25:c4:31:45",
+      "mac": "00:11:25:C4:31:45",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-282-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
index 3a8ad4ce9e5f6d77382c3f55e86f7a636d39b51e..4daf456c821df01a3ab336c8bf2720641f054dea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.31",
+      "mac": "00:11:25:91:45:9E",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-283-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.31",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-283-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.31",
-      "mac": "00:11:25:c4:34:5e",
+      "mac": "00:11:25:C4:34:5E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-283.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.31",
-      "mac": "00:11:25:c4:34:5f",
+      "mac": "00:11:25:C4:34:5F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-283-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
index 8d6a96f45d5669ba8a56f91bacad2fcfe38e29c5..eec010becd86779f3a009d37e30779a52b5d035d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.32",
+      "mac": "00:11:25:91:45:A2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-284-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.32",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-284-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.32",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-284.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.32",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-284-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
index 24d4d913799f91a6216b94479bba485bb858d751..7ee2d7285edbd5f8da10aaf0ce3a78f4a32f5c75 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.33",
+      "mac": "00:11:25:91:48:CE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-285-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.33",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-285-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.33",
-      "mac": "00:11:25:c4:35:be",
+      "mac": "00:11:25:C4:35:BE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-285.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.33",
-      "mac": "00:11:25:c4:35:bf",
+      "mac": "00:11:25:C4:35:BF",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-285-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
index e91c515acc3e6ce2a47fb89fe76a6ef539d18018..f53439d7ee2271e9ba18f768ba7f344380764ac0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.34",
+      "mac": "00:11:25:91:45:DA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-286-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.34",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-286-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.34",
-      "mac": "00:11:25:c4:2a:c2",
+      "mac": "00:11:25:C4:2A:C2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-286.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.34",
-      "mac": "00:11:25:c4:2a:c3",
+      "mac": "00:11:25:C4:2A:C3",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-286-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
index 773004c9397053a195dcd9217509471669be072d..d4f817417c9dbd1ef1590f6925f896faf1bdc345 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.35",
+      "mac": "00:11:25:91:46:33",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-287-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear08.orsay.grid5000.fr",
+      "switch_console": "mrv08.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.208",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.158",
+      "switch_mac": "00:0f:b5:fc:0d:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.35",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-287-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.35",
-      "mac": "00:11:25:c4:34:40",
+      "mac": "00:11:25:C4:34:40",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-287.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.35",
-      "mac": "00:11:25:c4:34:41",
+      "mac": "00:11:25:C4:34:41",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-287-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
index d43bb78aa5757dec2ae50d30ae49d1a8a4b0067b..44f25778440258a50f34d013818d53e53062c465 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.151.36",
+      "mac": "00:11:25:91:46:58",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-288-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.91.36",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-288-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.36",
-      "mac": "00:11:25:c4:34:66",
+      "mac": "00:11:25:C4:34:66",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-288.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.151.36",
-      "mac": "00:11:25:c4:34:67",
+      "mac": "00:11:25:C4:34:67",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-288-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index ceecadef1116ec0bc20b93ded2afb4b8941b4f16..37e9df3fbf5035de3f2c919acc37cd826adf2e8d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.1",
+      "mac": "00:11:25:91:48:22",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-289-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.1",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-289-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.1",
-      "mac": "00:11:25:c4:33:68",
+      "mac": "00:11:25:C4:33:68",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-289.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.1",
-      "mac": "00:11:25:c4:33:69",
+      "mac": "00:11:25:C4:33:69",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-289-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
index d89c97da76d83cc0f2f22d6239a8d2115391ffa4..b6bffb002797593b8c98feb13beab88b769cbf0e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.29",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-29-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.29",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-29-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.29",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-29.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.29",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-29-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
index 8c26eed639ccdc6753df3420d75b6c644379df28..d0167c9bd655c8fd01098de3ac0a2992fe242589 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.2",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-290-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.2",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-290-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.2",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-290.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.2",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-290-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index 1b4fa7415473d2bf7244bc7adceb507ab72d3b93..6e13d8fad2bb0159691b6f86bf5a3111912bd1d2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.3",
+      "mac": "00:11:25:91:47:77",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-291-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-291-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.3",
-      "mac": "00:11:25:c4:33:1c",
+      "mac": "00:11:25:C4:33:1C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-291.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.3",
-      "mac": "00:11:25:c4:33:1d",
+      "mac": "00:11:25:C4:33:1D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-291-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index 36cfdef3b0ca7cc0dfc27a8f3571636e04fc4dd0..e5cefe51f38cb9d7c09ca0f459489eda306992be 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.4",
+      "mac": "00:11:25:91:46:19",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-292-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.4",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-292-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.4",
-      "mac": "00:11:25:c4:33:88",
+      "mac": "00:11:25:C4:33:88",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-292.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.4",
-      "mac": "00:11:25:c4:33:89",
+      "mac": "00:11:25:C4:33:89",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-292-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index 8463e874b1135d6e0a9e169bf415f73442168a0c..5f702971e33bfcc377f21fb5efbd982efb433974 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.5",
+      "mac": "00:11:25:91:43:D8",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-293-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.5",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-293-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.5",
-      "mac": "00:11:25:c4:33:4a",
+      "mac": "00:11:25:C4:33:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-293.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.5",
-      "mac": "00:11:25:c4:33:4b",
+      "mac": "00:11:25:C4:33:4B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-293-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index 08a16bd747b408c448d8812adc535092aae075fb..664f2fd5452204bbeff177c798766a599278e14f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.6",
+      "mac": "00:11:25:91:47:EF",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-294-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.6",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-294-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.6",
-      "mac": "00:11:25:c4:33:24",
+      "mac": "00:11:25:C4:33:24",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-294.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.6",
-      "mac": "00:11:25:c4:33:25",
+      "mac": "00:11:25:C4:33:25",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-294-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index f15e9288ab3f1bd0d17ba6f413602fa070a3d2e1..da8af5f3a41a1a86ae465ca36a40d891cd2efd27 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.7",
+      "mac": "00:11:25:91:46:5A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-295-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.7",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-295-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.7",
-      "mac": "00:11:25:c4:33:7a",
+      "mac": "00:11:25:C4:33:7A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-295.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.7",
-      "mac": "00:11:25:c4:33:7b",
+      "mac": "00:11:25:C4:33:7B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-295-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index 7f91d4927e3c7a5e82dec41c48a65d88c3f0bb54..308dee82f069f0f69cea7236484342101e83d224 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.8",
+      "mac": "00:11:25:91:47:AB",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-296-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.8",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-296-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.8",
-      "mac": "00:11:25:c4:20:06",
+      "mac": "00:11:25:C4:20:06",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-296.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.8",
-      "mac": "00:11:25:c4:20:07",
+      "mac": "00:11:25:C4:20:07",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-296-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index d385543af8280ccc74badbff9818d5b4b24ad32a..e8d0ae3a3b742b6071a4cf3e8e8fa99c2e4e16f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.9",
+      "mac": "00:11:25:91:47:D2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-297-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.9",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-297-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.9",
-      "mac": "00:11:25:c4:33:3c",
+      "mac": "00:11:25:C4:33:3C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-297.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.9",
-      "mac": "00:11:25:c4:33:3d",
+      "mac": "00:11:25:C4:33:3D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-297-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
index 289f9742a7f6a70dc397920f9248dc15583d8bfe..7f63dffb96a59318d6cae9fd74076f1480dc490c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.10",
+      "mac": "00:11:25:91:46:8E",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-298-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.10",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-298-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.10",
-      "mac": "00:11:25:c4:33:48",
+      "mac": "00:11:25:C4:33:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-298.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.10",
-      "mac": "00:11:25:c4:33:49",
+      "mac": "00:11:25:C4:33:49",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-298-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
index 3d234e0d3169571f7471826a20c3a5b2c66decb6..858461090ffe456f3dc3089d9c7813a7166fc334 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.11",
+      "mac": "00:11:25:91:47:0B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-299-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.11",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-299-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.11",
-      "mac": "00:11:25:c4:33:46",
+      "mac": "00:11:25:C4:33:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-299.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.11",
-      "mac": "00:11:25:c4:33:47",
+      "mac": "00:11:25:C4:33:47",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-299-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
index 115c9f7697b6055f2bf733d1196f096eb3ec86f0..02a817a636a3fc118ff25df7124de4d7e2884651 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.3",
+      "mac": "00:11:25:91:47:3B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-3-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-3-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.3",
-      "mac": "00:11:25:c4:35:3a",
+      "mac": "00:11:25:C4:35:3A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-3.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.3",
-      "mac": "00:11:25:c4:35:3b",
+      "mac": "00:11:25:C4:35:3B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-3-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
index 215091c28e8fb0ca83552a8a2a2a5d757a3abfac..5ec7222f0af2f0b8b8839f5f84738db68cc0066e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.30",
+      "mac": "00:11:25:91:46:61",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-30-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.30",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-30-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.30",
-      "mac": "00:11:25:c4:35:2c",
+      "mac": "00:11:25:C4:35:2C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-30.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.30",
-      "mac": "00:11:25:c4:35:2d",
+      "mac": "00:11:25:C4:35:2D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-30-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
index 0d66884d16d357872d1f95d65b8584bff1dfc86b..685ec626dfe027b5f75db769adca11afd5dbf2a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.152.12",
+      "mac": "00:11:25:91:45:A9",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-300-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.92.12",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-300-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.12",
-      "mac": "00:11:25:c4:33:14",
+      "mac": "00:11:25:C4:33:14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-300.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.12",
-      "mac": "00:11:25:c4:33:15",
+      "mac": "00:11:25:C4:33:15",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-300-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
index 92d596f1a3425da919c1707234566ac7127e7da2..2afd33de92bba0be378bc481f3fab1bdc76de12f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.13",
+      "mac": "00:11:25:91:45:C4",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-301-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.13",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-301-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.13",
-      "mac": "00:11:25:c4:35:06",
+      "mac": "00:11:25:C4:35:06",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-301.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.13",
-      "mac": "00:11:25:c4:35:07",
+      "mac": "00:11:25:C4:35:07",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-301-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
index a2fd329a3399e0e865105fdc026dd2a42c98d042..a34b896c20daf60432e85599a5bcc1f5f15583f5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.14",
+      "mac": "00:11:25:91:46:64",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-302-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.14",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-302-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.14",
-      "mac": "00:11:25:c4:34:42",
+      "mac": "00:11:25:C4:34:42",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-302.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.14",
-      "mac": "00:11:25:c4:34:43",
+      "mac": "00:11:25:C4:34:43",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-302-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
index 83b16ab43c3380ba8b1a6f609b988a0e42634703..d8f4666d247b2fdd67056847800bcb663ebe92b5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.15",
+      "mac": "00:11:25:91:45:9A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-303-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.15",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-303-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.15",
-      "mac": "00:11:25:c4:0f:10",
+      "mac": "00:11:25:C4:0F:10",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-303.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.15",
-      "mac": "00:11:25:c4:0f:11",
+      "mac": "00:11:25:C4:0F:11",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-303-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
index 81e0107a34e1ad2ce493f93b312d645032d94193..745bed9898a1123203a5d300ac1f8acc3682bf24 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.16",
+      "mac": "00:11:25:91:47:9C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-304-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.16",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-304-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.16",
-      "mac": "00:11:25:c4:33:58",
+      "mac": "00:11:25:C4:33:58",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-304.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.16",
-      "mac": "00:11:25:c4:33:59",
+      "mac": "00:11:25:C4:33:59",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-304-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
index 65eda2651e84163b27467418da1fbec6aa9aac09..5aa299486174c62e45d94cc590a4958e8e6eee7c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.17",
+      "mac": "00:11:25:91:46:5B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-305-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.17",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-305-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.17",
-      "mac": "00:11:25:c4:34:62",
+      "mac": "00:11:25:C4:34:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-305.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve01.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.181",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.17",
-      "mac": "00:11:25:c4:34:63",
+      "mac": "00:11:25:C4:34:63",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-305-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index 0cf10c1e08a495b3fcd81acd34a9bd398b6c5cac..9b5ef467fbf5409f8a99df5ed4fd437846235fe7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.18",
+      "mac": "00:11:25:91:46:35",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-306-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.18",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-306-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.18",
-      "mac": "00:11:25:c4:41:5a",
+      "mac": "00:11:25:C4:41:5A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-306.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.18",
-      "mac": "00:11:25:c4:41:5b",
+      "mac": "00:11:25:C4:41:5B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-306-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
index 06f234b2cb44154d5583d7215b0b35156efdac63..3d5046983423477bb177605defc1f92f11c5c8e6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.19",
+      "mac": "00:11:25:91:46:FE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-307-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.19",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-307-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.19",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-307.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.19",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-307-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
index 9c0470d57952fba8ee97e2e1d792437f6b3c6dfe..df903cca050f39ae1a7973a25afe42e52e011545 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.20",
+      "mac": "00:11:25:91:46:66",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-308-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.20",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-308-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.20",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-308.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.20",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-308-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
index 08a6050353603128e2bba3c647a1328670df5fb7..8ef3d3792689f58c42a7e3cd8552d8132f702de6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.21",
+      "mac": "00:11:25:91:45:F6",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-309-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.21",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-309-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.21",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-309.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.21",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-309-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
index e98c64cdbd293f1c68ee45110e157fd87edb1798..14471b594347977e520e762326dfde3f3ab6692c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.31",
+      "mac": "00:11:25:91:45:C5",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-31-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.31",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-31-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.31",
-      "mac": "00:11:25:c4:35:24",
+      "mac": "00:11:25:C4:35:24",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-31.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.31",
-      "mac": "00:11:25:c4:35:25",
+      "mac": "00:11:25:C4:35:25",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-31-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
index dad5a6390d3c857922ea0f41d888700d7dacdab8..4df63270ce870d91576ba01d92ae601e78fc389f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.153.22",
+      "mac": "00:11:25:91:47:A6",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-310-bmc.orsay.grid5000.fr",
+      "rate": 100000000,
+      "switch": "procurve-bmc-09.orsay.grid5000.fr",
+      "switch_console": "mrv09.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.209",
+      "switch_console_mac": "00:a0:9c:00:25:4a",
+      "switch_ip": "172.26.120.159",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.93.22",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-310-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.22",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-310.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.153.22",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-310-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
index 8a41a7c6f11e22b9846d0629468d25a03167cc90..e918bc41555ccc3a486231b50e8ec04eb1051d98 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.32",
+      "mac": "00:11:25:91:49:3D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-32-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.32",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-32-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.32",
-      "mac": "00:11:25:c4:35:08",
+      "mac": "00:11:25:C4:35:08",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-32.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.32",
-      "mac": "00:11:25:c4:35:09",
+      "mac": "00:11:25:C4:35:09",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-32-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
index 39dd0cd057cf08db2ef3997c38b02e9dbc73e5e1..21298add73b1ea24ec8518142b42f26242d10c9b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.33",
+      "mac": "00:11:25:91:45:EB",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-33-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.33",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-33-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.33",
-      "mac": "00:11:25:c4:34:70",
+      "mac": "00:11:25:C4:34:70",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-33.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.33",
-      "mac": "00:11:25:c4:34:71",
+      "mac": "00:11:25:C4:34:71",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-33-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
index 92704f2fc5ec2281c3239186bd4de9598c0de379..dfe790f044f4673d5e4434ff72c10fff1e5d008e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.34",
+      "mac": "00:11:25:91:49:34",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-34-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.34",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-34-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.34",
-      "mac": "00:11:25:c4:33:8e",
+      "mac": "00:11:25:C4:33:8E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-34.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.34",
-      "mac": "00:11:25:c4:33:8f",
+      "mac": "00:11:25:C4:33:8F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-34-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
index 59b8c59ba27d261c14194cc0443b7b9dbd55e49e..c7d2d4fc51cc12d42290b988c4a1817209358e96 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.35",
+      "mac": "00:11:25:91:47:C5",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-35-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.35",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-35-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.35",
-      "mac": "00:11:25:c4:34:7a",
+      "mac": "00:11:25:C4:34:7A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-35.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch12.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.112",
+      "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.35",
-      "mac": "00:11:25:c4:34:7b",
+      "mac": "00:11:25:C4:34:7B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-35-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
index 5b82c4677466744fae8e708ff32d2c3d4aa16bd5..e802b1e5a33e43ebdac31211e782f1aa65930631 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.130.36",
+      "mac": "00:11:25:91:45:E7",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-36-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.70.36",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-36-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.36",
-      "mac": "00:11:25:c4:33:56",
+      "mac": "00:11:25:C4:33:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-36.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.130.36",
-      "mac": "00:11:25:c4:33:57",
+      "mac": "00:11:25:C4:33:57",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-36-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
index 6f07b4f5d006f71a360162860fb05f856c6fc9c2..2834e5a25cd91f6eea2582899609b224a49185c6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.1",
+      "mac": "00:11:25:91:48:3C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-37-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.1",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-37-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.1",
-      "mac": "00:11:25:c4:31:66",
+      "mac": "00:11:25:C4:31:66",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-37.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.1",
-      "mac": "00:11:25:c4:31:67",
+      "mac": "00:11:25:C4:31:67",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-37-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
index 28510eb02a7ddeac1927538f31133fe7ea1d6f37..8e6e6d667b92706130dd10e2c6d9ea1d7c3f00bd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.2",
+      "mac": "00:11:25:91:47:26",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-38-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.2",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-38-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.2",
-      "mac": "00:11:25:c4:34:6c",
+      "mac": "00:11:25:C4:34:6C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-38.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.2",
-      "mac": "00:11:25:c4:34:6d",
+      "mac": "00:11:25:C4:34:6D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-38-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
index 1b80579a56d4ebe3d4470970bca997963521b86f..0ad2a6f0db2c16b3b9bc31cfe23f19a42fea6509 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.3",
+      "mac": "00:11:25:91:45:A8",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-39-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-39-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.3",
-      "mac": "00:11:25:c4:34:4a",
+      "mac": "00:11:25:C4:34:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-39.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.3",
-      "mac": "00:11:25:c4:34:4b",
+      "mac": "00:11:25:C4:34:4B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-39-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
index b0d81cb19b54f395f31708ef988aa713887136e0..8f8c5ad5b73d85ace6cb100dc43dab138bd055dd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.4",
+      "mac": "00:11:25:91:49:63",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-4-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.4",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-4-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.4",
-      "mac": "00:11:25:c4:35:40",
+      "mac": "00:11:25:C4:35:40",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-4.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.4",
-      "mac": "00:11:25:c4:35:41",
+      "mac": "00:11:25:C4:35:41",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-4-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
index 340f07cc2a9e148ff5bdce4c7c723e09f609d3db..65084eeb27f260047569f002e36112b96c211c2a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.4",
+      "mac": "00:11:25:91:46:84",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-40-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.4",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-40-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.4",
-      "mac": "00:11:25:c4:33:66",
+      "mac": "00:11:25:C4:33:66",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-40.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.4",
-      "mac": "00:11:25:c4:33:67",
+      "mac": "00:11:25:C4:33:67",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-40-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
index 0f70b576ffc6074b3b8a23219faccba5d9b119c0..4530bba4331edd1598cb4e56fab1c0be44f2b393 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.5",
+      "mac": "00:11:25:91:45:AB",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-41-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.5",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-41-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.5",
-      "mac": "00:11:25:c4:34:86",
+      "mac": "00:11:25:C4:34:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-41.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.5",
-      "mac": "00:11:25:c4:34:87",
+      "mac": "00:11:25:C4:34:87",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-41-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
index 750b45262ac3beb1c049a2faad083bdeaf55d261..8f901823a17e9c26439ffa3c68f3e3708ea5a8bc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.6",
+      "mac": "00:11:25:91:49:2C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-42-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.6",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-42-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.6",
-      "mac": "00:11:25:c4:2b:f0",
+      "mac": "00:11:25:C4:2B:F0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-42.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.6",
-      "mac": "00:11:25:c4:2b:f1",
+      "mac": "00:11:25:C4:2B:F1",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-42-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
index 0808cc920043ca19f4995569d73ce0b4411e6b6e..657af52b1fd6084936bf7696dac321b6ddc33017 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.7",
+      "mac": "00:11:25:91:45:BD",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-43-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.7",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-43-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.7",
-      "mac": "00:11:25:c4:33:2a",
+      "mac": "00:11:25:C4:33:2A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-43.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.7",
-      "mac": "00:11:25:c4:33:2b",
+      "mac": "00:11:25:C4:33:2B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-43-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
index b9da78c49b25bed34d46bfc208126df2f17ad192..c7a2e284721f6f21383174aa0219205915da8c12 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.8",
+      "mac": "00:11:25:91:48:EC",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-44-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.8",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-44-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.8",
-      "mac": "00:11:25:c4:2f:50",
+      "mac": "00:11:25:C4:2F:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-44.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.8",
-      "mac": "00:11:25:c4:2f:51",
+      "mac": "00:11:25:C4:2F:51",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-44-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
index 7b1ab77449b7428b4c1bb339c5308e5ece0f4366..348d745f62c9fdd9a865d5ee8f05b6fb749237ec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.9",
+      "mac": "00:11:25:91:49:3F",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-45-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.9",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-45-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.9",
-      "mac": "00:11:25:c4:35:18",
+      "mac": "00:11:25:C4:35:18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-45.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.9",
-      "mac": "00:11:25:c4:35:19",
+      "mac": "00:11:25:C4:35:19",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-45-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
index 59e5fa398ae28f2813e69fa8717afb004f116528..89dc4461391a93d431bab13aa203cb4d0e92bd12 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.10",
+      "mac": "00:11:25:91:76:3B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-46-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.10",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-46-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.10",
-      "mac": "00:11:25:c4:09:c6",
+      "mac": "00:11:25:C4:09:C6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-46.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.10",
-      "mac": "00:11:25:c4:09:c7",
+      "mac": "00:11:25:C4:09:C7",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-46-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
index 95509602f395ce4229fbdb470d8f74eb11c15c11..c3cc4acb594c0cff541a158372649c8ef363c858 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.11",
+      "mac": "00:11:25:91:48:52",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-47-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.11",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-47-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.11",
-      "mac": "00:11:25:c4:35:99",
+      "mac": "00:11:25:C4:35:99",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-47.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.11",
-      "mac": "00:11:25:c4:35:9a",
+      "mac": "00:11:25:C4:35:9A",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-47-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
index ba74072b0da346b26a84d59ed9c83760cea86ee9..cfe22a12650b7cfaad07a4d259c9cbe50437623f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.131.12",
+      "mac": "00:11:25:91:46:06",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-48-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.71.12",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-48-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.12",
-      "mac": "00:11:25:c4:2d:6c",
+      "mac": "00:11:25:C4:2D:6C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-48.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.131.12",
-      "mac": "00:11:25:c4:2d:6d",
+      "mac": "00:11:25:C4:2D:6D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-48-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
index 1017bf4f9ef0c6e14b610aaec3faa4635ca0b690..15888a6577c2d4aebfb2a9331590df832fb4f803 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.13",
+      "mac": "00:11:25:91:49:11",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-49-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.13",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-49-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.13",
-      "mac": "00:11:25:c4:33:16",
+      "mac": "00:11:25:C4:33:16",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-49.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.13",
-      "mac": "00:11:25:c4:33:17",
+      "mac": "00:11:25:C4:33:17",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-49-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
index f4abf5aae9501080db3a60dde1720b8cc96f5879..d1125c9055a53c2d512f79cec544c048dff395eb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.5",
+      "mac": "00:11:25:91:47:B0",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-5-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.5",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-5-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.5",
-      "mac": "00:11:25:c4:33:52",
+      "mac": "00:11:25:C4:33:52",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-5.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.5",
-      "mac": "00:11:25:c4:33:53",
+      "mac": "00:11:25:C4:33:53",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-5-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
index e9a4115b51ad95d2809b791e918044e4d1bbecf6..39b292506ef9e130a997bea050cacfb88f02d74a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.14",
+      "mac": "00:11:25:91:49:3C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-50-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.14",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-50-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.14",
-      "mac": "00:11:25:c4:33:92",
+      "mac": "00:11:25:C4:33:92",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-50.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.14",
-      "mac": "00:11:25:c4:33:93",
+      "mac": "00:11:25:C4:33:93",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-50-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
index 8878f7863ebcd27d7020b5d831a3e0b43be78eb7..1943143b22343ae44bfa21b6912f9e3d23ffef00 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.15",
+      "mac": "00:11:25:91:45:C1",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-51-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.15",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-51-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.15",
-      "mac": "00:11:25:c4:49:8e",
+      "mac": "00:11:25:C4:49:8E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-51.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.15",
-      "mac": "00:11:25:c4:49:8f",
+      "mac": "00:11:25:C4:49:8F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-51-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
index 661fdd811128a96750b9a78ad471211ceb6870b5..ebe006bd438e58289e629979b02a2a009c1e7fe5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.16",
+      "mac": "00:11:25:91:47:21",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-52-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.16",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-52-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.16",
-      "mac": "00:11:25:c4:35:97",
+      "mac": "00:11:25:C4:35:97",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-52.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.16",
-      "mac": "00:11:25:c4:35:98",
+      "mac": "00:11:25:C4:35:98",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-52-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
index 4517d3afcb9f746900609df72cc3518adef04783..ce641160e25f311bedc451d125d75e276c953341 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.17",
+      "mac": "00:11:25:91:47:B1",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-53-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.17",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-53-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.17",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-53.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch09.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.109",
+      "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.17",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-53-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
index e136fb78adae701ee7591daef292c0b74000b121..f6bb9c84516805a08dfc48f85561dee641f4d1cf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.18",
+      "mac": "00:11:25:91:45:93",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-54-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.18",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-54-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.18",
-      "mac": "00:11:25:c4:35:bc",
+      "mac": "00:11:25:C4:35:BC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-54.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.18",
-      "mac": "00:11:25:c4:35:bd",
+      "mac": "00:11:25:C4:35:BD",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-54-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
index 942bebba8fe5a01da1f6e577923bb80096309e93..3eb7a57ca7f09f32d436ace2452a2e0fd4e33a37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.19",
+      "mac": "00:11:25:91:49:0B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-55-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.19",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-55-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.19",
-      "mac": "00:11:25:c4:3b:bc",
+      "mac": "00:11:25:C4:3B:BC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-55.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.19",
-      "mac": "00:11:25:c4:3b:bd",
+      "mac": "00:11:25:C4:3B:BD",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-55-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
index c0848fe7cba141dffcc5807ef37481b3af3662c9..8efc26d2895159c8a54314da590ebdca79339d23 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.20",
+      "mac": "00:11:25:91:47:96",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-56-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.20",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-56-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.20",
-      "mac": "00:11:25:c4:3c:7c",
+      "mac": "00:11:25:C4:3C:7C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-56.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.20",
-      "mac": "00:11:25:c4:3c:7d",
+      "mac": "00:11:25:C4:3C:7D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-56-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
index e17c510d43f846dc69f1080c13e6b0a73c1c09be..dc13f5f232799162d45f232a93ab914ce76a47d1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.21",
+      "mac": "00:11:25:91:49:50",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-57-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.21",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-57-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.21",
-      "mac": "00:11:25:c4:3c:24",
+      "mac": "00:11:25:C4:3C:24",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-57.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.21",
-      "mac": "00:11:25:c4:3c:25",
+      "mac": "00:11:25:C4:3C:25",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-57-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
index eb635cdb24732d03e4de946e17d16be2259c4411..85f67cac50cae247d58a116de1ebd75afea52080 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.22",
+      "mac": "00:11:25:91:46:51",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-58-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.22",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-58-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.22",
-      "mac": "00:11:25:c4:39:3e",
+      "mac": "00:11:25:C4:39:3E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-58.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.22",
-      "mac": "00:11:25:c4:39:3f",
+      "mac": "00:11:25:C4:39:3F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-58-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
index cfb8a7217f38bc124310d9dff3395d81ab22c96e..9792220ef7a4bf52e1ba77c4e183ce30f202c746 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.23",
+      "mac": "00:11:25:91:49:03",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-59-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.23",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-59-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.23",
-      "mac": "00:11:25:c4:2e:30",
+      "mac": "00:11:25:C4:2E:30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-59.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.23",
-      "mac": "00:11:25:c4:2e:31",
+      "mac": "00:11:25:C4:2E:31",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-59-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
index 0e38058d81a9ac56ee93435e7a4ca28361e84e59..335026927943d0f88c2c9b1cc0c5637677c72b22 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.6",
+      "mac": "00:11:25:91:48:17",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-6-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.6",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-6-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.6",
-      "mac": "00:11:25:c4:35:1e",
+      "mac": "00:11:25:C4:35:1E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-6.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.6",
-      "mac": "00:11:25:c4:35:1f",
+      "mac": "00:11:25:C4:35:1F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-6-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
index 25edb24b29bc68349e3815a6341aa0e724195004..fd342f8eb1f23742a370cdf2793c7b9012222200 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.132.24",
+      "mac": "00:11:25:91:46:57",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-60-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.72.24",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-60-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.24",
-      "mac": null,
+      "mac": "00:11:25:C4:3E:2C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-60.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.132.24",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-60-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
index 8b314894e2dd8875c4a5de1be302b56ac4eed303..96427de5861ecfe924c271707d5be527ed55f18a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.25",
+      "mac": "00:11:25:91:48:B3",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-61-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.25",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-61-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.25",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:10",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-61.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.25",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-61-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
index c9e90110818e1cbc134443fe7363c2d00fe87f59..d90d4c69791374139ff6f5e46eb0ace5dd087dc5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.26",
+      "mac": "00:11:25:91:45:BB",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-62-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.26",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-62-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.26",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-62.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.26",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-62-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
index 3287e65bcba967c8ec8527e8a41be9fddc0fb37a..6de3a8b17790d4f78fc03d76ea2ced1126e209fa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.27",
+      "mac": "00:11:25:91:45:B2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-63-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.27",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-63-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.27",
-      "mac": null,
+      "mac": "00:11:25:C4:3B:B4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-63.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.27",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-63-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
index 94c3b30f857afc0be60656d2d12db8d65d656707..d68d41eac65b1a57953ae7a7812832cb172ca50d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.28",
+      "mac": "00:11:25:91:45:AF",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-64-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.28",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-64-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.28",
-      "mac": null,
+      "mac": "00:11:25:C4:39:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-64.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.28",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-64-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
index 2fb5d47772d617ab9be2a8700488878016ad894a..66c0f644500c7203cb7f936b3b749c3d0e48681b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.29",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-65-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.29",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-65-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.29",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-65.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.29",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-65-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
index 00c2eb1cba559415e19e8e98ec315f6ef3177599..bb5702d093f19a20c262928e3ac158a99c7d4d15 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.30",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-66-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.30",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-66-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.30",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-66.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.30",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-66-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
index d41f36d699f1d544fa7cb37261c01f0b8c9e85e9..2352523040805fcccb5d105a9796de38f624f34e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.31",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-67-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.31",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-67-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.31",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-67.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.31",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-67-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
index afd4372549c65245305e497ebcca2c430e8811d6..25f9d2f03cdc7353c278ba3b05be2bc30c4431a2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.32",
+      "mac": "00:11:25:91:48:9E",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-68-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.32",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-68-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.32",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:18",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-68.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.32",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-68-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
index 6a9dfc1d067540b169412cae8bbf27ce930ee890..355d5455017aa8cb8bf8ef7fe25294e987d9803c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.33",
+      "mac": "00:11:25:91:47:B3",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-69-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.33",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-69-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.33",
-      "mac": null,
+      "mac": "00:11:25:C4:34:82",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-69.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.33",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-69-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
index ab87f60fae53438f9d48a15b58f9fb7b9ff0a593..bc6b6c14db08a51586c693a61bbcda2901f4d9b4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.7",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-7-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.7",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-7-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.7",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-7.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.7",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-7-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
index ec07c7ec035b64421928a572390b97b6ec1a52c3..10d9146250a6a98b9f21dace8644cf2c930745e1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.34",
+      "mac": "00:11:25:91:46:77",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-70-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.34",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-70-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.34",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-70.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.34",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-70-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
index 2f49dca749992372e38df801553fe59f390ce720..f7e6be5a823558f01786b489a55959cf104a3dd5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.35",
+      "mac": "00:11:25:91:49:1F",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-71-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear02.orsay.grid5000.fr",
+      "switch_console": "mrv02.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.202",
+      "switch_console_mac": "00:a0:9c:00:16:41",
+      "switch_ip": "172.26.120.152",
+      "switch_mac": "00:22:3f:e6:f8:ce",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.35",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-71-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.35",
-      "mac": "00:11:25:c4:35:78",
+      "mac": "00:11:25:C4:35:78",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-71.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch08.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.108",
+      "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.35",
-      "mac": "00:11:25:c4:35:79",
+      "mac": "00:11:25:C4:35:79",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-71-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
index db8b334de06daa8e6b597f7e3a3f090d76822926..96032abc133601d2eb653294068e76d0f067ea8a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.133.36",
+      "mac": "00:11:25:91:46:3D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-72-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.73.36",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-72-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.36",
-      "mac": null,
+      "mac": "00:11:25:C4:3E:3C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-72.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.133.36",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-72-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
index 0b61bc63653587360f1f2f61f4880726b51bf183..1797ed72562f0c9b3cc0b1750d3c92a350793585 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.1",
+      "mac": "00:11:25:91:46:80",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-73-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.1",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-73-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.1",
-      "mac": "00:11:25:c4:35:9e",
+      "mac": "00:11:25:C4:35:9E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-73.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.1",
-      "mac": "00:11:25:c4:35:9f",
+      "mac": "00:11:25:C4:35:9F",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-73-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
index 4a44b21f4eadb8fadd7f3eca97fe3dd45c7b0a30..0625546ad4406c5c01993525d4ac72d54ffeaeb1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.2",
+      "mac": "00:11:25:91:48:46",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-74-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.2",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-74-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.2",
-      "mac": "00:11:25:c4:2d:0a",
+      "mac": "00:11:25:C4:2D:0A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-74.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.2",
-      "mac": "00:11:25:c4:2d:0b",
+      "mac": "00:11:25:C4:2D:0B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-74-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
index 7d67c9cfb2fadd74bd75044aaea6f4ae71ec4255..c7ad335fdfdbff575658c1a0c6dde244b14c9d31 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.3",
+      "mac": "00:11:25:91:49:00",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-75-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-75-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.3",
-      "mac": "00:11:25:c4:39:ae",
+      "mac": "00:11:25:C4:39:AE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-75.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.3",
-      "mac": "00:11:25:c4:39:af",
+      "mac": "00:11:25:C4:39:AF",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-75-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
index 12dc49575da2c4224e725254c1988c61fdcbe5d1..c0c2a0c689aaad35a2d9189781d779f2dbfbbd69 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.4",
+      "mac": "00:11:25:91:49:37",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-76-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.4",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-76-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.4",
-      "mac": "00:11:25:c4:2b:2c",
+      "mac": "00:11:25:C4:2B:2C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-76.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.4",
-      "mac": "00:11:25:c4:2b:2d",
+      "mac": "00:11:25:C4:2B:2D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-76-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
index 7ecb925084b3cb9db530802839ea34ce11a3b900..898d00c8e46665f2173c6025548d563f0aa62631 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.5",
+      "mac": "00:11:25:91:46:46",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-77-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.5",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-77-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.5",
-      "mac": "00:11:25:c4:38:94",
+      "mac": "00:11:25:C4:38:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-77.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.5",
-      "mac": "00:11:25:c4:38:95",
+      "mac": "00:11:25:C4:38:95",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-77-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
index 7af362ded961f6d828f06d83e29cd49321220329..709b258047dedbbf4c01c66c3a06c9b362126cb3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.6",
+      "mac": "00:11:25:91:47:F1",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-78-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.6",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-78-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.6",
-      "mac": "00:11:25:c4:26:56",
+      "mac": "00:11:25:C4:26:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-78.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.6",
-      "mac": "00:11:25:c4:26:57",
+      "mac": "00:11:25:C4:26:57",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-78-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
index 5d429fccb409165ce61b8c3917416af3986b2f0c..901f2d9c1c218dc3705fa55eeaf98d464f895a24 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.7",
+      "mac": "00:11:25:91:48:4D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-79-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.7",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-79-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.7",
-      "mac": "00:11:25:c4:35:76",
+      "mac": "00:11:25:C4:35:76",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-79.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.7",
-      "mac": "00:11:25:c4:35:77",
+      "mac": "00:11:25:C4:35:77",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-79-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
index cf5d50117c599881d6f38804fa2c7edc40dfc704..f779bdc553ffd1d2d8f92f6ba4f1042c265e195a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.8",
+      "mac": "00:11:25:91:46:3F",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-8-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.8",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-8-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.8",
-      "mac": null,
+      "mac": "00:11:25:C4:35:C2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-8.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.8",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-8-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
index b91284735602ed2440f00b4c60438d1b90435e09..ec8e642d8960ad50a2cf64345d9bdabfffd17d08 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.8",
+      "mac": "00:11:25:91:45:A3",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-80-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.8",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-80-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.8",
-      "mac": "00:11:25:c4:3a:be",
+      "mac": "00:11:25:C4:3A:BE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-80.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.8",
-      "mac": "00:11:25:c4:3a:bf",
+      "mac": "00:11:25:C4:3A:BF",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-80-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
index 0acf214aaafcc0084dc39ab4bab34edbeee2600d..ba4efaaeb5eb3cb5f3d012d1982e4a162663cc32 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.9",
+      "mac": "00:11:25:91:46:0A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-81-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.9",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-81-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.9",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-81.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.9",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-81-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
index 459705d4eebe51df4a236bf94bab5e73911b2643..de2fc209e42dfde231bcb0e9894eefb7555b3fb9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.10",
+      "mac": "00:11:25:91:45:D5",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-82-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.10",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-82-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.10",
-      "mac": "00:11:25:c4:24:04",
+      "mac": "00:11:25:C4:24:04",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-82.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.10",
-      "mac": "00:11:25:c4:24:05",
+      "mac": "00:11:25:C4:24:05",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-82-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
index 603b0d45fe0e73dba5e6d618b0cc090a1c16a35d..3da11d03ee93dbb93fc3d73eba829530fe282835 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.11",
+      "mac": "00:11:25:91:46:03",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-83-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.11",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-83-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.11",
-      "mac": "00:11:25:c4:26:8a",
+      "mac": "00:11:25:C4:26:8A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-83.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.11",
-      "mac": "00:11:25:c4:26:8b",
+      "mac": "00:11:25:C4:26:8B",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-83-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
index 9a357bec43dfaab8e8fa46d702a39d9bb81705cb..c3d2b4e3078c5683e77db1b740533f7368276afa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.134.12",
+      "mac": "00:11:25:91:46:1A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-84-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.74.12",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-84-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.12",
-      "mac": "00:11:25:c4:3a:86",
+      "mac": "00:11:25:C4:3A:86",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-84.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.134.12",
-      "mac": "00:11:25:c4:3a:87",
+      "mac": "00:11:25:C4:3A:87",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-84-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
index 993aa35ff2b05ef636f44696cf7d910788968cb6..43d1fad4845e04fd4f05d27751a3978fb416e591 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.13",
+      "mac": "00:11:25:91:48:93",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-85-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.13",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-85-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.13",
-      "mac": "00:11:25:c4:3b:44",
+      "mac": "00:11:25:C4:3B:44",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-85.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.13",
-      "mac": "00:11:25:c4:3b:45",
+      "mac": "00:11:25:C4:3B:45",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-85-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
index 103ed8c5f17e278569f3202738237939c3bb6c69..7593287e89a8bf1b720ca9db4ac1439d37d490c6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.14",
+      "mac": "00:11:25:91:49:47",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-86-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.14",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-86-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.14",
-      "mac": "00:11:25:c4:26:4c",
+      "mac": "00:11:25:C4:26:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-86.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.14",
-      "mac": "00:11:25:c4:26:4d",
+      "mac": "00:11:25:C4:26:4D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-86-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
index e4d87560033b847351286109e047a237c3623d73..d258f0f5c8610272c87b91f84012388621aa3624 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.15",
+      "mac": "00:11:25:91:48:B4",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-87-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.15",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-87-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.15",
-      "mac": "00:11:25:c4:4d:f4",
+      "mac": "00:11:25:C4:4D:F4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-87.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.15",
-      "mac": "00:11:25:c4:4d:f5",
+      "mac": "00:11:25:C4:4D:F5",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-87-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
index 2de761c221837a6019471d1ff105118dcc7daacd..c002d6af3ba12aa03602fabe63738e31de6dc23e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.16",
+      "mac": "00:11:25:91:46:3A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-88-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.16",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-88-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.16",
-      "mac": "00:11:25:c4:4e:28",
+      "mac": "00:11:25:C4:4E:28",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-88.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.16",
-      "mac": "00:11:25:c4:4e:29",
+      "mac": "00:11:25:C4:4E:29",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-88-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
index 8b4638bba1495ca9f4bb4dc074d9bd49ab3cb5ae..1f99079d106ac5746e3a91de9131c180249c8364 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.17",
+      "mac": "00:11:25:91:45:CE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-89-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.17",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-89-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.17",
-      "mac": "00:11:25:c4:4e:5c",
+      "mac": "00:11:25:C4:4E:5C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-89.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch06.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.106",
+      "switch_mac": "00:24:f9:3e:e7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.17",
-      "mac": "00:11:25:c4:4e:5d",
+      "mac": "00:11:25:C4:4E:5D",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-89-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
index 9b66ca49ee2eb645264ea4dc46388677d10e7f4f..eb900a94761faf14932e62bc0d2df98e15b0831e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.128.9",
+      "mac": "00:11:25:91:48:AC",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-9-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear01.orsay.grid5000.fr",
+      "switch_console": "mrv01.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.201",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.151",
+      "switch_mac": "00:0f:b5:fc:0d:26",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.68.9",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-9-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.9",
-      "mac": null,
+      "mac": "00:11:25:C4:34:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-9.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch11.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.111",
+      "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.128.9",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-9-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
index cab100edc30be95616cc9e60e47c3883234a2109..f4c1b749afffd7aa661f67ea1ca7e05b4d141e2b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.18",
+      "mac": "00:11:25:91:49:5A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-90-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.18",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-90-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.18",
-      "mac": "00:11:25:c4:51:02",
+      "mac": "00:11:25:C4:51:02",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-90.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.18",
-      "mac": "00:11:25:c4:51:03",
+      "mac": "00:11:25:C4:51:03",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-90-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
index 3c430469c85589ed36ba6865f208edaa7b74506e..4a45222f1da406a83bc11e4c883319c405d5c2cd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.19",
+      "mac": "00:11:25:91:46:1C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-91-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.19",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-91-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.19",
-      "mac": null,
+      "mac": "00:11:25:C4:51:4C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-91.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.19",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-91-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
index 4a970c6409f0108451b019ac725a1a2500d27b93..c711c845469aaf2869a6ac57a15a3b0e773a095a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.20",
+      "mac": "nil",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-92-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.20",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-92-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.20",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-92.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.20",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-92-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
index f1be1549b7388c77b56ae5a81beb19302754fa6e..ce3b81e98ef914ce1873c0590d637e94613a9cdc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.21",
+      "mac": "00:11:25:91:48:2F",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-93-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.21",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-93-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.21",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:A6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-93.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.21",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-93-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
index a03800b76b1f03ef5cf9808fc19dbf7f373c2792..9a671aee1a35edbe9dcb00fb48c24a286731b4d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.22",
+      "mac": "00:11:25:91:48:05",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-94-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.22",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-94-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.22",
-      "mac": null,
+      "mac": "00:11:25:C4:53:FC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-94.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.22",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-94-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
index 7c5e4ad1a096a7c6c3ad5c2dee678ebc36097651..a4ba31d779f8a73709443bafb3887f139d9fa440 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.23",
+      "mac": "00:11:25:91:45:F7",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-95-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.23",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-95-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.23",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:30",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-95.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.23",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-95-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
index ca84fd4040c9df4b79a142e1cd6381a72e97d7df..885ec8aa263094fc12f937c5d12a997e2b5ef092 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.135.24",
+      "mac": "00:11:25:91:45:EE",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-96-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.75.24",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-96-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.24",
-      "mac": null,
+      "mac": "00:11:25:C4:50:A6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-96.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.135.24",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-96-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
index 611b47d33f2a830669bd7a6cf7432862602112c3..eb45088abc77ef9b56c7a89409c24517ed7f9b38 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.25",
+      "mac": "00:11:25:91:45:7A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-97-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.25",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-97-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.25",
-      "mac": null,
+      "mac": "nil",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-97.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.25",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-97-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
index f9d4ba26161ce52129320910e66d2c27921ab782..e2c0b244ee268724ca0f8063a9eb9b2ce98a1b73 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.26",
+      "mac": "00:11:25:91:47:BB",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-98-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.26",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-98-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.26",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:1A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-98.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.26",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-98-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
index 05eeb8ef54fc1720ed4b25a39748836519bf432f..953834b08b6ac1fb76c63e230f01a476d363e128 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
@@ -9,9 +9,29 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.136.27",
+      "mac": "00:11:25:91:45:C2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "gdx-99-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgear03.orsay.grid5000.fr",
+      "switch_console": "mrv03.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.203",
+      "switch_console_mac": "00:a0:9c:00:12:dd",
+      "switch_ip": "172.26.120.153",
+      "switch_mac": "00:0f:b5:fb:70:89",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "myri0",
-      "driver": null,
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.24.76.27",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "gdx-99-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
+      "switch": "switch-mx.orsay.grid5000.fr",
+      "switch_ip": "1.1.1.1",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.27",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:3E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-99.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch05.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.105",
+      "switch_mac": 155681622,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.136.27",
-      "mac": null,
+      "mac": "nil",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "network_address": "gdx-99-eth1.orsay.grid5000.fr",
-      "rate": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
index c29d8622c382e9735de151dc97bcd4147a4e7d64..b00e716a1a73c8a7af9a89b3b5e87870e182904c 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.1",
+      "mac": "00:11:25:91:48:1E",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-1-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.1",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.1",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:63",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-1-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.1",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-1-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
index d841c92cbd12c2acf4e9af670635bf8339f00ec7..b714724dc5f8529935b1422ed531f70fced77291 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.10",
+      "mac": "00:11:25:91:48:4C",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-10-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.10",
-      "mac": null,
+      "mac": "00:11:25:c4:28:42",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-10.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.10",
-      "mac": null,
+      "mac": "00:11:25:c4:28:43",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-10-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.10",
-      "mac": null,
+      "mac": "00:11:25:c4:28:42",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-10-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
index 6a1eaf30be8ef63725fccda90b6d848c305281b8..431faa15f601b45f06f3368a642942c03e879a36 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.11",
+      "mac": "00:11:25:91:45:A4",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-11-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.11",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-11.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.11",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:57",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-11-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.11",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:56",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-11-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
index 96ce35fa25deadbe54883bae527d38bcb3d5ad25..1b0679dda4d441e346fedd35bf633eec6f62ab21 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.12",
+      "mac": "00:11:25:91:45:C0",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-12-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.12",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:ea",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-12.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.12",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:eb",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-12-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.12",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:ea",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-12-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
index e715e0f0170b5afa973e33f341363c971886f566..58f76ca477caefff80080084d337e707e1eaf82d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.13",
+      "mac": "00:11:25:91:45:86",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-13-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.13",
-      "mac": null,
+      "mac": "00:11:25:c4:52:b6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-13.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.13",
-      "mac": null,
+      "mac": "00:11:25:c4:52:b7",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-13-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.13",
-      "mac": null,
+      "mac": "00:11:25:c4:52:b6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-13-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
index 9ee47a96d0f2630a7ae461dc32260993be1e0562..c0d0fee21f0362771424d2fce84734cf7196defd 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.14",
+      "mac": "00:11:25:91:48:E0",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-14-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.14",
-      "mac": null,
+      "mac": "00:11:25:c4:52:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-14.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.14",
-      "mac": null,
+      "mac": "00:11:25:c4:52:63",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-14-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.14",
-      "mac": null,
+      "mac": "00:11:25:c4:52:62",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-14-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
index 38daf3b922f0f72914c3a2ac40613a101cec09ed..edb5e7443b9c7e4982f2fda0ef2d9a68c92daf52 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.15",
+      "mac": "00:11:25:91:49:51",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-15-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.15",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:76",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-15.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.15",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:77",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-15-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.15",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:76",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-15-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
index e901978804a84f649f3ea2d8c6ebdb4832c15903..8380fc5c5bf2cc7302b8103064f15281aef0396d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.16",
+      "mac": "00:11:25:91:48:F6",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-16-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.16",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-16.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.16",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:49",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-16-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.16",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-16-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
index c97faf48e71ef6b00dd0caf00d0c32eb62a3ad6a..142d04d5b32f9dcfb13780988bf0f619940bb5e1 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.17",
+      "mac": "00:11:25:91:48:3E",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-17-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.17",
-      "mac": null,
+      "mac": "00:11:25:c4:42:e0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-17.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.17",
-      "mac": null,
+      "mac": "00:11:25:c4:42:e1",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-17-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.17",
-      "mac": null,
+      "mac": "00:11:25:c4:42:e0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-17-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
index 00260b3935944f725accfbccbee2935fe954f278..b0a3c1aecb2489a3b90a58f1036a191d7b4e3a25 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.18",
+      "mac": "00:11:25:91:47:B7",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-18-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.18",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:c6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-18.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.18",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:c7",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-18-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.18",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:c6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-18-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
index dfe79f256c14a39420a356fa1470f26060681a5c..48c6ffb7f7288f8eca5bab1558749bc82db82024 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.19",
+      "mac": "00:11:25:91:46:65",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-19-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.19",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:8a",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-19.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.19",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:8b",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-19-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.19",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:8a",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-19-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
index 0e9e277bb087a502efb1b9dce81521c6fcc69f07..15e0363cda2b0d75b5d9392ccf6641ad432b9f42 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.2",
+      "mac": "00:11:25:91:47:B2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-2-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.2",
-      "mac": null,
+      "mac": "00:11:25:c4:52:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.2",
-      "mac": null,
+      "mac": "00:11:25:c4:52:bd",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-2-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.2",
-      "mac": null,
+      "mac": "00:11:25:c4:52:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-2-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
index c94e690f2c544464dc57fabed0d92d4c3e378916..0010658785372aa21e3d610ab9a432bf5c239c8d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.20",
+      "mac": "00:11:25:91:47:7E",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-20-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.20",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:7c",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-20.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.20",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:7d",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-20-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.20",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:7c",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-20-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
index c62c2ccb74c0c18b855ef60bb76a09999f8d9efc..220bd2e38e6d29c75b7d77ea8e7858eb47df5325 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.21",
+      "mac": "00:11:25:91:47:A5",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-21-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.21",
-      "mac": null,
+      "mac": "00:11:25:c4:50:2e",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-21.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.21",
-      "mac": null,
+      "mac": "00:11:25:c4:50:2f",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-21-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.21",
-      "mac": null,
+      "mac": "00:11:25:c4:50:2e",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-21-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
index dbe2f2e5dc80a0cb9c82b201f176f363cce49187..403ef0e27191ab1298d437f14c7496b83ad9dcc2 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.22",
+      "mac": "00:11:25:91:46:5F",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-22-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.22",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:7e",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-22.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.22",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:7f",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-22-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.22",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:7e",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-22-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
index 475203cd3a2d2be91279f89020d91041a5c501b9..3a16eed78b3f4e07069b1d6ffe54836eb482c252 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.23",
+      "mac": "00:11:25:91:46:68",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-23-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.23",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:fe",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-23.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.23",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:ff",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-23-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.23",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:fe",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-23-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
index 1c75a95d53fefe225ae7b799b40700af3a17b96c..87c452111f7642cd630a5dd1275c95532e7407b0 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.24",
+      "mac": "00:11:25:91:46:A2",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-24-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.24",
-      "mac": null,
+      "mac": "00:11:25:c4:54:8a",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-24.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.24",
-      "mac": null,
+      "mac": "00:11:25:c4:54:8b",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-24-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.24",
-      "mac": null,
+      "mac": "00:11:25:c4:54:8a",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-24-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
index a7711abccf543f9b3cd54b0925929e1d73c800f6..6f5cb8106a6dba6c322cc430a9638625fd08224c 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.25",
+      "mac": "00:11:25:91:46:4B",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-25-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.25",
-      "mac": null,
+      "mac": "00:11:25:c4:52:68",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-25.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.25",
-      "mac": null,
+      "mac": "00:11:25:c4:52:69",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-25-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.25",
-      "mac": null,
+      "mac": "00:11:25:c4:52:68",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-25-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
index b8081424e485f10709357b73500022ffc2c27ea9..37a85de32a953436d51a037b33f088aed80a0faa 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.26",
+      "mac": "00:11:25:91:48:ED",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-26-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.26",
-      "mac": null,
+      "mac": "00:11:25:c4:52:ba",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-26.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.26",
-      "mac": null,
+      "mac": "00:11:25:c4:52:bb",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-26-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.26",
-      "mac": null,
+      "mac": "00:11:25:c4:52:ba",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-26-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
index d8f055b78f820dcc0af83f8714e12d974c9bad1f..f03e4698677b955ec99d62c007ebe6618d723a50 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
@@ -9,6 +9,26 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.27",
+      "mac": null,
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-27-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "netgdx-27.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -37,7 +59,9 @@
       "mounted": true,
       "network_address": "netgdx-27-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,15 +77,18 @@
       "mounted": true,
       "network_address": "netgdx-27-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
index 91a89857e0997ed1d5cce03361132d60ad3a136d..5dfbf23064f3a787ec46324f33590ff665d556d6 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.28",
+      "mac": "00:11:25:91:47:48",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-28-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.28",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:28",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-28.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.28",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:29",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-28-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.28",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:28",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-28-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
index 8f16a74fa631e25660c0f9912d71b5a782d62199..f93bb272de249b21d3233545c8639ad0f4548ada 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.29",
+      "mac": "00:11:25:91:45:F3",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-29-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.29",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:9e",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-29.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.29",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:9f",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-29-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.29",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:9e",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-29-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
index 1940a9156b937a574508704f473042c14d4aaada..be8ae04914306cee209abbad387a9464eb741dc1 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.3",
+      "mac": "00:11:25:91:45:CB",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-3-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.3",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:66",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-3.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.3",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:67",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-3-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.3",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:66",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-3-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
index 904f0b8e395a8c0ed6206598c7e4de639af0171a..a2877d4a869be6f65ce40d9cba8af3d5fc7891d7 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.30",
+      "mac": "00:11:25:91:49:2D",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-30-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.30",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:38",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-30.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.30",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:39",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-30-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.30",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:38",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-30-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
index bba32e7ba4e1582bc7f272d8a82eefd58baec2f5..a5b8e0dc4924fff4c45fbe3de191c3d0e6b8cc08 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.4",
+      "mac": "00:11:25:91:47:BA",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-4-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.4",
-      "mac": null,
+      "mac": "00:11:25:c4:50:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-4.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.4",
-      "mac": null,
+      "mac": "00:11:25:c4:50:95",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-4-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.4",
-      "mac": null,
+      "mac": "00:11:25:c4:50:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-4-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
index 15f9c06b9b933153e640de6f0c25c859d85907b0..4568b6a3172eb02fd88ae5f173825cc79bf4e947 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.5",
+      "mac": "00:11:25:91:47:83",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-5-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.5",
-      "mac": null,
+      "mac": "00:11:25:c4:50:90",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-5.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.5",
-      "mac": null,
+      "mac": "00:11:25:c4:50:91",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-5-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.5",
-      "mac": null,
+      "mac": "00:11:25:c4:50:90",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-5-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
index af3adf5e9f552867337b01c06f05404307a23beb..7e699192318b6fd19f0e39ce3e5e343f51426e67 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
@@ -9,6 +9,26 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.6",
+      "mac": null,
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-6-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
@@ -21,7 +41,9 @@
       "mounted": true,
       "network_address": "netgdx-6.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -37,7 +59,9 @@
       "mounted": true,
       "network_address": "netgdx-6-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -53,15 +77,18 @@
       "mounted": true,
       "network_address": "netgdx-6-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
index 95c2ce52e8783bb524b5e25f2818e7c4355fa51c..67b267a33cb6ab5362322271b42211ebcb209d40 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.7",
+      "mac": "00:11:25:91:48:4A",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-7-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.7",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:60",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-7.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.7",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:61",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-7-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.7",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:60",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-7-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
index 1822a63f91ab6e5b86cbf92a3bdf6e5d4cfd2bfd..c0c4b58e3a9fc48fd5e8686e383ad7b7b06b9ec1 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.8",
+      "mac": "00:11:25:91:45:95",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-8-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.8",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:d4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-8.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.8",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:d5",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-8-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.8",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:d4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-8-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
index 96451cb1751d0739179edf1ff29c90c69911b70d..277fdb17cd029212192a62c7dfbd7960bde7bced 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
@@ -9,19 +9,41 @@
     "virtual_size": null
   },
   "network_adapters": [
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.26.240.9",
+      "mac": "00:11:25:91:45:E6",
+      "management": true,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "netgdx-9-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "netgearxy.orsay.grid5000.fr",
+      "switch_console": "mrv00.orsay.grid5000.fr",
+      "switch_console_ip": "172.26.120.200",
+      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "172.26.120.150",
+      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "vendor": "Broadcom",
+      "version": "NetXtreme BCM5780"
+    },
     {
       "device": "eth0",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.110.9",
-      "mac": null,
+      "mac": "00:11:25:c4:54:5c",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-9.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -31,13 +53,15 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.240.9",
-      "mac": null,
+      "mac": "00:11:25:c4:54:5d",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-9-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -47,21 +71,24 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.190.9",
-      "mac": null,
+      "mac": "00:11:25:c4:54:5c",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "netgdx-9-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "gw.orsay.grid5000.fr",
+      "switch_ip": "172.24.120.10",
+      "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5703"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,7 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "sata_svw",
       "interface": "SATA",
       "size": 74505805969.2383
     }
diff --git a/generators/input/orsay-gdx.rb b/generators/input/orsay-gdx.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9b9494eae5e72e8ac41407780a66b486dab37da5
--- /dev/null
+++ b/generators/input/orsay-gdx.rb
@@ -0,0 +1,133 @@
+require 'net/ssh'
+site :orsay do |site_uid|
+  ssh = Net::SSH.start("frontend.#{site_uid}.grid5000.fr","g5kadmin")
+  
+  cluster :gdx do |cluster_uid|
+    model "IBM eServer 326m"
+    created_at nil
+    misc "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00"
+    
+    # WARN: 2 nodes are missing (gdx-311 and gdx-312) and won't appear in the reference
+    1.upto(180+132-2) do |i|
+      node "#{cluster_uid}-#{i}" do |node_uid|
+        rack_uid = node_uid.split("-")[1].to_i / 18
+    
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
+        architecture({
+          :smp_size => 2, 
+          :smt_size => 2,
+          :platform_type => "x86_64"
+          })
+        processor({
+          :vendor => "AMD",
+          :model => "AMD Opteron",
+          :version => "246",
+          :clock_speed => 2.G,
+          :instruction_set => "",
+          :other_description => "",
+          :cache_l1 => nil,
+          :cache_l1i => nil,
+          :cache_l1d => nil,
+          :cache_l2 => 1.MiB
+        })
+        main_memory({
+          :ram_size => 2.GiB, # bytes
+          :virtual_size => nil
+        })
+        operating_system({
+          :name => "debian-x64-5-prod",
+          :release => "5.1.2",
+          :version => "5",
+          :kernel   => "2.6.26"
+        })
+        storage_devices [
+          {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
+          ]
+        network_adapters [{
+            :interface => 'Ethernet',
+            :device => 'bmc',
+            :rate => (eval lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'rate')),
+            :mac => lookup('orsay-gdx', "#{node_uid}", 'mac_bmc'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => true,
+            :mountable => true,
+            :mounted => true,
+            :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup_through_ssh(ssh,"#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
+            :switch => (lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'name')+".#{site_uid}.grid5000.fr"),
+            :switch_ip => lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'ip'),
+            :switch_mac => lookup('orsay-network', "switch-bmc-#{rack_uid/2}", 'mac'),
+            :switch_console => (lookup('orsay-network', "switch-rsa-#{rack_uid/2}", 'name')+".#{site_uid}.grid5000.fr"),
+            :switch_console_ip => lookup('orsay-network', "switch-rsa-#{rack_uid/2}", 'ip'),
+            :switch_console_mac => lookup('orsay-network', "switch-rsa-#{rack_uid/2}", 'mac'),
+          },{
+            :interface => 'Myrinet',
+            :device => 'myri0',
+            :rate => (eval lookup('orsay-network', "switch-mx", 'rate')),
+            :mac => lookup('orsay-gdx', "#{node_uid}", 'mac_mx'),
+            :vendor => 'Myrinet',
+            :version => '10G-PCIE-8A-C',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => "mx_driver",
+            :mounted => true,
+            :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup_through_ssh(ssh,"#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
+            :switch => (lookup('orsay-network', "switch-mx", 'name')+".#{site_uid}.grid5000.fr"),
+            :switch_ip => lookup('orsay-network', "switch-mx", 'ip'),
+            :switch_mac => lookup('orsay-network', "switch-mx", 'mac')
+          },{
+            :interface => 'Ethernet',
+            :device => 'eth0',
+            :rate => (eval lookup('orsay-network', "switch-eth0-#{rack_uid}", 'rate')),
+            :mac => lookup('orsay-gdx', "#{node_uid}", 'mac_eth0'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true,
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup_through_ssh(ssh,"#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => (lookup('orsay-network', "switch-eth0-#{rack_uid}", 'name')+".#{site_uid}.grid5000.fr"),
+            :switch_ip => lookup('orsay-network', "switch-eth0-#{rack_uid}", 'ip'),
+            :switch_mac => lookup('orsay-network', "switch-eth0-#{rack_uid}", 'mac'),
+          },{
+            :interface => 'Ethernet',
+            :device => 'eth1',
+            :rate => 0,
+            :mac => lookup('orsay-gdx', "#{node_uid}", 'mac_eth1'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => false,
+            :management => false,
+            :mountable => false,
+            :driver => 'tg3',
+            :mounted => false,
+            :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup_through_ssh(ssh,"#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
+            :switch => nil,
+            :switch_ip => nil,
+            :switch_mac => nil
+          }]
+      end        
+    end
+    
+    # extension specifics, starting at node 181
+    (181).upto(312-2) do |i|
+      node "#{cluster_uid}-#{i}" do
+        processor({
+          :version => "250",
+          :clock_speed => 2.4.G
+        })
+      end
+    end
+    
+  end # cluster gdx
+  
+  ssh.close
+end
diff --git a/generators/input/orsay-gdx.yaml b/generators/input/orsay-gdx.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a31d5ee43141f57be6ed9381df9e1a8e528a1bbb
--- /dev/null
+++ b/generators/input/orsay-gdx.yaml
@@ -0,0 +1,1551 @@
+--- 
+gdx-9: 
+  mac_eth0: 00:11:25:C4:34:6A
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:AC
+gdx-28: 
+  mac_myri0: 00:60:DD:47:5A:B6
+  mac_eth0: 00:11:25:C4:34:6E
+  mac_eth1: 00:11:25:C4:34:6F
+  mac_bmc: 00:11:25:91:49:01
+gdx-54: 
+  mac_myri0: 00:60:DD:47:5A:84
+  mac_eth0: 00:11:25:C4:35:BC
+  mac_eth1: 00:11:25:C4:35:BD
+  mac_bmc: 00:11:25:91:45:93
+gdx-80: 
+  mac_myri0: 00:60:DD:47:67:95
+  mac_eth0: 00:11:25:C4:3A:BE
+  mac_eth1: 00:11:25:C4:3A:BF
+  mac_bmc: 00:11:25:91:45:A3
+gdx-105: 
+  mac_myri0: 00:60:DD:47:68:4A
+  mac_eth0: 00:11:25:C4:4F:0A
+  mac_eth1: 00:11:25:C4:4F:0B
+  mac_bmc: 00:11:25:91:49:14
+gdx-132: 
+  mac_myri0: 00:60:DD:47:5A:BF
+  mac_eth0: 00:11:25:C4:4E:58
+  mac_eth1: 00:11:25:C4:4E:59
+  mac_bmc: 00:11:25:91:47:E3
+gdx-212: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-29: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-55: 
+  mac_myri0: 00:60:DD:47:59:6F
+  mac_eth0: 00:11:25:C4:3B:BC
+  mac_eth1: 00:11:25:C4:3B:BD
+  mac_bmc: 00:11:25:91:49:0B
+gdx-81: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:0A
+gdx-106: 
+  mac_myri0: 00:60:DD:47:67:88
+  mac_eth0: 00:11:25:C4:4E:C2
+  mac_eth1: 00:11:25:C4:4E:C3
+  mac_bmc: 00:11:25:91:47:6A
+gdx-133: 
+  mac_myri0: 00:60:DD:47:59:B7
+  mac_eth0: 00:11:25:C4:4E:82
+  mac_eth1: 00:11:25:C4:4E:83
+  mac_bmc: 00:11:25:91:47:93
+gdx-213: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-240: 
+  mac_myri0: 00:60:DD:47:7D:7C
+  mac_eth0: 00:11:25:C4:3E:34
+  mac_eth1: 00:11:25:C4:3E:35
+  mac_bmc: 00:11:25:91:46:09
+gdx-56: 
+  mac_myri0: 00:60:DD:47:59:40
+  mac_eth0: 00:11:25:C4:3C:7C
+  mac_eth1: 00:11:25:C4:3C:7D
+  mac_bmc: 00:11:25:91:47:96
+gdx-82: 
+  mac_myri0: 00:60:DD:47:59:A0
+  mac_eth0: 00:11:25:C4:24:04
+  mac_eth1: 00:11:25:C4:24:05
+  mac_bmc: 00:11:25:91:45:D5
+gdx-107: 
+  mac_myri0: 00:60:DD:47:68:19
+  mac_eth0: 00:11:25:C4:4E:D2
+  mac_eth1: 00:11:25:C4:4E:D3
+  mac_bmc: 00:11:25:91:48:8A
+gdx-160: 
+  mac_myri0: 00:60:DD:47:59:03
+  mac_eth0: 00:11:25:C4:4F:3A
+  mac_eth1: 00:11:25:C4:4F:3B
+  mac_bmc: 00:11:25:91:46:8D
+gdx-214: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-241: 
+  mac_myri0: 00:60:DD:47:7C:D4
+  mac_eth0: 00:11:25:C4:3C:74
+  mac_eth1: 00:11:25:C4:3C:75
+  mac_bmc: 00:11:25:91:46:5D
+gdx-57: 
+  mac_myri0: 00:60:DD:47:88:43
+  mac_eth0: 00:11:25:C4:3C:24
+  mac_eth1: 00:11:25:C4:3C:25
+  mac_bmc: 00:11:25:91:49:50
+gdx-83: 
+  mac_myri0: 00:60:DD:47:5A:C8
+  mac_eth0: 00:11:25:C4:26:8A
+  mac_eth1: 00:11:25:C4:26:8B
+  mac_bmc: 00:11:25:91:46:03
+gdx-108: 
+  mac_myri0: 00:60:DD:47:68:12
+  mac_eth0: 00:11:25:C4:51:BC
+  mac_eth1: 00:11:25:C4:51:BD
+  mac_bmc: 00:11:25:91:47:DC
+gdx-134: 
+  mac_myri0: 00:60:DD:47:65:BE
+  mac_eth0: 00:11:25:C4:4F:4E
+  mac_eth1: 00:11:25:C4:4F:4F
+  mac_bmc: 00:11:25:91:48:1D
+gdx-161: 
+  mac_myri0: 00:60:DD:47:5A:72
+  mac_eth0: 00:11:25:C4:4F:8E
+  mac_eth1: 00:11:25:C4:4F:8F
+  mac_bmc: 00:11:25:91:48:B8
+gdx-215: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-242: 
+  mac_myri0: 00:60:DD:47:7C:C8
+  mac_eth0: 00:11:25:C4:2B:FC
+  mac_eth1: 00:11:25:C4:2B:FD
+  mac_bmc: 00:11:25:91:48:AD
+gdx-58: 
+  mac_myri0: 00:60:DD:47:68:42
+  mac_eth0: 00:11:25:C4:39:3E
+  mac_eth1: 00:11:25:C4:39:3F
+  mac_bmc: 00:11:25:91:46:51
+gdx-84: 
+  mac_myri0: 00:60:DD:47:65:A6
+  mac_eth0: 00:11:25:C4:3A:86
+  mac_eth1: 00:11:25:C4:3A:87
+  mac_bmc: 00:11:25:91:46:1A
+gdx-109: 
+  mac_eth0: 00:11:25:C4:53:22
+  mac_myri0: 00:60:DD:47:59:7E
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:F1
+gdx-135: 
+  mac_myri0: 00:60:DD:47:59:70
+  mac_eth0: 00:11:25:C4:53:E6
+  mac_eth1: 00:11:25:C4:53:E7
+  mac_bmc: 00:11:25:91:47:6B
+gdx-162: 
+  mac_myri0: 00:60:DD:47:5A:BA
+  mac_eth0: 00:11:25:C4:4E:B8
+  mac_eth1: 00:11:25:C4:4E:B9
+  mac_bmc: 00:11:25:91:45:FE
+gdx-216: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-243: 
+  mac_myri0: 00:60:DD:47:7C:07
+  mac_eth0: 00:11:25:C4:2B:58
+  mac_eth1: 00:11:25:C4:2B:59
+  mac_bmc: 00:11:25:91:46:7A
+gdx-59: 
+  mac_myri0: 00:60:DD:47:67:89
+  mac_eth0: 00:11:25:C4:2E:30
+  mac_eth1: 00:11:25:C4:2E:31
+  mac_bmc: 00:11:25:91:49:03
+gdx-85: 
+  mac_myri0: 00:60:DD:47:59:72
+  mac_eth0: 00:11:25:C4:3B:44
+  mac_eth1: 00:11:25:C4:3B:45
+  mac_bmc: 00:11:25:91:48:93
+gdx-136: 
+  mac_myri0: 00:60:DD:47:65:BD
+  mac_eth0: 00:11:25:C4:4D:40
+  mac_eth1: 00:11:25:C4:4D:41
+  mac_bmc: 00:11:25:91:48:A0
+gdx-163: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:34
+gdx-217: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-270: 
+  mac_myri0: 00:60:DD:47:89:C4
+  mac_eth0: 00:11:25:C4:35:48
+  mac_eth1: 00:11:25:C4:35:49
+  mac_bmc: 00:11:25:91:46:CF
+gdx-86: 
+  mac_myri0: 00:60:DD:47:59:6C
+  mac_eth0: 00:11:25:C4:26:4C
+  mac_eth1: 00:11:25:C4:26:4D
+  mac_bmc: 00:11:25:91:49:47
+gdx-137: 
+  mac_myri0: 00:60:DD:47:5A:A5
+  mac_eth0: 00:11:25:C4:4F:E2
+  mac_eth1: 00:11:25:C4:4F:E3
+  mac_bmc: 00:11:25:91:45:C6
+gdx-164: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:47:AE
+gdx-190: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-218: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-244: 
+  mac_myri0: 00:60:DD:47:89:07
+  mac_eth0: 00:11:25:C4:10:FA
+  mac_eth1: 00:11:25:C4:10:FB
+  mac_bmc: 00:11:25:91:46:A3
+gdx-271: 
+  mac_myri0: 00:60:DD:47:7C:CC
+  mac_eth0: 00:11:25:C4:31:92
+  mac_eth1: 00:11:25:C4:31:93
+  mac_bmc: 00:11:25:91:47:7D
+gdx-87: 
+  mac_myri0: 00:60:DD:47:68:81
+  mac_eth0: 00:11:25:C4:4D:F4
+  mac_eth1: 00:11:25:C4:4D:F5
+  mac_bmc: 00:11:25:91:48:B4
+gdx-138: 
+  mac_myri0: 00:60:DD:47:5A:76
+  mac_eth0: 00:11:25:C4:4D:4A
+  mac_eth1: 00:11:25:C4:4D:4B
+  mac_bmc: 00:11:25:91:46:22
+gdx-165: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:D0
+gdx-191: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-219: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-245: 
+  mac_myri0: 00:60:DD:47:7B:FE
+  mac_eth0: 00:11:25:C4:3A:4E
+  mac_eth1: 00:11:25:C4:3A:4F
+  mac_bmc: 00:11:25:91:47:EA
+gdx-272: 
+  mac_myri0: 00:60:DD:47:89:CE
+  mac_eth0: 00:11:25:C4:2F:20
+  mac_eth1: 00:11:25:C4:2F:21
+  mac_bmc: 00:11:25:91:48:15
+gdx-88: 
+  mac_myri0: 00:60:DD:47:67:93
+  mac_eth0: 00:11:25:C4:4E:28
+  mac_eth1: 00:11:25:C4:4E:29
+  mac_bmc: 00:11:25:91:46:3A
+gdx-139: 
+  mac_myri0: 00:60:DD:47:65:AA
+  mac_eth0: 00:11:25:C4:38:DE
+  mac_eth1: 00:11:25:C4:38:DF
+  mac_bmc: 00:11:25:91:45:CF
+gdx-166: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:47:5C
+gdx-192: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-246: 
+  mac_myri0: 00:60:DD:47:86:58
+  mac_eth0: 00:11:25:C4:38:E2
+  mac_eth1: 00:11:25:C4:38:E3
+  mac_bmc: 00:11:25:91:46:0E
+gdx-273: 
+  mac_myri0: 00:60:DD:47:89:C8
+  mac_eth0: 00:11:25:C4:32:EE
+  mac_eth1: 00:11:25:C4:32:EF
+  mac_bmc: 00:11:25:91:46:99
+gdx-89: 
+  mac_myri0: 00:60:DD:47:68:79
+  mac_eth0: 00:11:25:C4:4E:5C
+  mac_eth1: 00:11:25:C4:4E:5D
+  mac_bmc: 00:11:25:91:45:CE
+gdx-193: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-247: 
+  mac_myri0: 00:60:DD:47:7B:FD
+  mac_eth0: 00:11:25:C4:32:76
+  mac_eth1: 00:11:25:C4:32:77
+  mac_bmc: 00:11:25:91:48:F4
+gdx-274: 
+  mac_myri0: 00:60:DD:47:89:D2
+  mac_eth0: 00:11:25:C4:35:C0
+  mac_eth1: 00:11:25:C4:35:C1
+  mac_bmc: 00:11:25:91:45:C9
+gdx-167: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:9C
+gdx-194: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-248: 
+  mac_myri0: 00:60:DD:47:7B:FC
+  mac_eth0: 00:11:25:C4:31:FA
+  mac_eth1: 00:11:25:C4:31:FB
+  mac_bmc: 00:11:25:91:48:3B
+gdx-275: 
+  mac_myri0: 00:60:DD:47:89:90
+  mac_eth0: 00:11:25:C4:11:38
+  mac_eth1: 00:11:25:C4:11:39
+  mac_bmc: 00:11:25:91:45:F0
+gdx-168: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:49:17
+gdx-195: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-249: 
+  mac_myri0: 00:60:DD:47:88:62
+  mac_eth0: 00:11:25:C4:33:40
+  mac_eth1: 00:11:25:C4:33:41
+  mac_bmc: 00:11:25:91:45:E9
+gdx-276: 
+  mac_myri0: 00:60:DD:47:89:0D
+  mac_eth0: 00:11:25:C4:35:B6
+  mac_eth1: 00:11:25:C4:35:B7
+  mac_bmc: 00:09:6B:5E:FB:10
+gdx-169: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:F0
+gdx-196: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-197: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-277: 
+  mac_myri0: 00:60:DD:47:89:87
+  mac_eth0: 00:11:25:C4:34:58
+  mac_eth1: 00:11:25:C4:34:59
+  mac_bmc: 00:11:25:91:49:5E
+gdx-10: 
+  mac_myri0: 00:60:DD:47:59:65
+  mac_eth0: 00:11:25:C4:33:38
+  mac_eth1: 00:11:25:C4:33:39
+  mac_bmc: 00:11:25:91:47:58
+gdx-198: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-278: 
+  mac_myri0: 00:60:DD:47:C7:3E
+  mac_eth0: 00:11:25:C4:34:46
+  mac_eth1: 00:11:25:C4:34:47
+  mac_bmc: 00:11:25:91:47:6C
+gdx-11: 
+  mac_myri0: 00:60:DD:47:5A:53
+  mac_eth0: 00:11:25:C4:34:3E
+  mac_eth1: 00:11:25:C4:34:3F
+  mac_bmc: 00:11:25:91:48:EE
+gdx-199: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-279: 
+  mac_myri0: 00:60:DD:47:C7:FD
+  mac_eth0: 00:11:25:C4:33:96
+  mac_eth1: 00:11:25:C4:33:97
+  mac_bmc: 00:11:25:91:46:42
+gdx-12: 
+  mac_myri0: 00:60:DD:47:59:64
+  mac_eth0: 00:11:25:C4:35:42
+  mac_eth1: 00:11:25:C4:35:43
+  mac_bmc: 00:11:25:91:45:B8
+gdx-13: 
+  mac_myri0: 00:60:DD:47:5A:99
+  mac_eth0: 00:11:25:C4:34:48
+  mac_eth1: 00:11:25:C4:34:49
+  mac_bmc: 00:11:25:91:48:02
+gdx-14: 
+  mac_myri0: 00:60:DD:47:5A:5A
+  mac_eth0: 00:11:25:C4:34:3C
+  mac_eth1: 00:11:25:C4:34:3D
+  mac_bmc: 00:11:25:91:48:91
+gdx-40: 
+  mac_myri0: 00:60:DD:47:68:87
+  mac_eth0: 00:11:25:C4:33:66
+  mac_eth1: 00:11:25:C4:33:67
+  mac_bmc: 00:11:25:91:46:84
+gdx-15: 
+  mac_myri0: 00:60:DD:47:5A:58
+  mac_eth0: 00:11:25:C4:35:9B
+  mac_eth1: 00:11:25:C4:35:9C
+  mac_bmc: 00:11:25:91:48:A2
+gdx-41: 
+  mac_myri0: 00:60:DD:47:59:04
+  mac_eth0: 00:11:25:C4:34:86
+  mac_eth1: 00:11:25:C4:34:87
+  mac_bmc: 00:11:25:91:45:AB
+gdx-200: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-16: 
+  mac_myri0: 00:60:DD:47:68:85
+  mac_eth0: 00:11:25:C4:2E:CE
+  mac_eth1: 00:11:25:C4:2E:CF
+  mac_bmc: 00:11:25:91:45:8E
+gdx-42: 
+  mac_myri0: 00:60:DD:47:67:94
+  mac_eth0: 00:11:25:C4:2B:F0
+  mac_eth1: 00:11:25:C4:2B:F1
+  mac_bmc: 00:11:25:91:49:2C
+gdx-120: 
+  mac_eth0: 00:11:25:C4:4F:D2
+  mac_myri0: 00:60:DD:47:5A:94
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:19
+gdx-201: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-17: 
+  mac_myri0: 00:60:DD:47:63:85
+  mac_eth0: 00:11:25:C4:34:56
+  mac_eth1: 00:11:25:C4:34:57
+  mac_bmc: 00:11:25:91:49:4A
+gdx-43: 
+  mac_myri0: 00:60:DD:47:59:05
+  mac_eth0: 00:11:25:C4:33:2A
+  mac_eth1: 00:11:25:C4:33:2B
+  mac_bmc: 00:11:25:91:45:BD
+gdx-121: 
+  mac_eth0: 00:11:25:C4:50:1A
+  mac_myri0: 00:60:DD:47:59:7D
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:88
+gdx-18: 
+  mac_myri0: 00:60:DD:47:59:6A
+  mac_eth0: 00:11:25:C4:35:7A
+  mac_eth1: 00:11:25:C4:35:7B
+  mac_bmc: 00:11:25:91:48:AF
+gdx-44: 
+  mac_myri0: 00:60:DD:47:59:00
+  mac_eth0: 00:11:25:C4:2F:50
+  mac_eth1: 00:11:25:C4:2F:51
+  mac_bmc: 00:11:25:91:48:EC
+gdx-70: 
+  mac_eth0: 00:11:25:C4:3C:4A
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:77
+gdx-122: 
+  mac_eth0: 00:11:25:C4:4D:84
+  mac_myri0: 00:60:DD:47:59:3F
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:29
+gdx-202: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-230: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-310: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:47:A6
+gdx-19: 
+  mac_myri0: 00:60:DD:47:5A:54
+  mac_eth0: 00:11:25:C4:34:4C
+  mac_eth1: 00:11:25:C4:34:4D
+  mac_bmc: 00:11:25:91:49:55
+gdx-45: 
+  mac_myri0: 00:60:DD:47:59:A3
+  mac_eth0: 00:11:25:C4:35:18
+  mac_eth1: 00:11:25:C4:35:19
+  mac_bmc: 00:11:25:91:49:3F
+gdx-71: 
+  mac_myri0: 00:60:DD:47:68:7F
+  mac_eth0: 00:11:25:C4:35:78
+  mac_eth1: 00:11:25:C4:35:79
+  mac_bmc: 00:11:25:91:49:1F
+gdx-203: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-46: 
+  mac_myri0: 00:60:DD:47:65:DB
+  mac_eth0: 00:11:25:C4:09:C6
+  mac_eth1: 00:11:25:C4:09:C7
+  mac_bmc: 00:11:25:91:76:3B
+gdx-72: 
+  mac_eth0: 00:11:25:C4:3E:3C
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:3D
+gdx-123: 
+  mac_eth0: 00:11:25:C4:4E:B0
+  mac_myri0: 00:60:DD:47:59:7A
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:F2
+gdx-150: 
+  mac_myri0: 00:60:DD:47:5A:C3
+  mac_eth0: 00:11:25:C4:4F:02
+  mac_eth1: 00:11:25:C4:4F:03
+  mac_bmc: 00:11:25:91:47:B4
+gdx-204: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-231: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-47: 
+  mac_myri0: 00:60:DD:47:58:F6
+  mac_eth0: 00:11:25:C4:35:99
+  mac_eth1: 00:11:25:C4:35:9A
+  mac_bmc: 00:11:25:91:48:52
+gdx-73: 
+  mac_myri0: 00:60:DD:47:59:6D
+  mac_eth0: 00:11:25:C4:35:9E
+  mac_eth1: 00:11:25:C4:35:9F
+  mac_bmc: 00:11:25:91:46:80
+gdx-124: 
+  mac_eth0: 00:11:25:C4:4D:C8
+  mac_myri0: 00:60:DD:47:66:00
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:6D
+gdx-151: 
+  mac_myri0: 00:60:DD:47:5A:BD
+  mac_eth0: 00:11:25:C4:53:78
+  mac_eth1: 00:11:25:C4:53:79
+  mac_bmc: 00:11:25:91:45:9D
+gdx-205: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-232: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-48: 
+  mac_myri0: 00:60:DD:47:5A:85
+  mac_eth0: 00:11:25:C4:2D:6C
+  mac_eth1: 00:11:25:C4:2D:6D
+  mac_bmc: 00:11:25:91:46:06
+gdx-74: 
+  mac_myri0: 00:60:DD:47:59:73
+  mac_eth0: 00:11:25:C4:2D:0A
+  mac_eth1: 00:11:25:C4:2D:0B
+  mac_bmc: 00:11:25:91:48:46
+gdx-125: 
+  mac_eth0: 00:11:25:C4:51:F8
+  mac_myri0: 00:60:DD:47:5A:55
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:45
+gdx-152: 
+  mac_myri0: 00:60:DD:47:65:B3
+  mac_eth0: 00:11:25:C4:50:B6
+  mac_eth1: 00:11:25:C4:50:B7
+  mac_bmc: 00:11:25:91:49:23
+gdx-206: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-49: 
+  mac_myri0: 00:60:DD:47:5A:80
+  mac_eth0: 00:11:25:C4:33:16
+  mac_eth1: 00:11:25:C4:33:17
+  mac_bmc: 00:11:25:91:49:11
+gdx-75: 
+  mac_myri0: 00:60:DD:47:59:07
+  mac_eth0: 00:11:25:C4:39:AE
+  mac_eth1: 00:11:25:C4:39:AF
+  mac_bmc: 00:11:25:91:49:00
+gdx-126: 
+  mac_eth0: 00:11:25:C4:53:0E
+  mac_myri0: 00:60:DD:47:88:FD
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:37
+gdx-153: 
+  mac_myri0: 00:60:DD:47:65:DA
+  mac_eth0: 00:11:25:C4:50:A8
+  mac_eth1: 00:11:25:C4:50:A9
+  mac_bmc: 00:11:25:91:46:07
+gdx-207: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-233: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-260: 
+  mac_myri0: 00:60:DD:47:7D:B0
+  mac_eth0: 00:11:25:C4:33:82
+  mac_eth1: 00:11:25:C4:33:83
+  mac_bmc: 00:11:25:91:45:D3
+gdx-76: 
+  mac_eth0: 00:11:25:C4:2B:2C
+  mac_myri0: 00:60:DD:47:59:30
+  mac_eth1: 00:11:25:C4:2B:2D
+  mac_bmc: 00:11:25:91:49:37
+gdx-127: 
+  mac_myri0: 00:60:DD:47:65:D9
+  mac_eth0: 00:11:25:C4:4D:94
+  mac_eth1: 00:11:25:C4:4D:95
+  mac_bmc: 00:11:25:91:46:88
+gdx-154: 
+  mac_myri0: 00:60:DD:47:5A:B5
+  mac_eth0: 00:11:25:C4:4D:2A
+  mac_eth1: 00:11:25:C4:4D:2B
+  mac_bmc: 00:11:25:91:46:DE
+gdx-180: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:8F
+gdx-208: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-234: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-261: 
+  mac_myri0: 00:60:DD:47:88:F8
+  mac_eth0: 00:11:25:C4:2D:72
+  mac_eth1: 00:11:25:C4:2D:73
+  mac_bmc: 00:11:25:91:48:7B
+gdx-77: 
+  mac_myri0: 00:60:DD:47:5A:7A
+  mac_eth0: 00:11:25:C4:38:94
+  mac_eth1: 00:11:25:C4:38:95
+  mac_bmc: 00:11:25:91:46:46
+gdx-128: 
+  mac_myri0: 00:60:DD:47:67:FC
+  mac_eth0: 00:11:25:C4:53:18
+  mac_eth1: 00:11:25:C4:53:19
+  mac_bmc: 00:11:25:91:46:02
+gdx-155: 
+  mac_myri0: 00:60:DD:47:5A:8E
+  mac_eth0: 00:11:25:C4:50:A2
+  mac_eth1: 00:11:25:C4:50:A3
+  mac_bmc: 00:11:25:91:48:BA
+gdx-181: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-209: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-235: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-262: 
+  mac_myri0: 00:60:DD:47:7D:11
+  mac_eth0: 00:11:25:C4:34:E8
+  mac_eth1: 00:11:25:C4:34:E9
+  mac_bmc: 00:11:25:91:47:46
+gdx-78: 
+  mac_myri0: 00:60:DD:47:59:06
+  mac_eth0: 00:11:25:C4:26:56
+  mac_eth1: 00:11:25:C4:26:57
+  mac_bmc: 00:11:25:91:47:F1
+gdx-129: 
+  mac_myri0: 00:60:DD:47:59:32
+  mac_eth0: 00:11:25:C4:4D:80
+  mac_eth1: 00:11:25:C4:4D:81
+  mac_bmc: 00:11:25:91:45:FB
+gdx-182: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-236: 
+  mac_myri0: 00:60:DD:47:89:D1
+  mac_eth0: 00:11:25:C4:39:AC
+  mac_eth1: 00:11:25:C4:39:AD
+  mac_bmc: 00:11:25:91:47:F7
+gdx-263: 
+  mac_myri0: 00:60:DD:47:89:C5
+  mac_eth0: 00:11:25:C4:35:88
+  mac_eth1: 00:11:25:C4:35:89
+  mac_bmc: 00:11:25:91:48:07
+gdx-79: 
+  mac_myri0: 00:60:DD:47:67:97
+  mac_eth0: 00:11:25:C4:35:76
+  mac_eth1: 00:11:25:C4:35:77
+  mac_bmc: 00:11:25:91:48:4D
+gdx-156: 
+  mac_myri0: 00:60:DD:47:5A:BC
+  mac_eth0: 00:11:25:C4:0B:06
+  mac_eth1: 00:11:25:C4:0B:07
+  mac_bmc: 00:11:25:91:48:76
+gdx-183: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-237: 
+  mac_myri0: 00:60:DD:47:89:CF
+  mac_eth0: 00:11:25:C4:3C:80
+  mac_eth1: 00:11:25:C4:3C:81
+  mac_bmc: 00:11:25:91:48:45
+gdx-264: 
+  mac_myri0: 00:60:DD:47:89:CA
+  mac_eth0: 00:11:25:C4:33:5E
+  mac_eth1: 00:11:25:C4:33:5F
+  mac_bmc: 00:11:25:91:48:14
+gdx-290: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-157: 
+  mac_myri0: 00:60:DD:47:5A:B8
+  mac_eth0: 00:11:25:C4:52:CA
+  mac_eth1: 00:11:25:C4:52:CB
+  mac_bmc: 00:11:25:91:47:71
+gdx-184: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-238: 
+  mac_myri0: 00:60:DD:47:7D:7D
+  mac_eth0: 00:11:25:C4:3C:7E
+  mac_eth1: 00:11:25:C4:3C:7F
+  mac_bmc: 00:11:25:91:48:CF
+gdx-265: 
+  mac_eth0: 00:11:25:C4:34:64
+  mac_myri0: 00:60:DD:47:5A:1F
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:36
+gdx-291: 
+  mac_myri0: 00:60:DD:47:C7:FA
+  mac_eth0: 00:11:25:C4:33:1C
+  mac_eth1: 00:11:25:C4:33:1D
+  mac_bmc: 00:11:25:91:47:77
+gdx-158: 
+  mac_myri0: 00:60:DD:47:5A:C2
+  mac_eth0: 00:11:25:C4:54:46
+  mac_eth1: 00:11:25:C4:54:47
+  mac_bmc: 00:11:25:91:46:B3
+gdx-185: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-239: 
+  mac_myri0: 00:60:DD:47:7D:97
+  mac_eth0: 00:11:25:C4:3F:50
+  mac_eth1: 00:11:25:C4:3F:51
+  mac_bmc: 00:11:25:91:48:C1
+gdx-292: 
+  mac_myri0: 00:60:DD:47:C7:FF
+  mac_eth0: 00:11:25:C4:33:88
+  mac_eth1: 00:11:25:C4:33:89
+  mac_bmc: 00:11:25:91:46:19
+gdx-159: 
+  mac_myri0: 00:60:DD:47:5A:77
+  mac_eth0: 00:11:25:C4:4F:82
+  mac_eth1: 00:11:25:C4:4F:83
+  mac_bmc: 00:11:25:91:48:0D
+gdx-186: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-266: 
+  mac_myri0: 00:60:DD:47:89:8B
+  mac_eth0: 00:11:25:C4:34:8A
+  mac_eth1: 00:11:25:C4:34:8B
+  mac_bmc: 00:11:25:91:46:60
+gdx-293: 
+  mac_myri0: 00:60:DD:47:89:13
+  mac_eth0: 00:11:25:C4:33:4A
+  mac_eth1: 00:11:25:C4:33:4B
+  mac_bmc: 00:11:25:91:43:D8
+gdx-187: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-267: 
+  mac_eth0: 00:11:25:C4:35:36
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:AE
+gdx-294: 
+  mac_myri0: 00:60:DD:47:89:78
+  mac_eth0: 00:11:25:C4:33:24
+  mac_eth1: 00:11:25:C4:33:25
+  mac_bmc: 00:11:25:91:47:EF
+gdx-188: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-268: 
+  mac_myri0: 00:60:DD:47:89:C7
+  mac_eth0: 00:11:25:C4:34:4E
+  mac_eth1: 00:11:25:C4:34:4F
+  mac_bmc: 00:11:25:91:45:87
+gdx-295: 
+  mac_myri0: 00:60:DD:47:89:88
+  mac_eth0: 00:11:25:C4:33:7A
+  mac_eth1: 00:11:25:C4:33:7B
+  mac_bmc: 00:11:25:91:46:5A
+gdx-269: 
+  mac_myri0: 00:60:DD:47:89:C9
+  mac_eth0: 00:11:25:C4:33:0E
+  mac_eth1: 00:11:25:C4:33:0F
+  mac_bmc: 00:11:25:91:46:D0
+gdx-296: 
+  mac_myri0: 00:60:DD:47:89:B1
+  mac_eth0: 00:11:25:C4:20:06
+  mac_eth1: 00:11:25:C4:20:07
+  mac_bmc: 00:11:25:91:47:AB
+gdx-189: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-297: 
+  mac_myri0: 00:60:DD:47:89:85
+  mac_eth0: 00:11:25:C4:33:3C
+  mac_eth1: 00:11:25:C4:33:3D
+  mac_bmc: 00:11:25:91:47:D2
+gdx-30: 
+  mac_myri0: 00:60:DD:47:65:DE
+  mac_eth0: 00:11:25:C4:35:2C
+  mac_eth1: 00:11:25:C4:35:2D
+  mac_bmc: 00:11:25:91:46:61
+gdx-298: 
+  mac_myri0: 00:60:DD:47:89:95
+  mac_eth0: 00:11:25:C4:33:48
+  mac_eth1: 00:11:25:C4:33:49
+  mac_bmc: 00:11:25:91:46:8E
+gdx-31: 
+  mac_myri0: 00:60:DD:47:59:69
+  mac_eth0: 00:11:25:C4:35:24
+  mac_eth1: 00:11:25:C4:35:25
+  mac_bmc: 00:11:25:91:45:C5
+gdx-32: 
+  mac_myri0: 00:60:DD:47:65:B7
+  mac_eth0: 00:11:25:C4:35:08
+  mac_eth1: 00:11:25:C4:35:09
+  mac_bmc: 00:11:25:91:49:3D
+gdx-110: 
+  mac_eth0: 00:11:25:C4:51:A4
+  mac_myri0: 00:60:DD:47:5A:A7
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:DE
+gdx-299: 
+  mac_myri0: 00:60:DD:47:89:0E
+  mac_eth0: 00:11:25:C4:33:46
+  mac_eth1: 00:11:25:C4:33:47
+  mac_bmc: 00:11:25:91:47:0B
+gdx-33: 
+  mac_myri0: 00:60:DD:47:5A:20
+  mac_eth0: 00:11:25:C4:34:70
+  mac_eth1: 00:11:25:C4:34:71
+  mac_bmc: 00:11:25:91:45:EB
+gdx-111: 
+  mac_eth0: 00:11:25:C4:50:30
+  mac_myri0: 00:60:DD:47:65:C2
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:7C
+gdx-34: 
+  mac_myri0: 00:60:DD:47:5A:91
+  mac_eth0: 00:11:25:C4:33:8E
+  mac_eth1: 00:11:25:C4:33:8F
+  mac_bmc: 00:11:25:91:49:34
+gdx-60: 
+  mac_eth0: 00:11:25:C4:3E:2C
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:57
+gdx-35: 
+  mac_myri0: 00:60:DD:47:65:BB
+  mac_eth0: 00:11:25:C4:34:7A
+  mac_eth1: 00:11:25:C4:34:7B
+  mac_bmc: 00:11:25:91:47:C5
+gdx-61: 
+  mac_eth0: 00:11:25:C4:4E:10
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:B3
+gdx-112: 
+  mac_eth0: 00:11:25:C4:4F:C6
+  mac_myri0: 00:60:DD:47:65:4F
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:7F
+gdx-220: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-300: 
+  mac_myri0: 00:60:DD:47:89:1B
+  mac_eth0: 00:11:25:C4:33:14
+  mac_eth1: 00:11:25:C4:33:15
+  mac_bmc: 00:11:25:91:45:A9
+gdx-36: 
+  mac_myri0: 00:60:DD:47:5A:90
+  mac_eth0: 00:11:25:C4:33:56
+  mac_eth1: 00:11:25:C4:33:57
+  mac_bmc: 00:11:25:91:45:E7
+gdx-62: 
+  mac_eth0: 00:11:25:C4:3C:62
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:BB
+gdx-113: 
+  mac_eth0: 00:11:25:C4:51:48
+  mac_myri0: 00:60:DD:47:5A:56
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:9C
+gdx-140: 
+  mac_myri0: 00:60:DD:47:59:62
+  mac_eth0: 00:11:25:C4:24:02
+  mac_eth1: 00:11:25:C4:24:03
+  mac_bmc: 00:11:25:91:48:32
+gdx-221: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-301: 
+  mac_myri0: 00:60:DD:47:89:93
+  mac_eth0: 00:11:25:C4:35:06
+  mac_eth1: 00:11:25:C4:35:07
+  mac_bmc: 00:11:25:91:45:C4
+gdx-63: 
+  mac_eth0: 00:11:25:C4:3B:B4
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:B2
+gdx-114: 
+  mac_eth0: 00:11:25:C4:53:00
+  mac_myri0: 00:60:DD:47:66:01
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:47:AA
+gdx-141: 
+  mac_myri0: 00:60:DD:47:5A:B7
+  mac_eth0: 00:11:25:C4:3F:A8
+  mac_eth1: 00:11:25:C4:3F:A9
+  mac_bmc: 00:11:25:91:48:63
+gdx-302: 
+  mac_myri0: 00:60:DD:47:89:83
+  mac_eth0: 00:11:25:C4:34:42
+  mac_eth1: 00:11:25:C4:34:43
+  mac_bmc: 00:11:25:91:46:64
+gdx-37: 
+  mac_myri0: 00:60:DD:47:59:AA
+  mac_eth0: 00:11:25:C4:31:66
+  mac_eth1: 00:11:25:C4:31:67
+  mac_bmc: 00:11:25:91:48:3C
+gdx-64: 
+  mac_eth0: 00:11:25:C4:39:86
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:AF
+gdx-90: 
+  mac_myri0: 00:60:DD:47:59:02
+  mac_eth0: 00:11:25:C4:51:02
+  mac_eth1: 00:11:25:C4:51:03
+  mac_bmc: 00:11:25:91:49:5A
+gdx-115: 
+  mac_eth0: 00:11:25:C4:4E:44
+  mac_myri0: 00:60:DD:47:65:B9
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:5C
+gdx-142: 
+  mac_myri0: 00:60:DD:47:59:B6
+  mac_eth0: 00:11:25:C4:4F:D8
+  mac_eth1: 00:11:25:C4:4F:D9
+  mac_bmc: 00:11:25:91:46:41
+gdx-222: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-303: 
+  mac_myri0: 00:60:DD:47:89:7D
+  mac_eth0: 00:11:25:C4:0F:10
+  mac_eth1: 00:11:25:C4:0F:11
+  mac_bmc: 00:11:25:91:45:9A
+gdx-38: 
+  mac_myri0: 00:60:DD:47:59:B1
+  mac_eth0: 00:11:25:C4:34:6C
+  mac_eth1: 00:11:25:C4:34:6D
+  mac_bmc: 00:11:25:91:47:26
+gdx-91: 
+  mac_eth0: 00:11:25:C4:51:4C
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:1C
+gdx-116: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:BA
+gdx-143: 
+  mac_myri0: 00:60:DD:47:5A:B9
+  mac_eth0: 00:11:25:C4:4F:AA
+  mac_eth1: 00:11:25:C4:4F:AB
+  mac_bmc: 00:11:25:91:48:33
+gdx-223: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-250: 
+  mac_myri0: 00:60:DD:47:7B:FF
+  mac_eth0: 00:11:25:C4:3B:9A
+  mac_eth1: 00:11:25:C4:3B:9B
+  mac_bmc: 00:11:25:91:45:E8
+gdx-304: 
+  mac_myri0: 00:60:DD:47:89:8F
+  mac_eth0: 00:11:25:C4:33:58
+  mac_eth1: 00:11:25:C4:33:59
+  mac_bmc: 00:11:25:91:47:9C
+gdx-39: 
+  mac_myri0: 00:60:DD:47:59:71
+  mac_eth0: 00:11:25:C4:34:4A
+  mac_eth1: 00:11:25:C4:34:4B
+  mac_bmc: 00:11:25:91:45:A8
+gdx-65: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-66: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-305: 
+  mac_myri0: 00:60:DD:47:88:B0
+  mac_eth0: 00:11:25:C4:34:62
+  mac_eth1: 00:11:25:C4:34:63
+  mac_bmc: 00:11:25:91:46:5B
+gdx-251: 
+  mac_myri0: 00:60:DD:47:88:6E
+  mac_eth0: 00:11:25:C4:3F:90
+  mac_eth1: 00:11:25:C4:3F:91
+  mac_bmc: 00:11:25:91:47:40
+gdx-144: 
+  mac_myri0: 00:60:DD:47:5A:92
+  mac_eth0: 00:11:25:C4:50:0E
+  mac_eth1: 00:11:25:C4:50:0F
+  mac_bmc: 00:11:25:91:45:A6
+gdx-117: 
+  mac_eth0: 00:11:25:C4:52:EC
+  mac_myri0: 00:60:DD:47:65:BC
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:94
+gdx-92: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-170: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:3D
+gdx-224: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-93: 
+  mac_eth0: 00:11:25:C4:4F:A6
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:2F
+gdx-67: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-306: 
+  mac_myri0: 00:60:DD:47:89:96
+  mac_eth0: 00:11:25:C4:41:5A
+  mac_eth1: 00:11:25:C4:41:5B
+  mac_bmc: 00:11:25:91:46:35
+gdx-252: 
+  mac_myri0: 00:60:DD:47:7C:65
+  mac_eth0: 00:11:25:C4:32:5A
+  mac_eth1: 00:11:25:C4:32:5B
+  mac_bmc: 00:11:25:91:48:28
+gdx-118: 
+  mac_eth0: 00:11:25:C4:53:EA
+  mac_myri0: 00:60:DD:47:66:1B
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:5B
+gdx-171: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:FC
+gdx-225: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-119: 
+  mac_eth0: 00:11:25:C4:51:AC
+  mac_myri0: 00:60:DD:47:65:C1
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:15
+gdx-94: 
+  mac_eth0: 00:11:25:C4:53:FC
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:05
+gdx-68: 
+  mac_eth0: 00:11:25:C4:3C:18
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:9E
+gdx-253: 
+  mac_myri0: 00:60:DD:47:C7:FB
+  mac_eth0: 00:11:25:C4:34:68
+  mac_eth1: 00:11:25:C4:34:69
+  mac_bmc: 00:11:25:91:47:CC
+gdx-145: 
+  mac_myri0: 00:60:DD:47:68:7B
+  mac_eth0: 00:11:25:C4:50:20
+  mac_eth1: 00:11:25:C4:50:21
+  mac_bmc: 00:11:25:91:45:AD
+gdx-172: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:92
+gdx-226: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-307: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:FE
+gdx-95: 
+  mac_eth0: 00:11:25:C4:4F:30
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:F7
+gdx-69: 
+  mac_eth0: 00:11:25:C4:34:82
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:47:B3
+gdx-280: 
+  mac_myri0: 00:60:DD:47:C7:FC
+  mac_eth0: 00:11:25:C4:33:20
+  mac_eth1: 00:11:25:C4:33:21
+  mac_bmc: 00:11:25:91:46:92
+gdx-254: 
+  mac_myri0: 00:60:DD:47:C7:FE
+  mac_eth0: 00:11:25:C4:35:B8
+  mac_eth1: 00:11:25:C4:35:B9
+  mac_bmc: 00:11:25:91:46:C7
+gdx-146: 
+  mac_myri0: 00:60:DD:47:5A:73
+  mac_eth0: 00:11:25:C4:4D:4C
+  mac_eth1: 00:11:25:C4:4D:4D
+  mac_bmc: 00:11:25:91:46:B4
+gdx-173: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:EA
+gdx-227: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-308: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:66
+gdx-147: 
+  mac_myri0: 00:60:DD:47:59:79
+  mac_eth0: 00:11:25:C4:4D:FE
+  mac_eth1: 00:11:25:C4:4D:FF
+  mac_bmc: 00:11:25:91:47:22
+gdx-96: 
+  mac_eth0: 00:11:25:C4:50:A6
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:EE
+gdx-281: 
+  mac_myri0: 00:60:DD:47:C7:7D
+  mac_eth0: 00:11:25:C4:33:18
+  mac_eth1: 00:11:25:C4:33:19
+  mac_bmc: 00:11:25:91:45:7F
+gdx-174: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:FA
+gdx-228: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-309: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:F6
+gdx-148: 
+  mac_myri0: 00:60:DD:47:5A:79
+  mac_eth0: 00:11:25:C4:51:06
+  mac_eth1: 00:11:25:C4:51:07
+  mac_bmc: 00:11:25:91:47:FC
+gdx-97: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:7A
+gdx-282: 
+  mac_myri0: 00:60:DD:47:89:1C
+  mac_eth0: 00:11:25:C4:31:44
+  mac_eth1: 00:11:25:C4:31:45
+  mac_bmc: 00:11:25:91:47:11
+gdx-255: 
+  mac_myri0: 00:60:DD:47:7C:E1
+  mac_eth0: 00:11:25:C4:09:86
+  mac_eth1: 00:11:25:C4:09:87
+  mac_bmc: 00:11:25:91:48:BC
+gdx-175: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:EB
+gdx-229: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-149: 
+  mac_myri0: 00:60:DD:47:5A:C1
+  mac_eth0: 00:11:25:C4:4F:C0
+  mac_eth1: 00:11:25:C4:4F:C1
+  mac_bmc: 00:11:25:91:46:2C
+gdx-98: 
+  mac_eth0: 00:11:25:C4:4E:1A
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:47:BB
+gdx-283: 
+  mac_myri0: 00:60:DD:47:89:86
+  mac_eth0: 00:11:25:C4:34:5E
+  mac_eth1: 00:11:25:C4:34:5F
+  mac_bmc: 00:11:25:91:45:9E
+gdx-256: 
+  mac_myri0: 00:60:DD:47:88:FA
+  mac_eth0: 00:11:25:C4:35:90
+  mac_eth1: 00:11:25:C4:35:91
+  mac_bmc: 00:11:25:91:47:F0
+gdx-176: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:48:EA
+gdx-99: 
+  mac_eth0: 00:11:25:C4:4F:3E
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:C2
+gdx-257: 
+  mac_myri0: 00:60:DD:47:C7:F6
+  mac_eth0: 00:11:25:C4:35:62
+  mac_eth1: 00:11:25:C4:35:63
+  mac_bmc: 00:11:25:91:47:E2
+gdx-177: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:47:8B
+gdx-284: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:A2
+gdx-285: 
+  mac_myri0: 00:60:DD:47:89:CC
+  mac_eth0: 00:11:25:C4:35:BE
+  mac_eth1: 00:11:25:C4:35:BF
+  mac_bmc: 00:11:25:91:48:CE
+gdx-258: 
+  mac_myri0: 00:60:DD:47:7D:7F
+  mac_eth0: 00:11:25:C4:13:1A
+  mac_eth1: 00:11:25:C4:13:1B
+  mac_bmc: 00:11:25:91:47:7C
+gdx-286: 
+  mac_myri0: 00:60:DD:47:89:C2
+  mac_eth0: 00:11:25:C4:2A:C2
+  mac_eth1: 00:11:25:C4:2A:C3
+  mac_bmc: 00:11:25:91:45:DA
+gdx-259: 
+  mac_myri0: 00:60:DD:47:88:FF
+  mac_eth0: 00:11:25:C4:35:6A
+  mac_eth1: 00:11:25:C4:35:6B
+  mac_bmc: 00:11:25:91:49:15
+gdx-178: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:45:C7
+gdx-1: 
+  mac_myri0: 00:60:DD:47:5A:A4
+  mac_eth0: 00:11:25:C4:35:7E
+  mac_eth1: 00:11:25:C4:35:7F
+  mac_bmc: 00:11:25:91:47:F2
+gdx-287: 
+  mac_myri0: 00:60:DD:47:89:C6
+  mac_eth0: 00:11:25:C4:34:40
+  mac_eth1: 00:11:25:C4:34:41
+  mac_bmc: 00:11:25:91:46:33
+gdx-179: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:14
+gdx-20: 
+  mac_myri0: 00:60:DD:47:88:F7
+  mac_eth0: 00:11:25:C4:35:52
+  mac_eth1: 00:11:25:C4:35:53
+  mac_bmc: 00:11:25:91:45:7C
+gdx-21: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-2: 
+  mac_myri0: 00:60:DD:47:59:75
+  mac_eth0: 00:11:25:C4:35:56
+  mac_eth1: 00:11:25:C4:35:57
+  mac_bmc: 00:11:25:91:48:A7
+gdx-288: 
+  mac_myri0: 00:60:DD:47:89:CD
+  mac_eth0: 00:11:25:C4:34:66
+  mac_eth1: 00:11:25:C4:34:67
+  mac_bmc: 00:11:25:91:46:58
+gdx-289: 
+  mac_myri0: 00:60:DD:47:89:1D
+  mac_eth0: 00:11:25:C4:33:68
+  mac_eth1: 00:11:25:C4:33:69
+  mac_bmc: 00:11:25:91:48:22
+gdx-100: 
+  mac_myri0: 00:60:DD:47:5A:8B
+  mac_eth0: 00:11:25:C4:4E:BE
+  mac_eth1: 00:11:25:C4:4E:BF
+  mac_bmc: 00:11:25:91:48:B7
+gdx-22: 
+  mac_myri0: 00:60:DD:47:5A:A2
+  mac_eth0: 00:11:25:C4:34:5A
+  mac_eth1: 00:11:25:C4:34:5B
+  mac_bmc: 00:11:25:91:49:2A
+gdx-3: 
+  mac_myri0: 00:60:DD:47:59:76
+  mac_eth0: 00:11:25:C4:35:3A
+  mac_eth1: 00:11:25:C4:35:3B
+  mac_bmc: 00:11:25:91:47:3B
+gdx-23: 
+  mac_myri0: 00:60:DD:47:5A:8F
+  mac_eth0: 00:11:25:C4:34:EA
+  mac_eth1: 00:11:25:C4:34:EB
+  mac_bmc: 00:11:25:91:46:B7
+gdx-4: 
+  mac_myri0: 00:60:DD:47:59:74
+  mac_eth0: 00:11:25:C4:35:40
+  mac_eth1: 00:11:25:C4:35:41
+  mac_bmc: 00:11:25:91:49:63
+gdx-101: 
+  mac_myri0: 00:60:DD:47:67:8C
+  mac_eth0: 00:11:25:C4:51:8C
+  mac_eth1: 00:11:25:C4:51:8D
+  mac_bmc: 00:11:25:91:45:DF
+gdx-50: 
+  mac_myri0: 00:60:DD:47:67:92
+  mac_eth0: 00:11:25:C4:33:92
+  mac_eth1: 00:11:25:C4:33:93
+  mac_bmc: 00:11:25:91:49:3C
+gdx-24: 
+  mac_myri0: 00:60:DD:47:5A:57
+  mac_eth0: 00:11:25:C4:34:50
+  mac_eth1: 00:11:25:C4:34:51
+  mac_bmc: 00:11:25:91:47:39
+gdx-5: 
+  mac_myri0: 00:60:DD:47:59:68
+  mac_eth0: 00:11:25:C4:33:52
+  mac_eth1: 00:11:25:C4:33:53
+  mac_bmc: 00:11:25:91:47:B0
+gdx-102: 
+  mac_myri0: 00:60:DD:47:68:44
+  mac_eth0: 00:11:25:C4:4E:DE
+  mac_eth1: 00:11:25:C4:4E:DF
+  mac_bmc: 00:11:25:91:49:61
+gdx-51: 
+  mac_myri0: 00:60:DD:47:5A:8D
+  mac_eth0: 00:11:25:C4:49:8E
+  mac_eth1: 00:11:25:C4:49:8F
+  mac_bmc: 00:11:25:91:45:C1
+gdx-25: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:47:A1
+gdx-6: 
+  mac_myri0: 00:60:DD:47:59:77
+  mac_eth0: 00:11:25:C4:35:1E
+  mac_eth1: 00:11:25:C4:35:1F
+  mac_bmc: 00:11:25:91:48:17
+gdx-210: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-130: 
+  mac_myri0: 00:60:DD:47:59:FD
+  mac_eth0: 00:11:25:C4:54:6A
+  mac_eth1: 00:11:25:C4:54:6B
+  mac_bmc: 00:11:25:91:45:A5
+gdx-103: 
+  mac_myri0: 00:60:DD:47:67:8B
+  mac_eth0: 00:11:25:C4:4E:FC
+  mac_eth1: 00:11:25:C4:4E:FD
+  mac_bmc: 00:11:25:91:46:1D
+gdx-52: 
+  mac_myri0: 00:60:DD:47:5A:7C
+  mac_eth0: 00:11:25:C4:35:97
+  mac_eth1: 00:11:25:C4:35:98
+  mac_bmc: 00:11:25:91:47:21
+gdx-26: 
+  mac_myri0: 00:60:DD:47:5A:59
+  mac_eth0: 00:11:25:C4:35:A4
+  mac_eth1: 00:11:25:C4:35:A5
+  mac_bmc: 00:11:25:91:48:A5
+gdx-7: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
+gdx-131: 
+  mac_myri0: 00:60:DD:47:59:6B
+  mac_eth0: 00:11:25:C4:54:86
+  mac_eth1: 00:11:25:C4:54:87
+  mac_bmc: 00:11:25:91:46:AA
+gdx-104: 
+  mac_myri0: 00:60:DD:47:67:8E
+  mac_eth0: 00:11:25:C4:52:4A
+  mac_eth1: 00:11:25:C4:52:4B
+  mac_bmc: 00:11:25:91:47:78
+gdx-53: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:47:B1
+gdx-27: 
+  mac_myri0: 00:60:DD:47:59:33
+  mac_eth0: 00:11:25:C4:31:4E
+  mac_eth1: 00:11:25:C4:31:4F
+  mac_bmc: 00:11:25:91:49:1C
+gdx-8: 
+  mac_eth0: 00:11:25:C4:35:C2
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: 00:11:25:91:46:3F
+gdx-211: 
+  mac_eth0: nil
+  mac_myri0: nil
+  mac_eth1: nil
+  mac_bmc: nil
diff --git a/generators/input/orsay-netgdx.rb b/generators/input/orsay-netgdx.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4c0da87db44eff836a881f744408fe1f8fadac9c
--- /dev/null
+++ b/generators/input/orsay-netgdx.rb
@@ -0,0 +1,118 @@
+require 'net/ssh'
+site :orsay do |site_uid|
+  ssh = Net::SSH.start("frontend.#{site_uid}.grid5000.fr","g5kadmin")
+  
+  cluster :netgdx do |cluster_uid|
+    model "IBM eServer 326m"
+    created_at nil
+    misc "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00"
+    1.upto(30) do |i|
+      node "#{cluster_uid}-#{i}" do |node_uid|
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
+        architecture({
+          :smp_size => 2, 
+          :smt_size => 2,
+          :platform_type => "x86_64"
+          })
+        processor({
+          :vendor => "AMD",
+          :model => "AMD Opteron",
+          :version => "246",
+          :clock_speed => 2.G,
+          :instruction_set => "",
+          :other_description => "",
+          :cache_l1 => nil,
+          :cache_l1i => nil,
+          :cache_l1d => nil,
+          :cache_l2 => 1.MiB
+        })
+        main_memory({
+          :ram_size => 2.GiB, # bytes
+          :virtual_size => nil
+        })
+        operating_system({
+          :name => "debian-x64-5-prod",
+          :release => "5.1.2",
+          :version => "5",
+          :kernel   => "2.6.26"
+        })
+        storage_devices [
+          {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw"}
+          ]
+        network_adapters [{
+            :interface => 'Ethernet',
+            :device => 'bmc',
+            :rate => (eval lookup('orsay-network', "switch-bmc-netgdx", 'rate')),
+            :mac => lookup('orsay-netgdx', "#{node_uid}", 'mac_bmc'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => true,
+            :mountable => true,
+            :mounted => true,
+            :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup_through_ssh(ssh,"#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
+            :switch => (lookup('orsay-network', "switch-bmc-netgdx", 'name')+".#{site_uid}.grid5000.fr"),
+            :switch_ip => lookup('orsay-network', "switch-bmc-netgdx", 'ip'),
+            :switch_mac => lookup('orsay-network', "switch-bmc-netgdx", 'mac'),
+            :switch_console => (lookup('orsay-network', "switch-rsa-netgdx", 'name')+".#{site_uid}.grid5000.fr"),
+            :switch_console_ip => lookup('orsay-network', "switch-rsa-netgdx", 'ip'),
+            :switch_console_mac => lookup('orsay-network', "switch-rsa-netgdx", 'mac'),
+          },{
+            :interface => 'Ethernet',
+            :device => 'eth0',
+            :rate => (eval lookup('orsay-network', "switch-gw", 'rate')),
+            :mac => lookup('orsay-netgdx', "#{node_uid}", 'mac_eth0'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true,
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup_through_ssh(ssh,"#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => (lookup('orsay-network', "switch-gw", 'name-prod')+".#{site_uid}.grid5000.fr"),
+            :switch_ip => lookup('orsay-network', "switch-gw", 'ip-prod'),
+            :switch_mac => lookup('orsay-network', "switch-gw", 'mac-prod'),
+          },{
+            :interface => 'Ethernet',
+            :device => 'eth1',
+            :rate => (eval lookup('orsay-network', "switch-gw", 'rate')),
+            :mac => lookup('orsay-netgdx', "#{node_uid}", 'mac_eth1'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true, 
+            :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup_through_ssh(ssh,"#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
+            :switch => (lookup('orsay-network', "switch-gw", 'name-prod')+".#{site_uid}.grid5000.fr"),
+            :switch_ip => lookup('orsay-network', "switch-gw", 'ip-prod'),
+            :switch_mac => lookup('orsay-network', "switch-gw", 'mac-prod'),
+          },{
+            :interface => 'Ethernet',
+            :device => 'eth2',
+            :rate => (eval lookup('orsay-network', "switch-gw", 'rate')),
+            :mac => lookup('orsay-netgdx', "#{node_uid}", 'mac_eth0'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5703',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'tg3',
+            :mounted => true,
+            :network_address => "#{node_uid}-eth2.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup_through_ssh(ssh,"#{node_uid}-eth2.#{site_uid}.grid5000.fr"),
+            :switch => (lookup('orsay-network', "switch-gw", 'name-prod')+".#{site_uid}.grid5000.fr"),
+            :switch_ip => lookup('orsay-network', "switch-gw", 'ip-prod'),
+            :switch_mac => lookup('orsay-network', "switch-gw", 'mac-prod'),
+          }]  
+      end      
+    end
+  end # cluster net-gdx
+
+  ssh.close
+end
diff --git a/generators/input/orsay-netgdx.yaml b/generators/input/orsay-netgdx.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9997427d3663b8f96c1c17d87a839015f835a16c
--- /dev/null
+++ b/generators/input/orsay-netgdx.yaml
@@ -0,0 +1,141 @@
+--- 
+netgdx-10:
+  mac_eth0: 00:11:25:c4:28:42
+  mac_eth1: 00:11:25:c4:28:43
+  mac_eth2: 00:10:18:16:4d:f9
+  mac_bmc: 00:11:25:91:48:4C
+netgdx-11:
+  mac_eth0: 00:11:25:c4:4f:56
+  mac_eth1: 00:11:25:c4:4f:57
+  mac_eth2: 00:10:18:16:4d:dc
+  mac_bmc: 00:11:25:91:45:A4
+netgdx-12:
+  mac_eth0: 00:11:25:c4:4d:ea
+  mac_eth1: 00:11:25:c4:4d:eb
+  mac_eth2: 00:10:18:16:4d:57
+  mac_bmc: 00:11:25:91:45:C0
+netgdx-13:
+  mac_eth0: 00:11:25:c4:52:b6
+  mac_eth1: 00:11:25:c4:52:b7
+  mac_eth2: 00:10:18:16:4d:cb
+  mac_bmc: 00:11:25:91:45:86
+netgdx-14:
+  mac_eth0: 00:11:25:c4:52:62
+  mac_eth1: 00:11:25:c4:52:63
+  mac_eth2: 00:10:18:16:4f:d9
+  mac_bmc: 00:11:25:91:48:E0
+netgdx-15:
+  mac_eth0: 00:11:25:c4:4f:76
+  mac_eth1: 00:11:25:c4:4f:77
+  mac_eth2: 00:10:18:16:4f:0b
+  mac_bmc: 00:11:25:91:49:51
+netgdx-16:
+  mac_eth0: 00:11:25:c4:4f:48
+  mac_eth1: 00:11:25:c4:4f:49
+  mac_eth2: 00:10:18:16:4f:0e
+  mac_bmc: 00:11:25:91:48:F6
+netgdx-17:
+  mac_eth0: 00:11:25:c4:42:e0
+  mac_eth1: 00:11:25:c4:42:e1
+  mac_eth2: 00:10:18:16:4f:23
+  mac_bmc: 00:11:25:91:48:3E
+netgdx-18:
+  mac_eth0: 00:11:25:c4:4e:c6
+  mac_eth1: 00:11:25:c4:4e:c7
+  mac_eth2: 00:10:18:16:28:1c
+  mac_bmc: 00:11:25:91:47:B7
+netgdx-19:
+  mac_eth0: 00:11:25:c4:4f:8a
+  mac_eth1: 00:11:25:c4:4f:8b
+  mac_eth2: 00:10:18:16:4f:74
+  mac_bmc: 00:11:25:91:46:65
+netgdx-1:
+  mac_eth0: 00:11:25:c4:4f:62
+  mac_eth1: 00:11:25:c4:4f:63
+  mac_eth2: 00:10:18:16:4f:2e
+  mac_bmc: 00:11:25:91:48:1E
+netgdx-20:
+  mac_eth0: 00:11:25:c4:4d:7c
+  mac_eth1: 00:11:25:c4:4d:7d
+  mac_eth2: 00:10:18:16:4e:ec
+  mac_bmc: 00:11:25:91:47:7E
+netgdx-21:
+  mac_eth0: 00:11:25:c4:50:2e
+  mac_eth1: 00:11:25:c4:50:2f
+  mac_eth2: 00:10:18:0b:e2:c2
+  mac_bmc: 00:11:25:91:47:A5
+netgdx-22:
+  mac_eth0: 00:11:25:c4:4f:7e
+  mac_eth1: 00:11:25:c4:4f:7f
+  mac_eth2: 00:10:18:0b:d8:a3
+  mac_bmc: 00:11:25:91:46:5F
+netgdx-23:
+  mac_eth0: 00:11:25:c4:4f:fe
+  mac_eth1: 00:11:25:c4:4f:ff
+  mac_eth2: 00:10:18:00:fa:12
+  mac_bmc: 00:11:25:91:46:68
+netgdx-24:
+  mac_eth0: 00:11:25:c4:54:8a
+  mac_eth1: 00:11:25:c4:54:8b
+  mac_eth2: 00:10:18:06:4f:a5
+  mac_bmc: 00:11:25:91:46:A2
+netgdx-25:
+  mac_eth0: 00:11:25:c4:52:68
+  mac_eth1: 00:11:25:c4:52:69
+  mac_eth2: 00:10:18:06:4f:e8
+  mac_bmc: 00:11:25:91:46:4B
+netgdx-26:
+  mac_eth0: 00:11:25:c4:52:ba
+  mac_eth1: 00:11:25:c4:52:bb
+  mac_eth2: 00:10:18:06:4e:db
+  mac_bmc: 00:11:25:91:48:ED
+netgdx-28:
+  mac_eth0: 00:11:25:c4:4d:28
+  mac_eth1: 00:11:25:c4:4d:29
+  mac_eth2: 00:10:18:06:4f:ae
+  mac_bmc: 00:11:25:91:47:48
+netgdx-29:
+  mac_eth0: 00:11:25:c4:4f:9e
+  mac_eth1: 00:11:25:c4:4f:9f
+  mac_eth2: 00:10:18:06:4f:b5
+  mac_bmc: 00:11:25:91:45:F3
+netgdx-2:
+  mac_eth0: 00:11:25:c4:52:bc
+  mac_eth1: 00:11:25:c4:52:bd
+  mac_eth2: 00:10:18:16:50:6c
+  mac_bmc: 00:11:25:91:47:B2
+netgdx-30:
+  mac_eth0: 00:11:25:c4:4f:38
+  mac_eth1: 00:11:25:c4:4f:39
+  mac_eth2: 00:10:18:06:4f:b0
+  mac_bmc: 00:11:25:91:49:2D
+netgdx-3:
+  mac_eth0: 00:11:25:c4:4f:66
+  mac_eth1: 00:11:25:c4:4f:67
+  mac_eth2: 00:10:18:16:4a:f0
+  mac_bmc: 00:11:25:91:45:CB
+netgdx-4:
+  mac_eth0: 00:11:25:c4:50:94
+  mac_eth1: 00:11:25:c4:50:95
+  mac_eth2: 00:10:18:16:4f:31
+  mac_bmc: 00:11:25:91:47:BA
+netgdx-5:
+  mac_eth0: 00:11:25:c4:50:90
+  mac_eth1: 00:11:25:c4:50:91
+  mac_eth2: 00:10:18:16:4e:c9
+  mac_bmc: 00:11:25:91:47:83
+netgdx-7:
+  mac_eth0: 00:11:25:c4:4f:60
+  mac_eth1: 00:11:25:c4:4f:61
+  mac_eth2: 00:10:18:16:4d:86
+  mac_bmc: 00:11:25:91:48:4A
+netgdx-8:
+  mac_eth0: 00:11:25:c4:4f:d4
+  mac_eth1: 00:11:25:c4:4f:d5
+  mac_eth2: 00:10:18:16:4e:f0
+  mac_bmc: 00:11:25:91:45:95
+netgdx-9:
+  mac_eth0: 00:11:25:c4:54:5c
+  mac_eth1: 00:11:25:c4:54:5d
+  mac_eth2: 00:10:18:16:4f:91
+  mac_bmc: 00:11:25:91:45:E6
\ No newline at end of file
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-network.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..25f036f39996dc52b2cb7dbcf387e3d2c729dea1
--- /dev/null
+++ b/generators/input/orsay-network.yaml
@@ -0,0 +1,246 @@
+--- 
+switch-eth0-0:
+  name: "switch11"
+  nodes: "gdx-[1,18]"
+  rate: 1.G
+  ip: 172.26.120.111
+  mac: 00:12:01:73:21:C2
+switch-eth0-1:
+  name: "switch12"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.112
+  mac: 00:12:01:73:27:C2
+switch-eth0-2:
+  name: "switch09"
+  nodes: "gdx-[37,54]"
+  rate: 1.G  
+  ip: 172.26.120.109
+  mac: 00:24:F9:3E:81:42
+switch-eth0-3:
+  name: "switch08"
+  nodes: "gdx-[55,72]"
+  rate: 1.G  
+  ip: 172.26.120.108
+  mac: 00:11:BB:3E:FD:C2
+switch-eth0-4:
+  name: "switch06"
+  nodes: "gdx-[73,90]"
+  rate: 1.G  
+  ip: 172.26.120.106
+  mac: 00:24:f9:3e:e7:42
+switch-eth0-5:
+  name: "switch05"
+  nodes: "gdx-[91,108]"
+  rate: 1.G  
+  ip: 172.26.120.105
+  mac: 00:12:00:44:53:42
+switch-eth0-6:
+  name: "switch03"
+  nodes: "gdx-[109,126]"
+  rate: 1.G  
+  ip: 172.26.120.103
+  mac: 00:24:f9:3e:a7:42
+switch-eth0-7:
+  name: "switch02"
+  nodes: "gdx-[127,144]"
+  rate: 1.G  
+  ip: 172.26.120.102
+  mac: 00:12:00:4c:f5:c2
+switch-eth0-8:
+  name: "procurve17"
+  nodes: "gdx-[145,162]"
+  rate: 100.M  
+  ip: 172.26.120.197
+  mac: aa:aa:aa:aa:aa:aa
+switch-eth0-9:
+  name: "procurve18"
+  nodes: "gdx-[163,180]"
+  rate: 100.M  
+  ip: 172.26.120.198
+  mac: aa:aa:aa:aa:aa:aa
+switch-eth0-10:
+  name: "switch15"
+  nodes: "gdx-[181,198]"
+  rate: 1.G  
+  ip: 172.26.120.115
+  mac: aa:aa:aa:aa:aa:aa
+switch-eth0-11:
+  name: "switch14"
+  nodes: "gdx-[199,216]"
+  rate: 1.G  
+  ip: 172.26.120.114
+  mac: 00:11:bb:17:e8:c2
+switch-eth0-12:
+  name: "switch07"
+  nodes: "gdx-[217,234]"
+  rate: 1.G  
+  ip: 172.26.120.107
+  mac: aa:aa:aa:aa:aa:aa
+switch-eth0-13:
+  name: "switch04"
+  nodes: "gdx-[235,252]"
+  rate: 1.G  
+  ip: 172.26.120.104
+  mac: aa:aa:aa:aa:aa:aa
+switch-eth0-14:
+  name: "switch10"
+  nodes: "gdx-[253,270]"
+  rate: 1.G  
+  ip: 172.26.120.110
+  mac: 00:12:01:72:cd:42
+switch-eth0-15:
+  name: "switch16"
+  nodes: "gdx-[271,288]"
+  rate: 1.G  
+  ip: 172.26.120.116
+  mac: 00:12:01:5b:af:42
+switch-eth0-16:
+  name: "procurve01"
+  nodes: "gdx-[289,306]"
+  rate: 100.M  
+  ip: 172.26.120.181
+  mac: aa:aa:aa:aa:aa:aa
+switch-eth0-17:
+  name: "switch13"
+  nodes: "gdx-[307,310]"
+  rate: 1.G  
+  ip: 172.26.120.113
+  mac: 00:24:f9:2a:0e:41
+switch-bmc-0:
+  name: "netgear01"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.151
+  mac: 00:0f:b5:fc:0d:26
+switch-bmc-1:
+  name: "netgear02"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.152
+  mac: 00:22:3f:e6:f8:ce
+switch-bmc-2:
+  name: "netgear03"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.153
+  mac: 00:0f:b5:fb:70:89
+switch-bmc-3:
+  name: "netgear04"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.154
+  mac: 00:0f:b5:f5:79:2a
+switch-bmc-4:
+  name: "netgear05"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.155
+  mac: 00:0f:b5:fb:70:a5
+switch-bmc-5:
+  name: "netgear06"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.156
+  mac: aa:aa:aa:aa:aa:aa
+switch-bmc-6:
+  name: "netgear07"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.157
+  mac: aa:aa:aa:aa:aa:aa
+switch-bmc-7:
+  name: "netgear08"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.158
+  mac: 00:0f:b5:fc:0d:aa
+switch-bmc-8:
+  name: "procurve-bmc-09"
+  nodes: "gdx-[19,36]"
+  rate: 100.M  
+  ip: 172.26.120.159
+  mac: aa:aa:aa:aa:aa:aa
+switch-bmc-netgdx:
+  name: "netgearxy"
+  nodes: "netgdx-[1,30]"
+  rate: 1.G  
+  ip: 172.26.120.150
+  mac: aa:aa:aa:aa:aa:aa
+switch-rsa-0:
+  name: "mrv01"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.201
+  mac: aa:aa:aa:aa:aa:aa
+switch-rsa-1:
+  name: "mrv02"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.202
+  mac: 00:a0:9c:00:16:41
+switch-rsa-2:
+  name: "mrv03"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.203
+  mac: 00:a0:9c:00:12:dd
+switch-rsa-3:
+  name: "mrv04"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.204
+  mac: 00:a0:9c:00:12:e4
+switch-rsa-4:
+  name: "mrv05"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.205
+  mac: 00:a0:9c:00:10:ae
+switch-rsa-5:
+  name: "mrv06"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.206
+  mac: 00:a0:9c:00:16:42
+switch-rsa-6:
+  name: "mrv07"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.207
+  mac: aa:aa:aa:aa:aa:aa
+switch-rsa-7:
+  name: "mrv08"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.208
+  mac: aa:aa:aa:aa:aa:aa
+switch-rsa-8:
+  name: "mrv09"
+  nodes: "gdx-[19,36]"
+  rate: 1.G  
+  ip: 172.26.120.209
+  mac: 00:a0:9c:00:25:4a
+switch-rsa-netgdx:
+  name: "mrv00"
+  nodes: "netgdx-[1,30]"
+  rate: 1.G 
+  ip: 172.26.120.200
+  mac: aa:aa:aa:aa:aa:aa
+  
+switch-mx:
+  name: "switch-mx"
+  nodes: "gdx-[1,310]"
+  rate: 10.G  
+  ip: 1.1.1.1
+  mac: aa:aa:aa:aa:aa:aa
+switch-gw:
+  name-prod: "gw"
+  name-admin: "cisco"
+  nodes: "netgdx-[1,30]"
+  rate: 1.G 
+  ip-prod: 172.24.120.10
+  mac-prod: 00:11:5d:3d:50:00
+  ip-admin: 172.26.120.100
+  mac-admin: 00:11:5d:3d:50:00  
+  
\ No newline at end of file
diff --git a/generators/input/orsay.rb b/generators/input/orsay.rb
index 0e952a1f19e2c2632f0b0c48ab70742f29534fe5..e7f6ea52d8ac5920abfdccf9df426350c21f9a27 100755
--- a/generators/input/orsay.rb
+++ b/generators/input/orsay.rb
@@ -13,191 +13,5 @@ site :orsay do |site_uid|
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
     %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
     %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
-
-  cluster :netgdx do |cluster_uid|
-    model "IBM eServer 326m"
-    created_at nil
-    misc "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00"
-    30.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
-        architecture({
-          :smp_size => 2, 
-          :smt_size => 2,
-          :platform_type => "x86_64"
-          })
-        processor({
-          :vendor => "AMD",
-          :model => "AMD Opteron",
-          :version => "246",
-          :clock_speed => 2.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 1.MiB
-        })
-        main_memory({
-          :ram_size => 2.GiB, # bytes
-          :virtual_size => nil
-        })
-        operating_system({
-          :name => nil,
-          :release => nil,
-          :version => nil,
-          :kernel   => "2.6.26"
-        })
-        storage_devices [
-          {:interface => 'SATA', :size => 80.GB, :driver => nil}
-          ]
-        network_adapters [{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => nil,
-            :vendor => 'Broadcom',
-            :version => 'NetXtreme BCM5780',
-            :enabled => true,
-            :management => false,
-            :mountable => true,
-            :driver => 'tg3',
-            :mounted => true,
-            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-            :device => 'eth0',
-            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :switch => nil
-          },{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => nil,
-            :vendor => 'Broadcom',
-            :version => 'NetXtreme BCM5780',
-            :enabled => true,
-            :management => false,
-            :mountable => true,
-            :driver => 'tg3',
-            :mounted => true,
-            :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-            :device => 'eth1',
-            :ip => dns_lookup("#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
-            :switch => nil
-          },{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => nil,
-            :vendor => 'Broadcom',
-            :version => 'NetXtreme BCM5703',
-            :enabled => true,
-            :management => false,
-            :mountable => true,
-            :driver => 'tg3',
-            :mounted => true,
-            :network_address => "#{node_uid}-eth2.#{site_uid}.grid5000.fr",
-            :device => 'eth2',
-            :ip => dns_lookup("#{node_uid}-eth2.#{site_uid}.grid5000.fr"),
-            :switch => nil
-          }]  
-      end      
-    end
-  end # cluster net-gdx
-  
-  cluster :gdx do |cluster_uid|
-    model "IBM eServer 326m"
-    created_at nil
-    misc "bios:1.28/bcm:1.20.17/bmc:1.10/rsaII:1.00"
-    
-    # WARN: 2 nodes are missing (gdx-311 and gdx-312) and won't appear in the reference
-    (180+132-2).times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
-        architecture({
-          :smp_size => 2, 
-          :smt_size => 2,
-          :platform_type => "x86_64"
-          })
-        processor({
-          :vendor => "AMD",
-          :model => "AMD Opteron",
-          :version => "246",
-          :clock_speed => 2.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 1.MiB
-        })
-        main_memory({
-          :ram_size => 2.GiB, # bytes
-          :virtual_size => nil
-        })
-        operating_system({
-          :name => nil,
-          :release => nil,
-          :version => nil
-        })
-        storage_devices [
-          {:interface => 'SATA', :size => 80.GB, :driver => nil}
-          ]
-        network_adapters [{
-            :interface => 'Myrinet',
-            :rate => 10.G,
-            :mac => nil,
-            :vendor => 'Myrinet',
-            :version => '10G-PCIE-8A-C',
-            :enabled => true,
-            :management => false,
-            :mountable => true,
-            :driver => nil,
-            :mounted => true,
-            :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-            :device => 'myri0',
-            :ip => dns_lookup("#{node_uid}-myri0.#{site_uid}.grid5000.fr"),
-            :switch => nil
-          },{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => lookup('orsay', "#{node_uid}", 'mac_eth0'),
-            :vendor => 'Broadcom',
-            :version => 'NetXtreme BCM5780',
-            :enabled => true,
-            :management => false,
-            :mountable => true,
-            :driver => 'tg3',
-            :mounted => true,
-            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-            :device => 'eth0',
-            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-            :switch => nil
-          },{
-            :interface => 'Ethernet',
-            :rate => 1.G,
-            :mac => lookup('orsay', "#{node_uid}", 'mac_eth1'),
-            :vendor => 'Broadcom',
-            :version => 'NetXtreme BCM5780',
-            :enabled => true,
-            :management => false,
-            :mountable => true,
-            :driver => 'tg3',
-            :mounted => false,
-            :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-            :device => 'eth1',
-            :ip => dns_lookup("#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
-            :switch => nil
-          }]
-      end        
-    end
-    
-    # extension specifics, starting at node 181
-    (132-2).times do |i|
-      node "#{cluster_uid}-#{181+i}" do
-        processor({
-          :version => "250",
-          :clock_speed => 2.4.G
-        })
-      end
-    end
-    
-  end # cluster gdx
   
 end
diff --git a/generators/input/orsay.yaml b/generators/input/orsay.yaml
deleted file mode 100644
index 3dfdec47e02242aeee15e14e91193afec578b756..0000000000000000000000000000000000000000
--- a/generators/input/orsay.yaml
+++ /dev/null
@@ -1,3160 +0,0 @@
-gdx-100:
-  mac_eth0: 00:11:25:c4:4e:be
-  ip_eth0: 172.24.9.28
-  mac_eth1: 00:11:25:c4:4e:bf
-  ip_eth1: 172.24.136.28
-  ip_mgt: 172.26.136.28
-  mac_mgt: 00:11:25:91:48:B7
-gdx-101:
-  mac_eth0: 00:11:25:c4:51:8c
-  ip_eth0: 172.24.9.29
-  mac_eth1: 00:11:25:c4:51:8d
-  ip_eth1: 172.24.136.29
-  ip_mgt: 172.26.136.29
-  mac_mgt: 00:11:25:91:45:DF
-gdx-102:
-  mac_eth0: 00:11:25:c4:4e:de
-  ip_eth0: 172.24.9.30
-  mac_eth1: 00:11:25:c4:4e:df
-  ip_eth1: 172.24.136.30
-  ip_mgt: 172.26.136.30
-  mac_mgt: 00:11:25:91:49:61
-gdx-103:
-  mac_eth0: 00:11:25:c4:4e:fc
-  ip_eth0: 172.24.9.31
-  mac_eth1: 00:11:25:c4:4e:fd
-  ip_eth1: 172.24.136.31
-  ip_mgt: 172.26.136.31
-  mac_mgt: 00:11:25:91:46:1D
-gdx-104:
-  mac_eth0: 00:11:25:c4:52:4a
-  ip_eth0: 172.24.9.32
-  mac_eth1: 00:11:25:c4:52:4b
-  ip_eth1: 172.24.136.32
-  ip_mgt: 172.26.136.32
-  mac_mgt: 00:11:25:91:47:78
-gdx-105:
-  mac_eth0: 00:11:25:c4:4f:0a
-  ip_eth0: 172.24.9.33
-  mac_eth1: 00:11:25:c4:4f:0b
-  ip_eth1: 172.24.136.33
-  ip_mgt: 172.26.136.33
-  mac_mgt: 00:11:25:91:49:14
-gdx-106:
-  mac_eth0: 00:11:25:c4:4e:c2
-  ip_eth0: 172.24.9.34
-  mac_eth1: 00:11:25:c4:4e:c3
-  ip_eth1: 172.24.136.34
-  ip_mgt: 172.26.136.34
-  mac_mgt: 00:11:25:91:47:6A
-gdx-107:
-  mac_eth0: 00:11:25:c4:4e:d2
-  ip_eth0: 172.24.9.35
-  mac_eth1: 00:11:25:c4:4e:d3
-  ip_eth1: 172.24.136.35
-  ip_mgt: 172.26.136.35
-  mac_mgt: 00:11:25:91:48:8A
-gdx-108:
-  mac_eth0: 00:11:25:c4:51:bc
-  ip_eth0: 172.24.9.36
-  mac_eth1: 00:11:25:c4:51:bd
-  ip_eth1: 172.24.136.36
-  ip_mgt: 172.26.136.36
-  mac_mgt: 00:11:25:91:47:DC
-gdx-10:
-  mac_eth0: 00:11:25:c4:33:38
-  ip_eth0: 172.24.1.10
-  mac_eth1: 00:11:25:c4:33:39
-  ip_eth1: 172.24.128.10
-  ip_mgt: 172.26.128.10
-  mac_mgt: 00:11:25:91:47:58
-gdx-11:
-  mac_eth0: 00:11:25:c4:34:3e
-  ip_eth0: 172.24.1.11
-  mac_eth1: 00:11:25:c4:34:3f
-  ip_eth1: 172.24.128.11
-  ip_mgt: 172.26.128.11
-  mac_mgt: 00:11:25:91:48:EE
-gdx-127:
-  mac_eth0: 00:11:25:c4:4d:94
-  ip_eth0: 172.24.11.19
-  mac_eth1: 00:11:25:c4:4d:95
-  ip_eth1: 172.24.138.19
-  ip_mgt: 172.26.138.19
-  mac_mgt: 00:11:25:91:46:88
-gdx-128:
-  mac_eth0: 00:11:25:c4:53:18
-  ip_eth0: 172.24.11.20
-  mac_eth1: 00:11:25:c4:53:19
-  ip_eth1: 172.24.138.20
-  ip_mgt: 172.26.138.20
-  mac_mgt: 00:11:25:91:46:02
-gdx-129:
-  mac_eth0: 00:11:25:c4:4d:80
-  ip_eth0: 172.24.11.21
-  mac_eth1: 00:11:25:c4:4d:81
-  ip_eth1: 172.24.138.21
-  ip_mgt: 172.26.138.21
-  mac_mgt: 00:11:25:91:45:FB
-gdx-12:
-  mac_eth0: 00:11:25:c4:35:42
-  ip_eth0: 172.24.1.12
-  mac_eth1: 00:11:25:c4:35:43
-  ip_eth1: 172.24.128.12
-  ip_mgt: 172.26.128.12
-  mac_mgt: 00:11:25:91:45:B8
-gdx-130:
-  mac_eth0: 00:11:25:c4:54:6a
-  ip_eth0: 172.24.11.22
-  mac_eth1: 00:11:25:c4:54:6b
-  ip_eth1: 172.24.138.22
-  ip_mgt: 172.26.138.22
-  mac_mgt: 00:11:25:91:45:A5
-gdx-131:
-  mac_eth0: 00:11:25:c4:54:86
-  ip_eth0: 172.24.11.23
-  mac_eth1: 00:11:25:c4:54:87
-  ip_eth1: 172.24.138.23
-  ip_mgt: 172.26.138.23
-  mac_mgt: 00:11:25:91:46:AA
-gdx-132:
-  mac_eth0: 00:11:25:c4:4e:58
-  ip_eth0: 172.24.11.24
-  mac_eth1: 00:11:25:c4:4e:59
-  ip_eth1: 172.24.138.24
-  ip_mgt: 172.26.138.24
-  mac_mgt: 00:11:25:91:47:E3
-gdx-133:
-  mac_eth0: 00:11:25:c4:4e:82
-  ip_eth0: 172.24.12.25
-  mac_eth1: 00:11:25:c4:4e:83
-  ip_eth1: 172.24.139.25
-  ip_mgt: 172.26.139.25
-  mac_mgt: 00:11:25:91:47:93
-gdx-134:
-  mac_eth0: 00:11:25:c4:4f:4e
-  ip_eth0: 172.24.12.26
-  mac_eth1: 00:11:25:c4:4f:4f
-  ip_eth1: 172.24.139.26
-  ip_mgt: 172.26.139.26
-  mac_mgt: 00:11:25:91:48:1D
-gdx-135:
-  mac_eth0: 00:11:25:c4:53:e6
-  ip_eth0: 172.24.12.27
-  mac_eth1: 00:11:25:c4:53:e7
-  ip_eth1: 172.24.139.27
-  ip_mgt: 172.26.139.27
-  mac_mgt: 00:11:25:91:47:6B
-gdx-136:
-  mac_eth0: 00:11:25:c4:4d:40
-  ip_eth0: 172.24.12.28
-  mac_eth1: 00:11:25:c4:4d:41
-  ip_eth1: 172.24.139.28
-  ip_mgt: 172.26.139.28
-  mac_mgt: 00:11:25:91:48:A0
-gdx-137:
-  mac_eth0: 00:11:25:c4:4f:e2
-  ip_eth0: 172.24.12.29
-  mac_eth1: 00:11:25:c4:4f:e3
-  ip_eth1: 172.24.139.29
-  ip_mgt: 172.26.139.29
-  mac_mgt: 00:11:25:91:45:C6
-gdx-138:
-  mac_eth0: 00:11:25:c4:4d:4a
-  ip_eth0: 172.24.12.30
-  mac_eth1: 00:11:25:c4:4d:4b
-  ip_eth1: 172.24.139.30
-  ip_mgt: 172.26.139.30
-  mac_mgt: 00:11:25:91:46:22
-gdx-139:
-  mac_eth0: 00:11:25:c4:38:de
-  ip_eth0: 172.24.12.31
-  mac_eth1: 00:11:25:c4:38:df
-  ip_eth1: 172.24.139.31
-  ip_mgt: 172.26.139.31
-  mac_mgt: 00:11:25:91:45:CF
-gdx-13:
-  mac_eth0: 00:11:25:c4:34:48
-  ip_eth0: 172.24.2.13
-  mac_eth1: 00:11:25:c4:34:49
-  ip_eth1: 172.24.129.13
-  ip_mgt: 172.26.129.13
-  mac_mgt: 00:11:25:91:48:02
-gdx-140:
-  mac_eth0: 00:11:25:c4:24:02
-  ip_eth0: 172.24.12.32
-  mac_eth1: 00:11:25:c4:24:03
-  ip_eth1: 172.24.139.32
-  ip_mgt: 172.26.139.32
-  mac_mgt: 00:11:25:91:48:32
-gdx-141:
-  mac_eth0: 00:11:25:c4:3f:a8
-  ip_eth0: 172.24.12.33
-  mac_eth1: 00:11:25:c4:3f:a9
-  ip_eth1: 172.24.139.33
-  ip_mgt: 172.26.139.33
-  mac_mgt: 00:11:25:91:48:63
-gdx-142:
-  mac_eth0: 00:11:25:c4:4f:d8
-  ip_eth0: 172.24.12.34
-  mac_eth1: 00:11:25:c4:4f:d9
-  ip_eth1: 172.24.139.34
-  ip_mgt: 172.26.139.34
-  mac_mgt: 00:11:25:91:46:41
-gdx-143:
-  mac_eth0: 00:11:25:c4:4f:aa
-  ip_eth0: 172.24.12.35
-  mac_eth1: 00:11:25:c4:4f:ab
-  ip_eth1: 172.24.139.35
-  ip_mgt: 172.26.139.35
-  mac_mgt: 00:11:25:91:48:33
-gdx-144:
-  mac_eth0: 00:11:25:c4:50:0e
-  ip_eth0: 172.24.12.36
-  mac_eth1: 00:11:25:c4:50:0f
-  ip_eth1: 172.24.139.36
-  ip_mgt: 172.26.139.36
-  mac_mgt: 00:11:25:91:45:A6
-gdx-145:
-  mac_eth0: 00:11:25:c4:50:20
-  ip_eth0: 172.24.13.1
-  mac_eth1: 00:11:25:c4:50:21
-  ip_eth1: 172.24.140.1
-  ip_mgt: 172.26.140.1
-  mac_mgt: 00:11:25:91:45:AD
-gdx-146:
-  mac_eth0: 00:11:25:c4:4d:4c
-  ip_eth0: 172.24.13.2
-  mac_eth1: 00:11:25:c4:4d:4d
-  ip_eth1: 172.24.140.2
-  ip_mgt: 172.26.140.2
-  mac_mgt: 00:11:25:91:46:B4
-gdx-147:
-  mac_eth0: 00:11:25:c4:4d:fe
-  ip_eth0: 172.24.13.3
-  mac_eth1: 00:11:25:c4:4d:ff
-  ip_eth1: 172.24.140.3
-  ip_mgt: 172.26.140.3
-  mac_mgt: 00:11:25:91:47:22
-gdx-148:
-  mac_eth0: 00:11:25:c4:51:06
-  ip_eth0: 172.24.13.4
-  mac_eth1: 00:11:25:c4:51:07
-  ip_eth1: 172.24.140.4
-  ip_mgt: 172.26.140.4
-  mac_mgt: 00:11:25:91:47:FC
-gdx-149:
-  mac_eth0: 00:11:25:c4:4f:c0
-  ip_eth0: 172.24.13.5
-  mac_eth1: 00:11:25:c4:4f:c1
-  ip_eth1: 172.24.140.5
-  ip_mgt: 172.26.140.5
-  mac_mgt: 00:11:25:91:46:2C
-gdx-14:
-  mac_eth0: 00:11:25:c4:34:3c
-  ip_eth0: 172.24.2.14
-  mac_eth1: 00:11:25:c4:34:3d
-  ip_eth1: 172.24.129.14
-  ip_mgt: 172.26.129.14
-  mac_mgt: 00:11:25:91:48:91
-gdx-150:
-  mac_eth0: 00:11:25:c4:4f:02
-  ip_eth0: 172.24.13.6
-  mac_eth1: 00:11:25:c4:4f:03
-  ip_eth1: 172.24.140.6
-  ip_mgt: 172.26.140.6
-  mac_mgt: 00:11:25:91:47:B4
-gdx-151:
-  mac_eth0: 00:11:25:c4:53:78
-  ip_eth0: 172.24.13.7
-  mac_eth1: 00:11:25:c4:53:79
-  ip_eth1: 172.24.140.7
-  ip_mgt: 172.26.140.7
-  mac_mgt: 00:11:25:91:45:9D
-gdx-152:
-  mac_eth0: 00:11:25:c4:50:b6
-  ip_eth0: 172.24.13.8
-  mac_eth1: 00:11:25:c4:50:b7
-  ip_eth1: 172.24.140.8
-  ip_mgt: 172.26.140.8
-  mac_mgt: 00:11:25:91:49:23
-gdx-153:
-  mac_eth0: 00:11:25:c4:50:a8
-  ip_eth0: 172.24.13.9
-  mac_eth1: 00:11:25:c4:50:a9
-  ip_eth1: 172.24.140.9
-  ip_mgt: 172.26.140.9
-  mac_mgt: 00:11:25:91:46:07
-gdx-154:
-  mac_eth0: 00:11:25:c4:4d:2a
-  ip_eth0: 172.24.13.10
-  mac_eth1: 00:11:25:c4:4d:2b
-  ip_eth1: 172.24.140.10
-  ip_mgt: 172.26.140.10
-  mac_mgt: 00:11:25:91:46:DE
-gdx-155:
-  mac_eth0: 00:11:25:c4:50:a2
-  ip_eth0: 172.24.13.11
-  mac_eth1: 00:11:25:c4:50:a3
-  ip_eth1: 172.24.140.11
-  ip_mgt: 172.26.140.11
-  mac_mgt: 00:11:25:91:48:BA
-gdx-156:
-  mac_eth0: 00:11:25:c4:0b:06
-  ip_eth0: 172.24.13.12
-  mac_eth1: 00:11:25:c4:0b:07
-  ip_eth1: 172.24.140.12
-  ip_mgt: 172.26.140.12
-  mac_mgt: 00:11:25:91:48:76
-gdx-157:
-  mac_eth0: 00:11:25:c4:52:ca
-  ip_eth0: 172.24.14.13
-  mac_eth1: 00:11:25:c4:52:cb
-  ip_eth1: 172.24.141.13
-  ip_mgt: 172.26.141.13
-  mac_mgt: 00:11:25:91:47:71
-gdx-158:
-  mac_eth0: 00:11:25:c4:54:46
-  ip_eth0: 172.24.14.14
-  mac_eth1: 00:11:25:c4:54:47
-  ip_eth1: 172.24.141.14
-  ip_mgt: 172.26.141.14
-  mac_mgt: 00:11:25:91:46:B3
-gdx-159:
-  mac_eth0: 00:11:25:c4:4f:82
-  ip_eth0: 172.24.14.15
-  mac_eth1: 00:11:25:c4:4f:83
-  ip_eth1: 172.24.141.15
-  ip_mgt: 172.26.141.15
-  mac_mgt: 00:11:25:91:48:0D
-gdx-15:
-  mac_eth0: 00:11:25:c4:35:9b
-  ip_eth0: 172.24.2.15
-  mac_eth1: 00:11:25:c4:35:9c
-  ip_eth1: 172.24.129.15
-  ip_mgt: 172.26.129.15
-  mac_mgt: 00:11:25:91:48:A2
-gdx-160:
-  mac_eth0: 00:11:25:c4:4f:3a
-  ip_eth0: 172.24.14.16
-  mac_eth1: 00:11:25:c4:4f:3b
-  ip_eth1: 172.24.141.16
-  ip_mgt: 172.26.141.16
-  mac_mgt: 00:11:25:91:46:8D
-gdx-161:
-  mac_eth0: 00:11:25:c4:4f:8e
-  ip_eth0: 172.24.14.17
-  mac_eth1: 00:11:25:c4:4f:8f
-  ip_eth1: 172.24.141.17
-  ip_mgt: 172.26.141.17
-  mac_mgt: 00:11:25:91:48:B8
-gdx-162:
-  mac_eth0: 00:11:25:c4:4e:b8
-  ip_eth0: 172.24.14.18
-  mac_eth1: 00:11:25:c4:4e:b9
-  ip_eth1: 172.24.141.18
-  ip_mgt: 172.26.141.18
-  mac_mgt: 00:11:25:91:45:FE
-gdx-16:
-  mac_eth0: 00:11:25:c4:2e:ce
-  ip_eth0: 172.24.2.16
-  mac_eth1: 00:11:25:c4:2e:cf
-  ip_eth1: 172.24.129.16
-  ip_mgt: 172.26.129.16
-  mac_mgt: 00:11:25:91:45:8E
-gdx-17:
-  mac_eth0: 00:11:25:c4:34:56
-  ip_eth0: 172.24.2.17
-  mac_eth1: 00:11:25:c4:34:57
-  ip_eth1: 172.24.129.17
-  ip_mgt: 172.26.129.17
-  mac_mgt: 00:11:25:91:49:4A
-gdx-18:
-  mac_eth0: 00:11:25:c4:35:7a
-  ip_eth0: 172.24.2.18
-  mac_eth1: 00:11:25:c4:35:7b
-  ip_eth1: 172.24.129.18
-  ip_mgt: 172.26.129.18
-  mac_mgt: 00:11:25:91:48:AF
-gdx-19:
-  mac_eth0: 00:11:25:c4:34:4c
-  ip_eth0: 172.24.2.19
-  mac_eth1: 00:11:25:c4:34:4d
-  ip_eth1: 172.24.129.19
-  ip_mgt: 172.26.129.19
-  mac_mgt: 00:11:25:91:49:55
-gdx-1:
-  mac_eth0: 00:11:25:c4:35:7e
-  ip_eth0: 172.24.1.1
-  mac_eth1: 00:11:25:c4:35:7f
-  ip_eth1: 172.24.128.1
-  ip_mgt: 172.26.128.1
-  mac_mgt: 00:11:25:91:47:F2
-gdx-20:
-  mac_eth0: 00:11:25:c4:35:52
-  ip_eth0: 172.24.2.20
-  mac_eth1: 00:11:25:c4:35:53
-  ip_eth1: 172.24.129.20
-  ip_mgt: 172.26.129.20
-  mac_mgt: 00:11:25:91:45:7C
-gdx-22:
-  mac_eth0: 00:11:25:c4:34:5a
-  ip_eth0: 172.24.2.22
-  mac_eth1: 00:11:25:c4:34:5b
-  ip_eth1: 172.24.129.22
-  ip_mgt: 172.26.129.22
-  mac_mgt: 00:11:25:91:49:2A
-gdx-236:
-  mac_eth0: 00:11:25:c4:39:ac
-  ip_eth0: 172.24.20.20
-  mac_eth1: 00:11:25:c4:39:ad
-  ip_eth1: 172.24.147.20
-  ip_mgt: 172.26.147.20
-  mac_mgt: 00:11:25:91:47:F7
-gdx-237:
-  mac_eth0: 00:11:25:c4:3c:80
-  ip_eth0: 172.24.20.21
-  mac_eth1: 00:11:25:c4:3c:81
-  ip_eth1: 172.24.147.21
-  ip_mgt: 172.26.147.21
-  mac_mgt: 00:11:25:91:48:45
-gdx-238:
-  mac_eth0: 00:11:25:c4:3c:7e
-  ip_eth0: 172.24.20.22
-  mac_eth1: 00:11:25:c4:3c:7f
-  ip_eth1: 172.24.147.22
-  ip_mgt: 172.26.147.22
-  mac_mgt: 00:11:25:91:48:CF
-gdx-239:
-  mac_eth0: 00:11:25:c4:3f:50
-  ip_eth0: 172.24.20.23
-  mac_eth1: 00:11:25:c4:3f:51
-  ip_eth1: 172.24.147.23
-  ip_mgt: 172.26.147.23
-  mac_mgt: 00:11:25:91:48:C1
-gdx-23:
-  mac_eth0: 00:11:25:c4:34:ea
-  ip_eth0: 172.24.2.23
-  mac_eth1: 00:11:25:c4:34:eb
-  ip_eth1: 172.24.129.23
-  ip_mgt: 172.26.129.23
-  mac_mgt: 00:11:25:91:46:B7
-gdx-240:
-  mac_eth0: 00:11:25:c4:3e:34
-  ip_eth0: 172.24.20.24
-  mac_eth1: 00:11:25:c4:3e:35
-  ip_eth1: 172.24.147.24
-  ip_mgt: 172.26.147.24
-  mac_mgt: 00:11:25:91:46:09
-gdx-241:
-  mac_eth0: 00:11:25:c4:3c:74
-  ip_eth0: 172.24.21.25
-  mac_eth1: 00:11:25:c4:3c:75
-  ip_eth1: 172.24.148.25
-  ip_mgt: 172.26.148.25
-  mac_mgt: 00:11:25:91:46:5D
-gdx-242:
-  mac_eth0: 00:11:25:c4:2b:fc
-  ip_eth0: 172.24.21.26
-  mac_eth1: 00:11:25:c4:2b:fd
-  ip_eth1: 172.24.148.26
-  ip_mgt: 172.26.148.26
-  mac_mgt: 00:11:25:91:48:AD
-gdx-243:
-  mac_eth0: 00:11:25:c4:2b:58
-  ip_eth0: 172.24.21.27
-  mac_eth1: 00:11:25:c4:2b:59
-  ip_eth1: 172.24.148.27
-  ip_mgt: 172.26.148.27
-  mac_mgt: 00:11:25:91:46:7A
-gdx-244:
-  mac_eth0: 00:11:25:c4:10:fa
-  ip_eth0: 172.24.21.28
-  mac_eth1: 00:11:25:c4:10:fb
-  ip_eth1: 172.24.148.28
-  ip_mgt: 172.26.148.28
-  mac_mgt: 00:11:25:91:46:A3
-gdx-245:
-  mac_eth0: 00:11:25:c4:3a:4e
-  ip_eth0: 172.24.21.29
-  mac_eth1: 00:11:25:c4:3a:4f
-  ip_eth1: 172.24.148.29
-  ip_mgt: 172.26.148.29
-  mac_mgt: 00:11:25:91:47:EA
-gdx-246:
-  mac_eth0: 00:11:25:c4:38:e2
-  ip_eth0: 172.24.21.30
-  mac_eth1: 00:11:25:c4:38:e3
-  ip_eth1: 172.24.148.30
-  ip_mgt: 172.26.148.30
-  mac_mgt: 00:11:25:91:46:0E
-gdx-247:
-  mac_eth0: 00:11:25:c4:32:76
-  ip_eth0: 172.24.21.31
-  mac_eth1: 00:11:25:c4:32:77
-  ip_eth1: 172.24.148.31
-  ip_mgt: 172.26.148.31
-  mac_mgt: 00:11:25:91:48:F4
-gdx-248:
-  mac_eth0: 00:11:25:c4:31:fa
-  ip_eth0: 172.24.21.32
-  mac_eth1: 00:11:25:c4:31:fb
-  ip_eth1: 172.24.148.32
-  ip_mgt: 172.26.148.32
-  mac_mgt: 00:11:25:91:48:3B
-gdx-249:
-  mac_eth0: 00:11:25:c4:33:40
-  ip_eth0: 172.24.21.33
-  mac_eth1: 00:11:25:c4:33:41
-  ip_eth1: 172.24.148.33
-  ip_mgt: 172.26.148.33
-  mac_mgt: 00:11:25:91:45:E9
-gdx-24:
-  mac_eth0: 00:11:25:c4:34:50
-  ip_eth0: 172.24.2.24
-  mac_eth1: 00:11:25:c4:34:51
-  ip_eth1: 172.24.129.24
-  ip_mgt: 172.26.129.24
-  mac_mgt: 00:11:25:91:47:39
-gdx-250:
-  mac_eth0: 00:11:25:c4:3b:9a
-  ip_eth0: 172.24.21.34
-  mac_eth1: 00:11:25:c4:3b:9b
-  ip_eth1: 172.24.148.34
-  ip_mgt: 172.26.148.34
-  mac_mgt: 00:11:25:91:45:E8
-gdx-251:
-  mac_eth0: 00:11:25:c4:3f:90
-  ip_eth0: 172.24.21.35
-  mac_eth1: 00:11:25:c4:3f:91
-  ip_eth1: 172.24.148.35
-  ip_mgt: 172.26.148.35
-  mac_mgt: 00:11:25:91:47:40
-gdx-252:
-  mac_eth0: 00:11:25:c4:32:5a
-  ip_eth0: 172.24.21.36
-  mac_eth1: 00:11:25:c4:32:5b
-  ip_eth1: 172.24.148.36
-  ip_mgt: 172.26.148.36
-  mac_mgt: 00:11:25:91:48:28
-gdx-253:
-  mac_eth0: 00:11:25:c4:34:68
-  ip_eth0: 172.24.22.1
-  mac_eth1: 00:11:25:c4:34:69
-  ip_eth1: 172.24.149.1
-  ip_mgt: 172.26.149.1
-  mac_mgt: 00:11:25:91:47:CC
-gdx-254:
-  mac_eth0: 00:11:25:c4:35:b8
-  ip_eth0: 172.24.22.2
-  mac_eth1: 00:11:25:c4:35:b9
-  ip_eth1: 172.24.149.2
-  ip_mgt: 172.26.149.2
-  mac_mgt: 00:11:25:91:46:C7
-gdx-255:
-  mac_eth0: 00:11:25:c4:09:86
-  ip_eth0: 172.24.22.3
-  mac_eth1: 00:11:25:c4:09:87
-  ip_eth1: 172.24.149.3
-  ip_mgt: 172.26.149.3
-  mac_mgt: 00:11:25:91:48:BC
-gdx-256:
-  mac_eth0: 00:11:25:c4:35:90
-  ip_eth0: 172.24.22.4
-  mac_eth1: 00:11:25:c4:35:91
-  ip_eth1: 172.24.149.4
-  ip_mgt: 172.26.149.4
-  mac_mgt: 00:11:25:91:47:F0
-gdx-257:
-  mac_eth0: 00:11:25:c4:35:62
-  ip_eth0: 172.24.22.5
-  mac_eth1: 00:11:25:c4:35:63
-  ip_eth1: 172.24.149.5
-  ip_mgt: 172.26.149.5
-  mac_mgt: 00:11:25:91:47:E2
-gdx-258:
-  mac_eth0: 00:11:25:c4:13:1a
-  ip_eth0: 172.24.22.6
-  mac_eth1: 00:11:25:c4:13:1b
-  ip_eth1: 172.24.149.6
-  ip_mgt: 172.26.149.6
-  mac_mgt: 00:11:25:91:47:7C
-gdx-259:
-  mac_eth0: 00:11:25:c4:35:6a
-  ip_eth0: 172.24.22.7
-  mac_eth1: 00:11:25:c4:35:6b
-  ip_eth1: 172.24.149.7
-  ip_mgt: 172.26.149.7
-  mac_mgt: 00:11:25:91:49:15
-gdx-260:
-  mac_eth0: 00:11:25:c4:33:82
-  ip_eth0: 172.24.22.8
-  mac_eth1: 00:11:25:c4:33:83
-  ip_eth1: 172.24.149.8
-  ip_mgt: 172.26.149.8
-  mac_mgt: 00:11:25:91:45:D3
-gdx-261:
-  mac_eth0: 00:11:25:c4:2d:72
-  ip_eth0: 172.24.22.9
-  mac_eth1: 00:11:25:c4:2d:73
-  ip_eth1: 172.24.149.9
-  ip_mgt: 172.26.149.9
-  mac_mgt: 00:11:25:91:48:7B
-gdx-262:
-  mac_eth0: 00:11:25:c4:34:e8
-  ip_eth0: 172.24.22.10
-  mac_eth1: 00:11:25:c4:34:e9
-  ip_eth1: 172.24.149.10
-  ip_mgt: 172.26.149.10
-  mac_mgt: 00:11:25:91:47:46
-gdx-263:
-  mac_eth0: 00:11:25:c4:35:88
-  ip_eth0: 172.24.22.11
-  mac_eth1: 00:11:25:c4:35:89
-  ip_eth1: 172.24.149.11
-  ip_mgt: 172.26.149.11
-  mac_mgt: 00:11:25:91:48:07
-gdx-264:
-  mac_eth0: 00:11:25:c4:33:5e
-  ip_eth0: 172.24.22.12
-  mac_eth1: 00:11:25:c4:33:5f
-  ip_eth1: 172.24.149.12
-  ip_mgt: 172.26.149.12
-  mac_mgt: 00:11:25:91:48:14
-gdx-266:
-  mac_eth0: 00:11:25:c4:34:8a
-  ip_eth0: 172.24.23.14
-  mac_eth1: 00:11:25:c4:34:8b
-  ip_eth1: 172.24.150.14
-  ip_mgt: 172.26.150.14
-  mac_mgt: 00:11:25:91:46:60
-gdx-268:
-  mac_eth0: 00:11:25:c4:34:4e
-  ip_eth0: 172.24.23.16
-  mac_eth1: 00:11:25:c4:34:4f
-  ip_eth1: 172.24.150.16
-  ip_mgt: 172.26.150.16
-  mac_mgt: 00:11:25:91:45:87
-gdx-269:
-  mac_eth0: 00:11:25:c4:33:0e
-  ip_eth0: 172.24.23.17
-  mac_eth1: 00:11:25:c4:33:0f
-  ip_eth1: 172.24.150.17
-  ip_mgt: 172.26.150.17
-  mac_mgt: 00:11:25:91:46:D0
-gdx-26:
-  mac_eth0: 00:11:25:c4:35:a4
-  ip_eth0: 172.24.3.26
-  mac_eth1: 00:11:25:c4:35:a5
-  ip_eth1: 172.24.130.26
-  ip_mgt: 172.26.130.26
-  mac_mgt: 00:11:25:91:48:A5
-gdx-270:
-  mac_eth0: 00:11:25:c4:35:48
-  ip_eth0: 172.24.23.18
-  mac_eth1: 00:11:25:c4:35:49
-  ip_eth1: 172.24.150.18
-  ip_mgt: 172.26.150.18
-  mac_mgt: 00:11:25:91:46:CF
-gdx-271:
-  mac_eth0: 00:11:25:c4:31:92
-  ip_eth0: 172.24.23.19
-  mac_eth1: 00:11:25:c4:31:93
-  ip_eth1: 172.24.150.19
-  ip_mgt: 172.26.150.19
-  mac_mgt: 00:11:25:91:47:7D
-gdx-272:
-  mac_eth0: 00:11:25:c4:2f:20
-  ip_eth0: 172.24.23.20
-  mac_eth1: 00:11:25:c4:2f:21
-  ip_eth1: 172.24.150.20
-  ip_mgt: 172.26.150.20
-  mac_mgt: 00:11:25:91:48:15
-gdx-273:
-  mac_eth0: 00:11:25:c4:32:ee
-  ip_eth0: 172.24.23.21
-  mac_eth1: 00:11:25:c4:32:ef
-  ip_eth1: 172.24.150.21
-  ip_mgt: 172.26.150.21
-  mac_mgt: 00:11:25:91:46:99
-gdx-274:
-  mac_eth0: 00:11:25:c4:35:c0
-  ip_eth0: 172.24.23.22
-  mac_eth1: 00:11:25:c4:35:c1
-  ip_eth1: 172.24.150.22
-  ip_mgt: 172.26.150.22
-  mac_mgt: 00:11:25:91:45:C9
-gdx-275:
-  mac_eth0: 00:11:25:c4:11:38
-  ip_eth0: 172.24.23.23
-  mac_eth1: 00:11:25:c4:11:39
-  ip_eth1: 172.24.150.23
-  ip_mgt: 172.26.150.23
-  mac_mgt: 00:11:25:91:45:F0
-gdx-276:
-  mac_eth0: 00:11:25:c4:35:b6
-  ip_eth0: 172.24.23.24
-  mac_eth1: 00:11:25:c4:35:b7
-  ip_eth1: 172.24.150.24
-  ip_mgt: 172.26.150.24
-  mac_mgt: 00:09:6B:5E:FB:10
-gdx-277:
-  mac_eth0: 00:11:25:c4:34:58
-  ip_eth0: 172.24.24.25
-  mac_eth1: 00:11:25:c4:34:59
-  ip_eth1: 172.24.151.25
-  ip_mgt: 172.26.151.25
-  mac_mgt: 00:11:25:91:49:5E
-gdx-278:
-  mac_eth0: 00:11:25:c4:34:46
-  ip_eth0: 172.24.24.26
-  mac_eth1: 00:11:25:c4:34:47
-  ip_eth1: 172.24.151.26
-  ip_mgt: 172.26.151.26
-  mac_mgt: 00:11:25:91:47:6C
-gdx-279:
-  mac_eth0: 00:11:25:c4:33:96
-  ip_eth0: 172.24.24.27
-  mac_eth1: 00:11:25:c4:33:97
-  ip_eth1: 172.24.151.27
-  ip_mgt: 172.26.151.27
-  mac_mgt: 00:11:25:91:46:42
-gdx-27:
-  mac_eth0: 00:11:25:c4:31:4e
-  ip_eth0: 172.24.3.27
-  mac_eth1: 00:11:25:c4:31:4f
-  ip_eth1: 172.24.130.27
-  ip_mgt: 172.26.130.27
-  mac_mgt: 00:11:25:91:49:1C
-gdx-280:
-  mac_eth0: 00:11:25:c4:33:20
-  ip_eth0: 172.24.24.28
-  mac_eth1: 00:11:25:c4:33:21
-  ip_eth1: 172.24.151.28
-  ip_mgt: 172.26.151.28
-  mac_mgt: 00:11:25:91:46:92
-gdx-281:
-  mac_eth0: 00:11:25:c4:33:18
-  ip_eth0: 172.24.24.29
-  mac_eth1: 00:11:25:c4:33:19
-  ip_eth1: 172.24.151.29
-  ip_mgt: 172.26.151.29
-  mac_mgt: 00:11:25:91:45:7F
-gdx-282:
-  mac_eth0: 00:11:25:c4:31:44
-  ip_eth0: 172.24.24.30
-  mac_eth1: 00:11:25:c4:31:45
-  ip_eth1: 172.24.151.30
-  ip_mgt: 172.26.151.30
-  mac_mgt: 00:11:25:91:47:11
-gdx-283:
-  mac_eth0: 00:11:25:c4:34:5e
-  ip_eth0: 172.24.24.31
-  mac_eth1: 00:11:25:c4:34:5f
-  ip_eth1: 172.24.151.31
-  ip_mgt: 172.26.151.31
-  mac_mgt: 00:11:25:91:45:9E
-gdx-285:
-  mac_eth0: 00:11:25:c4:35:be
-  ip_eth0: 172.24.24.33
-  mac_eth1: 00:11:25:c4:35:bf
-  ip_eth1: 172.24.151.33
-  ip_mgt: 172.26.151.33
-  mac_mgt: 00:11:25:91:48:CE
-gdx-286:
-  mac_eth0: 00:11:25:c4:2a:c2
-  ip_eth0: 172.24.24.34
-  mac_eth1: 00:11:25:c4:2a:c3
-  ip_eth1: 172.24.151.34
-  ip_mgt: 172.26.151.34
-  mac_mgt: 00:11:25:91:45:DA
-gdx-287:
-  mac_eth0: 00:11:25:c4:34:40
-  ip_eth0: 172.24.24.35
-  mac_eth1: 00:11:25:c4:34:41
-  ip_eth1: 172.24.151.35
-  ip_mgt: 172.26.151.35
-  mac_mgt: 00:11:25:91:46:33
-gdx-288:
-  mac_eth0: 00:11:25:c4:34:66
-  ip_eth0: 172.24.24.36
-  mac_eth1: 00:11:25:c4:34:67
-  ip_eth1: 172.24.151.36
-  ip_mgt: 172.26.151.36
-  mac_mgt: 00:11:25:91:46:58
-gdx-289:
-  mac_eth0: 00:11:25:c4:33:68
-  ip_eth0: 172.24.25.1
-  mac_eth1: 00:11:25:c4:33:69
-  ip_eth1: 172.24.152.1
-  ip_mgt: 172.26.152.1
-  mac_mgt: 00:11:25:91:48:22
-gdx-28:
-  mac_eth0: 00:11:25:c4:34:6e
-  ip_eth0: 172.24.3.28
-  mac_eth1: 00:11:25:c4:34:6f
-  ip_eth1: 172.24.130.28
-  ip_mgt: 172.26.130.28
-  mac_mgt: 00:11:25:91:49:01
-gdx-291:
-  mac_eth0: 00:11:25:c4:33:1c
-  ip_eth0: 172.24.25.3
-  mac_eth1: 00:11:25:c4:33:1d
-  ip_eth1: 172.24.152.3
-  ip_mgt: 172.26.152.3
-  mac_mgt: 00:11:25:91:47:77
-gdx-292:
-  mac_eth0: 00:11:25:c4:33:88
-  ip_eth0: 172.24.25.4
-  mac_eth1: 00:11:25:c4:33:89
-  ip_eth1: 172.24.152.4
-  ip_mgt: 172.26.152.4
-  mac_mgt: 00:11:25:91:46:19
-gdx-293:
-  mac_eth0: 00:11:25:c4:33:4a
-  ip_eth0: 172.24.25.5
-  mac_eth1: 00:11:25:c4:33:4b
-  ip_eth1: 172.24.152.5
-  ip_mgt: 172.26.152.5
-  mac_mgt: 00:11:25:91:43:D8
-gdx-294:
-  mac_eth0: 00:11:25:c4:33:24
-  ip_eth0: 172.24.25.6
-  mac_eth1: 00:11:25:c4:33:25
-  ip_eth1: 172.24.152.6
-  ip_mgt: 172.26.152.6
-  mac_mgt: 00:11:25:91:47:EF
-gdx-295:
-  mac_eth0: 00:11:25:c4:33:7a
-  ip_eth0: 172.24.25.7
-  mac_eth1: 00:11:25:c4:33:7b
-  ip_eth1: 172.24.152.7
-  ip_mgt: 172.26.152.7
-  mac_mgt: 00:11:25:91:46:5A
-gdx-296:
-  mac_eth0: 00:11:25:c4:20:06
-  ip_eth0: 172.24.25.8
-  mac_eth1: 00:11:25:c4:20:07
-  ip_eth1: 172.24.152.8
-  ip_mgt: 172.26.152.8
-  mac_mgt: 00:11:25:91:47:AB
-gdx-297:
-  mac_eth0: 00:11:25:c4:33:3c
-  ip_eth0: 172.24.25.9
-  mac_eth1: 00:11:25:c4:33:3d
-  ip_eth1: 172.24.152.9
-  ip_mgt: 172.26.152.9
-  mac_mgt: 00:11:25:91:47:D2
-gdx-298:
-  mac_eth0: 00:11:25:c4:33:48
-  ip_eth0: 172.24.25.10
-  mac_eth1: 00:11:25:c4:33:49
-  ip_eth1: 172.24.152.10
-  ip_mgt: 172.26.152.10
-  mac_mgt: 00:11:25:91:46:8E
-gdx-299:
-  mac_eth0: 00:11:25:c4:33:46
-  ip_eth0: 172.24.25.11
-  mac_eth1: 00:11:25:c4:33:47
-  ip_eth1: 172.24.152.11
-  ip_mgt: 172.26.152.11
-  mac_mgt: 00:11:25:91:47:0B
-gdx-2:
-  mac_eth0: 00:11:25:c4:35:56
-  ip_eth0: 172.24.1.2
-  mac_eth1: 00:11:25:c4:35:57
-  ip_eth1: 172.24.128.2
-  ip_mgt: 172.26.128.2
-  mac_mgt: 00:11:25:91:48:A7
-gdx-300:
-  mac_eth0: 00:11:25:c4:33:14
-  ip_eth0: 172.24.25.12
-  mac_eth1: 00:11:25:c4:33:15
-  ip_eth1: 172.24.152.12
-  ip_mgt: 172.26.152.12
-  mac_mgt: 00:11:25:91:45:A9
-gdx-301:
-  mac_eth0: 00:11:25:c4:35:06
-  ip_eth0: 172.24.26.13
-  mac_eth1: 00:11:25:c4:35:07
-  ip_eth1: 172.24.153.13
-  ip_mgt: 172.26.153.13
-  mac_mgt: 00:11:25:91:45:C4
-gdx-302:
-  mac_eth0: 00:11:25:c4:34:42
-  ip_eth0: 172.24.26.14
-  mac_eth1: 00:11:25:c4:34:43
-  ip_eth1: 172.24.153.14
-  ip_mgt: 172.26.153.14
-  mac_mgt: 00:11:25:91:46:64
-gdx-303:
-  mac_eth0: 00:11:25:c4:0f:10
-  ip_eth0: 172.24.26.15
-  mac_eth1: 00:11:25:c4:0f:11
-  ip_eth1: 172.24.153.15
-  ip_mgt: 172.26.153.15
-  mac_mgt: 00:11:25:91:45:9A
-gdx-304:
-  mac_eth0: 00:11:25:c4:33:58
-  ip_eth0: 172.24.26.16
-  mac_eth1: 00:11:25:c4:33:59
-  ip_eth1: 172.24.153.16
-  ip_mgt: 172.26.153.16
-  mac_mgt: 00:11:25:91:47:9C
-gdx-305:
-  mac_eth0: 00:11:25:c4:34:62
-  ip_eth0: 172.24.26.17
-  mac_eth1: 00:11:25:c4:34:63
-  ip_eth1: 172.24.153.17
-  ip_mgt: 172.26.153.17
-  mac_mgt: 00:11:25:91:46:5B
-gdx-306:
-  mac_eth0: 00:11:25:c4:41:5a
-  ip_eth0: 172.24.26.18
-  mac_eth1: 00:11:25:c4:41:5b
-  ip_eth1: 172.24.153.18
-  ip_mgt: 172.26.153.18
-  mac_mgt: 00:11:25:91:46:35
-gdx-30:
-  mac_eth0: 00:11:25:c4:35:2c
-  ip_eth0: 172.24.3.30
-  mac_eth1: 00:11:25:c4:35:2d
-  ip_eth1: 172.24.130.30
-  ip_mgt: 172.26.130.30
-  mac_mgt: 00:11:25:91:46:61
-gdx-31:
-  mac_eth0: 00:11:25:c4:35:24
-  ip_eth0: 172.24.3.31
-  mac_eth1: 00:11:25:c4:35:25
-  ip_eth1: 172.24.130.31
-  ip_mgt: 172.26.130.31
-  mac_mgt: 00:11:25:91:45:C5
-gdx-32:
-  mac_eth0: 00:11:25:c4:35:08
-  ip_eth0: 172.24.3.32
-  mac_eth1: 00:11:25:c4:35:09
-  ip_eth1: 172.24.130.32
-  ip_mgt: 172.26.130.32
-  mac_mgt: 00:11:25:91:49:3D
-gdx-33:
-  mac_eth0: 00:11:25:c4:34:70
-  ip_eth0: 172.24.3.33
-  mac_eth1: 00:11:25:c4:34:71
-  ip_eth1: 172.24.130.33
-  ip_mgt: 172.26.130.33
-  mac_mgt: 00:11:25:91:45:EB
-gdx-34:
-  mac_eth0: 00:11:25:c4:33:8e
-  ip_eth0: 172.24.3.34
-  mac_eth1: 00:11:25:c4:33:8f
-  ip_eth1: 172.24.130.34
-  ip_mgt: 172.26.130.34
-  mac_mgt: 00:11:25:91:49:34
-gdx-35:
-  mac_eth0: 00:11:25:c4:34:7a
-  ip_eth0: 172.24.3.35
-  mac_eth1: 00:11:25:c4:34:7b
-  ip_eth1: 172.24.130.35
-  ip_mgt: 172.26.130.35
-  mac_mgt: 00:11:25:91:47:C5
-gdx-36:
-  mac_eth0: 00:11:25:c4:33:56
-  ip_eth0: 172.24.3.36
-  mac_eth1: 00:11:25:c4:33:57
-  ip_eth1: 172.24.130.36
-  ip_mgt: 172.26.130.36
-  mac_mgt: 00:11:25:91:45:E7
-gdx-37:
-  mac_eth0: 00:11:25:c4:31:66
-  ip_eth0: 172.24.4.1
-  mac_eth1: 00:11:25:c4:31:67
-  ip_eth1: 172.24.131.1
-  ip_mgt: 172.26.131.1
-  mac_mgt: 00:11:25:91:48:3C
-gdx-38:
-  mac_eth0: 00:11:25:c4:34:6c
-  ip_eth0: 172.24.4.2
-  mac_eth1: 00:11:25:c4:34:6d
-  ip_eth1: 172.24.131.2
-  ip_mgt: 172.26.131.2
-  mac_mgt: 00:11:25:91:47:26
-gdx-39:
-  mac_eth0: 00:11:25:c4:34:4a
-  ip_eth0: 172.24.4.3
-  mac_eth1: 00:11:25:c4:34:4b
-  ip_eth1: 172.24.131.3
-  ip_mgt: 172.26.131.3
-  mac_mgt: 00:11:25:91:45:A8
-gdx-3:
-  mac_eth0: 00:11:25:c4:35:3a
-  ip_eth0: 172.24.1.3
-  mac_eth1: 00:11:25:c4:35:3b
-  ip_eth1: 172.24.128.3
-  ip_mgt: 172.26.128.3
-  mac_mgt: 00:11:25:91:47:3B
-gdx-40:
-  mac_eth0: 00:11:25:c4:33:66
-  ip_eth0: 172.24.4.4
-  mac_eth1: 00:11:25:c4:33:67
-  ip_eth1: 172.24.131.4
-  ip_mgt: 172.26.131.4
-  mac_mgt: 00:11:25:91:46:84
-gdx-41:
-  mac_eth0: 00:11:25:c4:34:86
-  ip_eth0: 172.24.4.5
-  mac_eth1: 00:11:25:c4:34:87
-  ip_eth1: 172.24.131.5
-  ip_mgt: 172.26.131.5
-  mac_mgt: 00:11:25:91:45:AB
-gdx-42:
-  mac_eth0: 00:11:25:c4:2b:f0
-  ip_eth0: 172.24.4.6
-  mac_eth1: 00:11:25:c4:2b:f1
-  ip_eth1: 172.24.131.6
-  ip_mgt: 172.26.131.6
-  mac_mgt: 00:11:25:91:49:2C
-gdx-43:
-  mac_eth0: 00:11:25:c4:33:2a
-  ip_eth0: 172.24.4.7
-  mac_eth1: 00:11:25:c4:33:2b
-  ip_eth1: 172.24.131.7
-  ip_mgt: 172.26.131.7
-  mac_mgt: 00:11:25:91:45:BD
-gdx-44:
-  mac_eth0: 00:11:25:c4:2f:50
-  ip_eth0: 172.24.4.8
-  mac_eth1: 00:11:25:c4:2f:51
-  ip_eth1: 172.24.131.8
-  ip_mgt: 172.26.131.8
-  mac_mgt: 00:11:25:91:48:EC
-gdx-45:
-  mac_eth0: 00:11:25:c4:35:18
-  ip_eth0: 172.24.4.9
-  mac_eth1: 00:11:25:c4:35:19
-  ip_eth1: 172.24.131.9
-  ip_mgt: 172.26.131.9
-  mac_mgt: 00:11:25:91:49:3F
-gdx-46:
-  mac_eth0: 00:11:25:c4:09:c6
-  ip_eth0: 172.24.4.10
-  mac_eth1: 00:11:25:c4:09:c7
-  ip_eth1: 172.24.131.10
-  ip_mgt: 172.26.131.10
-  mac_mgt: 00:11:25:91:76:3B
-gdx-47:
-  mac_eth0: 00:11:25:c4:35:99
-  ip_eth0: 172.24.4.11
-  mac_eth1: 00:11:25:c4:35:9a
-  ip_eth1: 172.24.131.11
-  ip_mgt: 172.26.131.11
-  mac_mgt: 00:11:25:91:48:52
-gdx-48:
-  mac_eth0: 00:11:25:c4:2d:6c
-  ip_eth0: 172.24.4.12
-  mac_eth1: 00:11:25:c4:2d:6d
-  ip_eth1: 172.24.131.12
-  ip_mgt: 172.26.131.12
-  mac_mgt: 00:11:25:91:46:06
-gdx-49:
-  mac_eth0: 00:11:25:c4:33:16
-  ip_eth0: 172.24.5.13
-  mac_eth1: 00:11:25:c4:33:17
-  ip_eth1: 172.24.132.13
-  ip_mgt: 172.26.132.13
-  mac_mgt: 00:11:25:91:49:11
-gdx-4:
-  mac_eth0: 00:11:25:c4:35:40
-  ip_eth0: 172.24.1.4
-  mac_eth1: 00:11:25:c4:35:41
-  ip_eth1: 172.24.128.4
-  ip_mgt: 172.26.128.4
-  mac_mgt: 00:11:25:91:49:63
-gdx-50:
-  mac_eth0: 00:11:25:c4:33:92
-  ip_eth0: 172.24.5.14
-  mac_eth1: 00:11:25:c4:33:93
-  ip_eth1: 172.24.132.14
-  ip_mgt: 172.26.132.14
-  mac_mgt: 00:11:25:91:49:3C
-gdx-51:
-  mac_eth0: 00:11:25:c4:49:8e
-  ip_eth0: 172.24.5.15
-  mac_eth1: 00:11:25:c4:49:8f
-  ip_eth1: 172.24.132.15
-  ip_mgt: 172.26.132.15
-  mac_mgt: 00:11:25:91:45:C1
-gdx-52:
-  mac_eth0: 00:11:25:c4:35:97
-  ip_eth0: 172.24.5.16
-  mac_eth1: 00:11:25:c4:35:98
-  ip_eth1: 172.24.132.16
-  ip_mgt: 172.26.132.16
-  mac_mgt: 00:11:25:91:47:21
-gdx-54:
-  mac_eth0: 00:11:25:c4:35:bc
-  ip_eth0: 172.24.5.18
-  mac_eth1: 00:11:25:c4:35:bd
-  ip_eth1: 172.24.132.18
-  ip_mgt: 172.26.132.18
-  mac_mgt: 00:11:25:91:45:93
-gdx-55:
-  mac_eth0: 00:11:25:c4:3b:bc
-  ip_eth0: 172.24.5.19
-  mac_eth1: 00:11:25:c4:3b:bd
-  ip_eth1: 172.24.132.19
-  ip_mgt: 172.26.132.19
-  mac_mgt: 00:11:25:91:49:0B
-gdx-56:
-  mac_eth0: 00:11:25:c4:3c:7c
-  ip_eth0: 172.24.5.20
-  mac_eth1: 00:11:25:c4:3c:7d
-  ip_eth1: 172.24.132.20
-  ip_mgt: 172.26.132.20
-  mac_mgt: 00:11:25:91:47:96
-gdx-57:
-  mac_eth0: 00:11:25:c4:3c:24
-  ip_eth0: 172.24.5.21
-  mac_eth1: 00:11:25:c4:3c:25
-  ip_eth1: 172.24.132.21
-  ip_mgt: 172.26.132.21
-  mac_mgt: 00:11:25:91:49:50
-gdx-58:
-  mac_eth0: 00:11:25:c4:39:3e
-  ip_eth0: 172.24.5.22
-  mac_eth1: 00:11:25:c4:39:3f
-  ip_eth1: 172.24.132.22
-  ip_mgt: 172.26.132.22
-  mac_mgt: 00:11:25:91:46:51
-gdx-59:
-  mac_eth0: 00:11:25:c4:2e:30
-  ip_eth0: 172.24.5.23
-  mac_eth1: 00:11:25:c4:2e:31
-  ip_eth1: 172.24.132.23
-  ip_mgt: 172.26.132.23
-  mac_mgt: 00:11:25:91:49:03
-gdx-5:
-  mac_eth0: 00:11:25:c4:33:52
-  ip_eth0: 172.24.1.5
-  mac_eth1: 00:11:25:c4:33:53
-  ip_eth1: 172.24.128.5
-  ip_mgt: 172.26.128.5
-  mac_mgt: 00:11:25:91:47:B0
-gdx-6:
-  mac_eth0: 00:11:25:c4:35:1e
-  ip_eth0: 172.24.1.6
-  mac_eth1: 00:11:25:c4:35:1f
-  ip_eth1: 172.24.128.6
-  ip_mgt: 172.26.128.6
-  mac_mgt: 00:11:25:91:48:17
-gdx-71:
-  mac_eth0: 00:11:25:c4:35:78
-  ip_eth0: 172.24.6.35
-  mac_eth1: 00:11:25:c4:35:79
-  ip_eth1: 172.24.133.35
-  ip_mgt: 172.26.133.35
-  mac_mgt: 00:11:25:91:49:1F
-gdx-73:
-  mac_eth0: 00:11:25:c4:35:9e
-  ip_eth0: 172.24.7.1
-  mac_eth1: 00:11:25:c4:35:9f
-  ip_eth1: 172.24.134.1
-  ip_mgt: 172.26.134.1
-  mac_mgt: 00:11:25:91:46:80
-gdx-74:
-  mac_eth0: 00:11:25:c4:2d:0a
-  ip_eth0: 172.24.7.2
-  mac_eth1: 00:11:25:c4:2d:0b
-  ip_eth1: 172.24.134.2
-  ip_mgt: 172.26.134.2
-  mac_mgt: 00:11:25:91:48:46
-gdx-75:
-  mac_eth0: 00:11:25:c4:39:ae
-  ip_eth0: 172.24.7.3
-  mac_eth1: 00:11:25:c4:39:af
-  ip_eth1: 172.24.134.3
-  ip_mgt: 172.26.134.3
-  mac_mgt: 00:11:25:91:49:00
-gdx-76:
-  mac_eth0: 00:11:25:c4:2b:2c
-  ip_eth0: 172.24.7.4
-  mac_eth1: 00:11:25:c4:2b:2d
-  ip_eth1: 172.24.134.4
-  ip_mgt: 172.26.134.4
-  mac_mgt: 00:11:25:91:49:37
-gdx-77:
-  mac_eth0: 00:11:25:c4:38:94
-  ip_eth0: 172.24.7.5
-  mac_eth1: 00:11:25:c4:38:95
-  ip_eth1: 172.24.134.5
-  ip_mgt: 172.26.134.5
-  mac_mgt: 00:11:25:91:46:46
-gdx-78:
-  mac_eth0: 00:11:25:c4:26:56
-  ip_eth0: 172.24.7.6
-  mac_eth1: 00:11:25:c4:26:57
-  ip_eth1: 172.24.134.6
-  ip_mgt: 172.26.134.6
-  mac_mgt: 00:11:25:91:47:F1
-gdx-79:
-  mac_eth0: 00:11:25:c4:35:76
-  ip_eth0: 172.24.7.7
-  mac_eth1: 00:11:25:c4:35:77
-  ip_eth1: 172.24.134.7
-  ip_mgt: 172.26.134.7
-  mac_mgt: 00:11:25:91:48:4D
-gdx-80:
-  mac_eth0: 00:11:25:c4:3a:be
-  ip_eth0: 172.24.7.8
-  mac_eth1: 00:11:25:c4:3a:bf
-  ip_eth1: 172.24.134.8
-  ip_mgt: 172.26.134.8
-  mac_mgt: 00:11:25:91:45:A3
-gdx-82:
-  mac_eth0: 00:11:25:c4:24:04
-  ip_eth0: 172.24.7.10
-  mac_eth1: 00:11:25:c4:24:05
-  ip_eth1: 172.24.134.10
-  ip_mgt: 172.26.134.10
-  mac_mgt: 00:11:25:91:45:D5
-gdx-83:
-  mac_eth0: 00:11:25:c4:26:8a
-  ip_eth0: 172.24.7.11
-  mac_eth1: 00:11:25:c4:26:8b
-  ip_eth1: 172.24.134.11
-  ip_mgt: 172.26.134.11
-  mac_mgt: 00:11:25:91:46:03
-gdx-84:
-  mac_eth0: 00:11:25:c4:3a:86
-  ip_eth0: 172.24.7.12
-  mac_eth1: 00:11:25:c4:3a:87
-  ip_eth1: 172.24.134.12
-  ip_mgt: 172.26.134.12
-  mac_mgt: 00:11:25:91:46:1A
-gdx-85:
-  mac_eth0: 00:11:25:c4:3b:44
-  ip_eth0: 172.24.8.13
-  mac_eth1: 00:11:25:c4:3b:45
-  ip_eth1: 172.24.135.13
-  ip_mgt: 172.26.135.13
-  mac_mgt: 00:11:25:91:48:93
-gdx-86:
-  mac_eth0: 00:11:25:c4:26:4c
-  ip_eth0: 172.24.8.14
-  mac_eth1: 00:11:25:c4:26:4d
-  ip_eth1: 172.24.135.14
-  ip_mgt: 172.26.135.14
-  mac_mgt: 00:11:25:91:49:47
-gdx-87:
-  mac_eth0: 00:11:25:c4:4d:f4
-  ip_eth0: 172.24.8.15
-  mac_eth1: 00:11:25:c4:4d:f5
-  ip_eth1: 172.24.135.15
-  ip_mgt: 172.26.135.15
-  mac_mgt: 00:11:25:91:48:B4
-gdx-88:
-  mac_eth0: 00:11:25:c4:4e:28
-  ip_eth0: 172.24.8.16
-  mac_eth1: 00:11:25:c4:4e:29
-  ip_eth1: 172.24.135.16
-  ip_mgt: 172.26.135.16
-  mac_mgt: 00:11:25:91:46:3A
-gdx-89:
-  mac_eth0: 00:11:25:c4:4e:5c
-  ip_eth0: 172.24.8.17
-  mac_eth1: 00:11:25:c4:4e:5d
-  ip_eth1: 172.24.135.17
-  ip_mgt: 172.26.135.17
-  mac_mgt: 00:11:25:91:45:CE
-gdx-90:
-  mac_eth0: 00:11:25:c4:51:02
-  ip_eth0: 172.24.8.18
-  mac_eth1: 00:11:25:c4:51:03
-  ip_eth1: 172.24.135.18
-gdx-100:
-  mac_eth0: 00:11:25:c4:4e:be
-  ip_eth0: 172.24.9.28
-  mac_eth1: 00:11:25:c4:4e:bf
-  ip_eth1: 172.24.136.28
-  mac_myri0: 00:60:dd:47:5a:8b
-  ip_myri0: 172.24.76.28
-  ip_mgt: 172.26.136.28
-  mac_mgt: 00:11:25:91:48:B7
-gdx-101:
-  mac_eth0: 00:11:25:c4:51:8c
-  ip_eth0: 172.24.9.29
-  mac_eth1: 00:11:25:c4:51:8d
-  ip_eth1: 172.24.136.29
-  mac_myri0: 00:60:dd:47:67:8c
-  ip_myri0: 172.24.76.29
-  ip_mgt: 172.26.136.29
-  mac_mgt: 00:11:25:91:45:DF
-gdx-102:
-  mac_eth0: 00:11:25:c4:4e:de
-  ip_eth0: 172.24.9.30
-  mac_eth1: 00:11:25:c4:4e:df
-  ip_eth1: 172.24.136.30
-  mac_myri0: 00:60:dd:47:68:44
-  ip_myri0: 172.24.76.30
-  ip_mgt: 172.26.136.30
-  mac_mgt: 00:11:25:91:49:61
-gdx-103:
-  mac_eth0: 00:11:25:c4:4e:fc
-  ip_eth0: 172.24.9.31
-  mac_eth1: 00:11:25:c4:4e:fd
-  ip_eth1: 172.24.136.31
-  mac_myri0: 00:60:dd:47:67:8b
-  ip_myri0: 172.24.76.31
-  ip_mgt: 172.26.136.31
-  mac_mgt: 00:11:25:91:46:1D
-gdx-104:
-  mac_eth0: 00:11:25:c4:52:4a
-  ip_eth0: 172.24.9.32
-  mac_eth1: 00:11:25:c4:52:4b
-  ip_eth1: 172.24.136.32
-  mac_myri0: 00:60:dd:47:67:8e
-  ip_myri0: 172.24.76.32
-  ip_mgt: 172.26.136.32
-  mac_mgt: 00:11:25:91:47:78
-gdx-105:
-  mac_eth0: 00:11:25:c4:4f:0a
-  ip_eth0: 172.24.9.33
-  mac_eth1: 00:11:25:c4:4f:0b
-  ip_eth1: 172.24.136.33
-  mac_myri0: 00:60:dd:47:68:4a
-  ip_myri0: 172.24.76.33
-  ip_mgt: 172.26.136.33
-  mac_mgt: 00:11:25:91:49:14
-gdx-106:
-  mac_eth0: 00:11:25:c4:4e:c2
-  ip_eth0: 172.24.9.34
-  mac_eth1: 00:11:25:c4:4e:c3
-  ip_eth1: 172.24.136.34
-  mac_myri0: 00:60:dd:47:67:88
-  ip_myri0: 172.24.76.34
-  ip_mgt: 172.26.136.34
-  mac_mgt: 00:11:25:91:47:6A
-gdx-107:
-  mac_eth0: 00:11:25:c4:4e:d2
-  ip_eth0: 172.24.9.35
-  mac_eth1: 00:11:25:c4:4e:d3
-  ip_eth1: 172.24.136.35
-  mac_myri0: 00:60:dd:47:68:19
-  ip_myri0: 172.24.76.35
-  ip_mgt: 172.26.136.35
-  mac_mgt: 00:11:25:91:48:8A
-gdx-108:
-  mac_eth0: 00:11:25:c4:51:bc
-  ip_eth0: 172.24.9.36
-  mac_eth1: 00:11:25:c4:51:bd
-  ip_eth1: 172.24.136.36
-  mac_myri0: 00:60:dd:47:68:12
-  ip_myri0: 172.24.76.36
-  ip_mgt: 172.26.136.36
-  mac_mgt: 00:11:25:91:47:DC
-gdx-10:
-  mac_eth0: 00:11:25:c4:33:38
-  ip_eth0: 172.24.1.10
-  mac_eth1: 00:11:25:c4:33:39
-  ip_eth1: 172.24.128.10
-  mac_myri0: 00:60:dd:47:59:65
-  ip_myri0: 172.24.68.10
-  ip_mgt: 172.26.128.10
-  mac_mgt: 00:11:25:91:47:58
-gdx-11:
-  mac_eth0: 00:11:25:c4:34:3e
-  ip_eth0: 172.24.1.11
-  mac_eth1: 00:11:25:c4:34:3f
-  ip_eth1: 172.24.128.11
-  mac_myri0: 00:60:dd:47:5a:53
-  ip_myri0: 172.24.68.11
-  ip_mgt: 172.26.128.11
-  mac_mgt: 00:11:25:91:48:EE
-gdx-127:
-  mac_eth0: 00:11:25:c4:4d:94
-  ip_eth0: 172.24.11.19
-  mac_eth1: 00:11:25:c4:4d:95
-  ip_eth1: 172.24.138.19
-  mac_myri0: 00:60:dd:47:65:d9
-  ip_myri0: 172.24.78.19
-  ip_mgt: 172.26.138.19
-  mac_mgt: 00:11:25:91:46:88
-gdx-128:
-  mac_eth0: 00:11:25:c4:53:18
-  ip_eth0: 172.24.11.20
-  mac_eth1: 00:11:25:c4:53:19
-  ip_eth1: 172.24.138.20
-  mac_myri0: 00:60:dd:47:67:fc
-  ip_myri0: 172.24.78.20
-  ip_mgt: 172.26.138.20
-  mac_mgt: 00:11:25:91:46:02
-gdx-129:
-  mac_eth0: 00:11:25:c4:4d:80
-  ip_eth0: 172.24.11.21
-  mac_eth1: 00:11:25:c4:4d:81
-  ip_eth1: 172.24.138.21
-  mac_myri0: 00:60:dd:47:59:32
-  ip_myri0: 172.24.78.21
-  ip_mgt: 172.26.138.21
-  mac_mgt: 00:11:25:91:45:FB
-gdx-12:
-  mac_eth0: 00:11:25:c4:35:42
-  ip_eth0: 172.24.1.12
-  mac_eth1: 00:11:25:c4:35:43
-  ip_eth1: 172.24.128.12
-  mac_myri0: 00:60:dd:47:59:64
-  ip_myri0: 172.24.68.12
-  ip_mgt: 172.26.128.12
-  mac_mgt: 00:11:25:91:45:B8
-gdx-130:
-  mac_eth0: 00:11:25:c4:54:6a
-  ip_eth0: 172.24.11.22
-  mac_eth1: 00:11:25:c4:54:6b
-  ip_eth1: 172.24.138.22
-  mac_myri0: 00:60:dd:47:59:fd
-  ip_myri0: 172.24.78.22
-  ip_mgt: 172.26.138.22
-  mac_mgt: 00:11:25:91:45:A5
-gdx-131:
-  mac_eth0: 00:11:25:c4:54:86
-  ip_eth0: 172.24.11.23
-  mac_eth1: 00:11:25:c4:54:87
-  ip_eth1: 172.24.138.23
-  mac_myri0: 00:60:dd:47:59:6b
-  ip_myri0: 172.24.78.23
-  ip_mgt: 172.26.138.23
-  mac_mgt: 00:11:25:91:46:AA
-gdx-132:
-  mac_eth0: 00:11:25:c4:4e:58
-  ip_eth0: 172.24.11.24
-  mac_eth1: 00:11:25:c4:4e:59
-  ip_eth1: 172.24.138.24
-  mac_myri0: 00:60:dd:47:5a:bf
-  ip_myri0: 172.24.78.24
-  ip_mgt: 172.26.138.24
-  mac_mgt: 00:11:25:91:47:E3
-gdx-133:
-  mac_eth0: 00:11:25:c4:4e:82
-  ip_eth0: 172.24.12.25
-  mac_eth1: 00:11:25:c4:4e:83
-  ip_eth1: 172.24.139.25
-  mac_myri0: 00:60:dd:47:59:b7
-  ip_myri0: 172.24.79.25
-  ip_mgt: 172.26.139.25
-  mac_mgt: 00:11:25:91:47:93
-gdx-134:
-  mac_eth0: 00:11:25:c4:4f:4e
-  ip_eth0: 172.24.12.26
-  mac_eth1: 00:11:25:c4:4f:4f
-  ip_eth1: 172.24.139.26
-  mac_myri0: 00:60:dd:47:65:be
-  ip_myri0: 172.24.79.26
-  ip_mgt: 172.26.139.26
-  mac_mgt: 00:11:25:91:48:1D
-gdx-135:
-  mac_eth0: 00:11:25:c4:53:e6
-  ip_eth0: 172.24.12.27
-  mac_eth1: 00:11:25:c4:53:e7
-  ip_eth1: 172.24.139.27
-  mac_myri0: 00:60:dd:47:59:70
-  ip_myri0: 172.24.79.27
-  ip_mgt: 172.26.139.27
-  mac_mgt: 00:11:25:91:47:6B
-gdx-136:
-  mac_eth0: 00:11:25:c4:4d:40
-  ip_eth0: 172.24.12.28
-  mac_eth1: 00:11:25:c4:4d:41
-  ip_eth1: 172.24.139.28
-  mac_myri0: 00:60:dd:47:65:bd
-  ip_myri0: 172.24.79.28
-  ip_mgt: 172.26.139.28
-  mac_mgt: 00:11:25:91:48:A0
-gdx-137:
-  mac_eth0: 00:11:25:c4:4f:e2
-  ip_eth0: 172.24.12.29
-  mac_eth1: 00:11:25:c4:4f:e3
-  ip_eth1: 172.24.139.29
-  mac_myri0: 00:60:dd:47:5a:a5
-  ip_myri0: 172.24.79.29
-  ip_mgt: 172.26.139.29
-  mac_mgt: 00:11:25:91:45:C6
-gdx-138:
-  mac_eth0: 00:11:25:c4:4d:4a
-  ip_eth0: 172.24.12.30
-  mac_eth1: 00:11:25:c4:4d:4b
-  ip_eth1: 172.24.139.30
-  mac_myri0: 00:60:dd:47:5a:76
-  ip_myri0: 172.24.79.30
-  ip_mgt: 172.26.139.30
-  mac_mgt: 00:11:25:91:46:22
-gdx-139:
-  mac_eth0: 00:11:25:c4:38:de
-  ip_eth0: 172.24.12.31
-  mac_eth1: 00:11:25:c4:38:df
-  ip_eth1: 172.24.139.31
-  mac_myri0: 00:60:dd:47:65:aa
-  ip_myri0: 172.24.79.31
-  ip_mgt: 172.26.139.31
-  mac_mgt: 00:11:25:91:45:CF
-gdx-13:
-  mac_eth0: 00:11:25:c4:34:48
-  ip_eth0: 172.24.2.13
-  mac_eth1: 00:11:25:c4:34:49
-  ip_eth1: 172.24.129.13
-  mac_myri0: 00:60:dd:47:5a:99
-  ip_myri0: 172.24.69.13
-  ip_mgt: 172.26.129.13
-  mac_mgt: 00:11:25:91:48:02
-gdx-140:
-  mac_eth0: 00:11:25:c4:24:02
-  ip_eth0: 172.24.12.32
-  mac_eth1: 00:11:25:c4:24:03
-  ip_eth1: 172.24.139.32
-  mac_myri0: 00:60:dd:47:59:62
-  ip_myri0: 172.24.79.32
-  ip_mgt: 172.26.139.32
-  mac_mgt: 00:11:25:91:48:32
-gdx-141:
-  mac_eth0: 00:11:25:c4:3f:a8
-  ip_eth0: 172.24.12.33
-  mac_eth1: 00:11:25:c4:3f:a9
-  ip_eth1: 172.24.139.33
-  mac_myri0: 00:60:dd:47:5a:b7
-  ip_myri0: 172.24.79.33
-  ip_mgt: 172.26.139.33
-  mac_mgt: 00:11:25:91:48:63
-gdx-142:
-  mac_eth0: 00:11:25:c4:4f:d8
-  ip_eth0: 172.24.12.34
-  mac_eth1: 00:11:25:c4:4f:d9
-  ip_eth1: 172.24.139.34
-  mac_myri0: 00:60:dd:47:59:b6
-  ip_myri0: 172.24.79.34
-  ip_mgt: 172.26.139.34
-  mac_mgt: 00:11:25:91:46:41
-gdx-143:
-  mac_eth0: 00:11:25:c4:4f:aa
-  ip_eth0: 172.24.12.35
-  mac_eth1: 00:11:25:c4:4f:ab
-  ip_eth1: 172.24.139.35
-  mac_myri0: 00:60:dd:47:5a:b9
-  ip_myri0: 172.24.79.35
-  ip_mgt: 172.26.139.35
-  mac_mgt: 00:11:25:91:48:33
-gdx-144:
-  mac_eth0: 00:11:25:c4:50:0e
-  ip_eth0: 172.24.12.36
-  mac_eth1: 00:11:25:c4:50:0f
-  ip_eth1: 172.24.139.36
-  mac_myri0: 00:60:dd:47:5a:92
-  ip_myri0: 172.24.79.36
-  ip_mgt: 172.26.139.36
-  mac_mgt: 00:11:25:91:45:A6
-gdx-145:
-  mac_eth0: 00:11:25:c4:50:20
-  ip_eth0: 172.24.13.1
-  mac_eth1: 00:11:25:c4:50:21
-  ip_eth1: 172.24.140.1
-  mac_myri0: 00:60:dd:47:68:7b
-  ip_myri0: 172.24.80.1
-  ip_mgt: 172.26.140.1
-  mac_mgt: 00:11:25:91:45:AD
-gdx-146:
-  mac_eth0: 00:11:25:c4:4d:4c
-  ip_eth0: 172.24.13.2
-  mac_eth1: 00:11:25:c4:4d:4d
-  ip_eth1: 172.24.140.2
-  mac_myri0: 00:60:dd:47:5a:73
-  ip_myri0: 172.24.80.2
-  ip_mgt: 172.26.140.2
-  mac_mgt: 00:11:25:91:46:B4
-gdx-147:
-  mac_eth0: 00:11:25:c4:4d:fe
-  ip_eth0: 172.24.13.3
-  mac_eth1: 00:11:25:c4:4d:ff
-  ip_eth1: 172.24.140.3
-  mac_myri0: 00:60:dd:47:59:79
-  ip_myri0: 172.24.80.3
-  ip_mgt: 172.26.140.3
-  mac_mgt: 00:11:25:91:47:22
-gdx-148:
-  mac_eth0: 00:11:25:c4:51:06
-  ip_eth0: 172.24.13.4
-  mac_eth1: 00:11:25:c4:51:07
-  ip_eth1: 172.24.140.4
-  mac_myri0: 00:60:dd:47:5a:79
-  ip_myri0: 172.24.80.4
-  ip_mgt: 172.26.140.4
-  mac_mgt: 00:11:25:91:47:FC
-gdx-149:
-  mac_eth0: 00:11:25:c4:4f:c0
-  ip_eth0: 172.24.13.5
-  mac_eth1: 00:11:25:c4:4f:c1
-  ip_eth1: 172.24.140.5
-  mac_myri0: 00:60:dd:47:5a:c1
-  ip_myri0: 172.24.80.5
-  ip_mgt: 172.26.140.5
-  mac_mgt: 00:11:25:91:46:2C
-gdx-14:
-  mac_eth0: 00:11:25:c4:34:3c
-  ip_eth0: 172.24.2.14
-  mac_eth1: 00:11:25:c4:34:3d
-  ip_eth1: 172.24.129.14
-  mac_myri0: 00:60:dd:47:5a:5a
-  ip_myri0: 172.24.69.14
-  ip_mgt: 172.26.129.14
-  mac_mgt: 00:11:25:91:48:91
-gdx-150:
-  mac_eth0: 00:11:25:c4:4f:02
-  ip_eth0: 172.24.13.6
-  mac_eth1: 00:11:25:c4:4f:03
-  ip_eth1: 172.24.140.6
-  mac_myri0: 00:60:dd:47:5a:c3
-  ip_myri0: 172.24.80.6
-  ip_mgt: 172.26.140.6
-  mac_mgt: 00:11:25:91:47:B4
-gdx-151:
-  mac_eth0: 00:11:25:c4:53:78
-  ip_eth0: 172.24.13.7
-  mac_eth1: 00:11:25:c4:53:79
-  ip_eth1: 172.24.140.7
-  mac_myri0: 00:60:dd:47:5a:bd
-  ip_myri0: 172.24.80.7
-  ip_mgt: 172.26.140.7
-  mac_mgt: 00:11:25:91:45:9D
-gdx-152:
-  mac_eth0: 00:11:25:c4:50:b6
-  ip_eth0: 172.24.13.8
-  mac_eth1: 00:11:25:c4:50:b7
-  ip_eth1: 172.24.140.8
-  mac_myri0: 00:60:dd:47:65:b3
-  ip_myri0: 172.24.80.8
-  ip_mgt: 172.26.140.8
-  mac_mgt: 00:11:25:91:49:23
-gdx-153:
-  mac_eth0: 00:11:25:c4:50:a8
-  ip_eth0: 172.24.13.9
-  mac_eth1: 00:11:25:c4:50:a9
-  ip_eth1: 172.24.140.9
-  mac_myri0: 00:60:dd:47:65:da
-  ip_myri0: 172.24.80.9
-  ip_mgt: 172.26.140.9
-  mac_mgt: 00:11:25:91:46:07
-gdx-154:
-  mac_eth0: 00:11:25:c4:4d:2a
-  ip_eth0: 172.24.13.10
-  mac_eth1: 00:11:25:c4:4d:2b
-  ip_eth1: 172.24.140.10
-  mac_myri0: 00:60:dd:47:5a:b5
-  ip_myri0: 172.24.80.10
-  ip_mgt: 172.26.140.10
-  mac_mgt: 00:11:25:91:46:DE
-gdx-155:
-  mac_eth0: 00:11:25:c4:50:a2
-  ip_eth0: 172.24.13.11
-  mac_eth1: 00:11:25:c4:50:a3
-  ip_eth1: 172.24.140.11
-  mac_myri0: 00:60:dd:47:5a:8e
-  ip_myri0: 172.24.80.11
-  ip_mgt: 172.26.140.11
-  mac_mgt: 00:11:25:91:48:BA
-gdx-156:
-  mac_eth0: 00:11:25:c4:0b:06
-  ip_eth0: 172.24.13.12
-  mac_eth1: 00:11:25:c4:0b:07
-  ip_eth1: 172.24.140.12
-  mac_myri0: 00:60:dd:47:5a:bc
-  ip_myri0: 172.24.80.12
-  ip_mgt: 172.26.140.12
-  mac_mgt: 00:11:25:91:48:76
-gdx-157:
-  mac_eth0: 00:11:25:c4:52:ca
-  ip_eth0: 172.24.14.13
-  mac_eth1: 00:11:25:c4:52:cb
-  ip_eth1: 172.24.141.13
-  mac_myri0: 00:60:dd:47:5a:b8
-  ip_myri0: 172.24.81.13
-  ip_mgt: 172.26.141.13
-  mac_mgt: 00:11:25:91:47:71
-gdx-158:
-  mac_eth0: 00:11:25:c4:54:46
-  ip_eth0: 172.24.14.14
-  mac_eth1: 00:11:25:c4:54:47
-  ip_eth1: 172.24.141.14
-  mac_myri0: 00:60:dd:47:5a:c2
-  ip_myri0: 172.24.81.14
-  ip_mgt: 172.26.141.14
-  mac_mgt: 00:11:25:91:46:B3
-gdx-159:
-  mac_eth0: 00:11:25:c4:4f:82
-  ip_eth0: 172.24.14.15
-  mac_eth1: 00:11:25:c4:4f:83
-  ip_eth1: 172.24.141.15
-  mac_myri0: 00:60:dd:47:5a:77
-  ip_myri0: 172.24.81.15
-  ip_mgt: 172.26.141.15
-  mac_mgt: 00:11:25:91:48:0D
-gdx-15:
-  mac_eth0: 00:11:25:c4:35:9b
-  ip_eth0: 172.24.2.15
-  mac_eth1: 00:11:25:c4:35:9c
-  ip_eth1: 172.24.129.15
-  mac_myri0: 00:60:dd:47:5a:58
-  ip_myri0: 172.24.69.15
-  ip_mgt: 172.26.129.15
-  mac_mgt: 00:11:25:91:48:A2
-gdx-160:
-  mac_eth0: 00:11:25:c4:4f:3a
-  ip_eth0: 172.24.14.16
-  mac_eth1: 00:11:25:c4:4f:3b
-  ip_eth1: 172.24.141.16
-  mac_myri0: 00:60:dd:47:59:03
-  ip_myri0: 172.24.81.16
-  ip_mgt: 172.26.141.16
-  mac_mgt: 00:11:25:91:46:8D
-gdx-161:
-  mac_eth0: 00:11:25:c4:4f:8e
-  ip_eth0: 172.24.14.17
-  mac_eth1: 00:11:25:c4:4f:8f
-  ip_eth1: 172.24.141.17
-  mac_myri0: 00:60:dd:47:5a:72
-  ip_myri0: 172.24.81.17
-  ip_mgt: 172.26.141.17
-  mac_mgt: 00:11:25:91:48:B8
-gdx-162:
-  mac_eth0: 00:11:25:c4:4e:b8
-  ip_eth0: 172.24.14.18
-  mac_eth1: 00:11:25:c4:4e:b9
-  ip_eth1: 172.24.141.18
-  mac_myri0: 00:60:dd:47:5a:ba
-  ip_myri0: 172.24.81.18
-  ip_mgt: 172.26.141.18
-  mac_mgt: 00:11:25:91:45:FE
-gdx-16:
-  mac_eth0: 00:11:25:c4:2e:ce
-  ip_eth0: 172.24.2.16
-  mac_eth1: 00:11:25:c4:2e:cf
-  ip_eth1: 172.24.129.16
-  mac_myri0: 00:60:dd:47:68:85
-  ip_myri0: 172.24.69.16
-  ip_mgt: 172.26.129.16
-  mac_mgt: 00:11:25:91:45:8E
-gdx-17:
-  mac_eth0: 00:11:25:c4:34:56
-  ip_eth0: 172.24.2.17
-  mac_eth1: 00:11:25:c4:34:57
-  ip_eth1: 172.24.129.17
-  mac_myri0: 00:60:dd:47:63:85
-  ip_myri0: 172.24.69.17
-  ip_mgt: 172.26.129.17
-  mac_mgt: 00:11:25:91:49:4A
-gdx-18:
-  mac_eth0: 00:11:25:c4:35:7a
-  ip_eth0: 172.24.2.18
-  mac_eth1: 00:11:25:c4:35:7b
-  ip_eth1: 172.24.129.18
-  mac_myri0: 00:60:dd:47:59:6a
-  ip_myri0: 172.24.69.18
-  ip_mgt: 172.26.129.18
-  mac_mgt: 00:11:25:91:48:AF
-gdx-19:
-  mac_eth0: 00:11:25:c4:34:4c
-  ip_eth0: 172.24.2.19
-  mac_eth1: 00:11:25:c4:34:4d
-  ip_eth1: 172.24.129.19
-  mac_myri0: 00:60:dd:47:5a:54
-  ip_myri0: 172.24.69.19
-  ip_mgt: 172.26.129.19
-  mac_mgt: 00:11:25:91:49:55
-gdx-1:
-  mac_eth0: 00:11:25:c4:35:7e
-  ip_eth0: 172.24.1.1
-  mac_eth1: 00:11:25:c4:35:7f
-  ip_eth1: 172.24.128.1
-  mac_myri0: 00:60:dd:47:5a:a4
-  ip_myri0: 172.24.68.1
-  ip_mgt: 172.26.128.1
-  mac_mgt: 00:11:25:91:47:F2
-gdx-20:
-  mac_eth0: 00:11:25:c4:35:52
-  ip_eth0: 172.24.2.20
-  mac_eth1: 00:11:25:c4:35:53
-  ip_eth1: 172.24.129.20
-  mac_myri0: 00:60:dd:47:88:f7
-  ip_myri0: 172.24.69.20
-  ip_mgt: 172.26.129.20
-  mac_mgt: 00:11:25:91:45:7C
-gdx-22:
-  mac_eth0: 00:11:25:c4:34:5a
-  ip_eth0: 172.24.2.22
-  mac_eth1: 00:11:25:c4:34:5b
-  ip_eth1: 172.24.129.22
-  mac_myri0: 00:60:dd:47:5a:a2
-  ip_myri0: 172.24.69.22
-  ip_mgt: 172.26.129.22
-  mac_mgt: 00:11:25:91:49:2A
-gdx-236:
-  mac_eth0: 00:11:25:c4:39:ac
-  ip_eth0: 172.24.20.20
-  mac_eth1: 00:11:25:c4:39:ad
-  ip_eth1: 172.24.147.20
-  mac_myri0: 00:60:dd:47:89:d1
-  ip_myri0: 172.24.87.20
-  ip_mgt: 172.26.147.20
-  mac_mgt: 00:11:25:91:47:F7
-gdx-237:
-  mac_eth0: 00:11:25:c4:3c:80
-  ip_eth0: 172.24.20.21
-  mac_eth1: 00:11:25:c4:3c:81
-  ip_eth1: 172.24.147.21
-  mac_myri0: 00:60:dd:47:89:cf
-  ip_myri0: 172.24.87.21
-  ip_mgt: 172.26.147.21
-  mac_mgt: 00:11:25:91:48:45
-gdx-238:
-  mac_eth0: 00:11:25:c4:3c:7e
-  ip_eth0: 172.24.20.22
-  mac_eth1: 00:11:25:c4:3c:7f
-  ip_eth1: 172.24.147.22
-  mac_myri0: 00:60:dd:47:7d:7d
-  ip_myri0: 172.24.87.22
-  ip_mgt: 172.26.147.22
-  mac_mgt: 00:11:25:91:48:CF
-gdx-239:
-  mac_eth0: 00:11:25:c4:3f:50
-  ip_eth0: 172.24.20.23
-  mac_eth1: 00:11:25:c4:3f:51
-  ip_eth1: 172.24.147.23
-  mac_myri0: 00:60:dd:47:7d:97
-  ip_myri0: 172.24.87.23
-  ip_mgt: 172.26.147.23
-  mac_mgt: 00:11:25:91:48:C1
-gdx-23:
-  mac_eth0: 00:11:25:c4:34:ea
-  ip_eth0: 172.24.2.23
-  mac_eth1: 00:11:25:c4:34:eb
-  ip_eth1: 172.24.129.23
-  mac_myri0: 00:60:dd:47:5a:8f
-  ip_myri0: 172.24.69.23
-  ip_mgt: 172.26.129.23
-  mac_mgt: 00:11:25:91:46:B7
-gdx-240:
-  mac_eth0: 00:11:25:c4:3e:34
-  ip_eth0: 172.24.20.24
-  mac_eth1: 00:11:25:c4:3e:35
-  ip_eth1: 172.24.147.24
-  mac_myri0: 00:60:dd:47:7d:7c
-  ip_myri0: 172.24.87.24
-  ip_mgt: 172.26.147.24
-  mac_mgt: 00:11:25:91:46:09
-gdx-241:
-  mac_eth0: 00:11:25:c4:3c:74
-  ip_eth0: 172.24.21.25
-  mac_eth1: 00:11:25:c4:3c:75
-  ip_eth1: 172.24.148.25
-  mac_myri0: 00:60:dd:47:7c:d4
-  ip_myri0: 172.24.88.25
-  ip_mgt: 172.26.148.25
-  mac_mgt: 00:11:25:91:46:5D
-gdx-242:
-  mac_eth0: 00:11:25:c4:2b:fc
-  ip_eth0: 172.24.21.26
-  mac_eth1: 00:11:25:c4:2b:fd
-  ip_eth1: 172.24.148.26
-  mac_myri0: 00:60:dd:47:7c:c8
-  ip_myri0: 172.24.88.26
-  ip_mgt: 172.26.148.26
-  mac_mgt: 00:11:25:91:48:AD
-gdx-243:
-  mac_eth0: 00:11:25:c4:2b:58
-  ip_eth0: 172.24.21.27
-  mac_eth1: 00:11:25:c4:2b:59
-  ip_eth1: 172.24.148.27
-  mac_myri0: 00:60:dd:47:7c:07
-  ip_myri0: 172.24.88.27
-  ip_mgt: 172.26.148.27
-  mac_mgt: 00:11:25:91:46:7A
-gdx-244:
-  mac_eth0: 00:11:25:c4:10:fa
-  ip_eth0: 172.24.21.28
-  mac_eth1: 00:11:25:c4:10:fb
-  ip_eth1: 172.24.148.28
-  mac_myri0: 00:60:dd:47:89:07
-  ip_myri0: 172.24.88.28
-  ip_mgt: 172.26.148.28
-  mac_mgt: 00:11:25:91:46:A3
-gdx-245:
-  mac_eth0: 00:11:25:c4:3a:4e
-  ip_eth0: 172.24.21.29
-  mac_eth1: 00:11:25:c4:3a:4f
-  ip_eth1: 172.24.148.29
-  mac_myri0: 00:60:dd:47:7b:fe
-  ip_myri0: 172.24.88.29
-  ip_mgt: 172.26.148.29
-  mac_mgt: 00:11:25:91:47:EA
-gdx-246:
-  mac_eth0: 00:11:25:c4:38:e2
-  ip_eth0: 172.24.21.30
-  mac_eth1: 00:11:25:c4:38:e3
-  ip_eth1: 172.24.148.30
-  mac_myri0: 00:60:dd:47:86:58
-  ip_myri0: 172.24.88.30
-  ip_mgt: 172.26.148.30
-  mac_mgt: 00:11:25:91:46:0E
-gdx-247:
-  mac_eth0: 00:11:25:c4:32:76
-  ip_eth0: 172.24.21.31
-  mac_eth1: 00:11:25:c4:32:77
-  ip_eth1: 172.24.148.31
-  mac_myri0: 00:60:dd:47:7b:fd
-  ip_myri0: 172.24.88.31
-  ip_mgt: 172.26.148.31
-  mac_mgt: 00:11:25:91:48:F4
-gdx-248:
-  mac_eth0: 00:11:25:c4:31:fa
-  ip_eth0: 172.24.21.32
-  mac_eth1: 00:11:25:c4:31:fb
-  ip_eth1: 172.24.148.32
-  mac_myri0: 00:60:dd:47:7b:fc
-  ip_myri0: 172.24.88.32
-  ip_mgt: 172.26.148.32
-  mac_mgt: 00:11:25:91:48:3B
-gdx-249:
-  mac_eth0: 00:11:25:c4:33:40
-  ip_eth0: 172.24.21.33
-  mac_eth1: 00:11:25:c4:33:41
-  ip_eth1: 172.24.148.33
-  mac_myri0: 00:60:dd:47:88:62
-  ip_myri0: 172.24.88.33
-  ip_mgt: 172.26.148.33
-  mac_mgt: 00:11:25:91:45:E9
-gdx-24:
-  mac_eth0: 00:11:25:c4:34:50
-  ip_eth0: 172.24.2.24
-  mac_eth1: 00:11:25:c4:34:51
-  ip_eth1: 172.24.129.24
-  mac_myri0: 00:60:dd:47:5a:57
-  ip_myri0: 172.24.69.24
-  ip_mgt: 172.26.129.24
-  mac_mgt: 00:11:25:91:47:39
-gdx-250:
-  mac_eth0: 00:11:25:c4:3b:9a
-  ip_eth0: 172.24.21.34
-  mac_eth1: 00:11:25:c4:3b:9b
-  ip_eth1: 172.24.148.34
-  mac_myri0: 00:60:dd:47:7b:ff
-  ip_myri0: 172.24.88.34
-  ip_mgt: 172.26.148.34
-  mac_mgt: 00:11:25:91:45:E8
-gdx-251:
-  mac_eth0: 00:11:25:c4:3f:90
-  ip_eth0: 172.24.21.35
-  mac_eth1: 00:11:25:c4:3f:91
-  ip_eth1: 172.24.148.35
-  mac_myri0: 00:60:dd:47:88:6e
-  ip_myri0: 172.24.88.35
-  ip_mgt: 172.26.148.35
-  mac_mgt: 00:11:25:91:47:40
-gdx-252:
-  mac_eth0: 00:11:25:c4:32:5a
-  ip_eth0: 172.24.21.36
-  mac_eth1: 00:11:25:c4:32:5b
-  ip_eth1: 172.24.148.36
-  mac_myri0: 00:60:dd:47:7c:65
-  ip_myri0: 172.24.88.36
-  ip_mgt: 172.26.148.36
-  mac_mgt: 00:11:25:91:48:28
-gdx-253:
-  mac_eth0: 00:11:25:c4:34:68
-  ip_eth0: 172.24.22.1
-  mac_eth1: 00:11:25:c4:34:69
-  ip_eth1: 172.24.149.1
-  mac_myri0: 00:60:dd:47:c7:fb
-  ip_myri0: 172.24.89.1
-  ip_mgt: 172.26.149.1
-  mac_mgt: 00:11:25:91:47:CC
-gdx-254:
-  mac_eth0: 00:11:25:c4:35:b8
-  ip_eth0: 172.24.22.2
-  mac_eth1: 00:11:25:c4:35:b9
-  ip_eth1: 172.24.149.2
-  mac_myri0: 00:60:dd:47:c7:fe
-  ip_myri0: 172.24.89.2
-  ip_mgt: 172.26.149.2
-  mac_mgt: 00:11:25:91:46:C7
-gdx-255:
-  mac_eth0: 00:11:25:c4:09:86
-  ip_eth0: 172.24.22.3
-  mac_eth1: 00:11:25:c4:09:87
-  ip_eth1: 172.24.149.3
-  mac_myri0: 00:60:dd:47:7c:e1
-  ip_myri0: 172.24.89.3
-  ip_mgt: 172.26.149.3
-  mac_mgt: 00:11:25:91:48:BC
-gdx-256:
-  mac_eth0: 00:11:25:c4:35:90
-  ip_eth0: 172.24.22.4
-  mac_eth1: 00:11:25:c4:35:91
-  ip_eth1: 172.24.149.4
-  mac_myri0: 00:60:dd:47:88:fa
-  ip_myri0: 172.24.89.4
-  ip_mgt: 172.26.149.4
-  mac_mgt: 00:11:25:91:47:F0
-gdx-257:
-  mac_eth0: 00:11:25:c4:35:62
-  ip_eth0: 172.24.22.5
-  mac_eth1: 00:11:25:c4:35:63
-  ip_eth1: 172.24.149.5
-  mac_myri0: 00:60:dd:47:c7:f6
-  ip_myri0: 172.24.89.5
-  ip_mgt: 172.26.149.5
-  mac_mgt: 00:11:25:91:47:E2
-gdx-258:
-  mac_eth0: 00:11:25:c4:13:1a
-  ip_eth0: 172.24.22.6
-  mac_eth1: 00:11:25:c4:13:1b
-  ip_eth1: 172.24.149.6
-  mac_myri0: 00:60:dd:47:7d:7f
-  ip_myri0: 172.24.89.6
-  ip_mgt: 172.26.149.6
-  mac_mgt: 00:11:25:91:47:7C
-gdx-259:
-  mac_eth0: 00:11:25:c4:35:6a
-  ip_eth0: 172.24.22.7
-  mac_eth1: 00:11:25:c4:35:6b
-  ip_eth1: 172.24.149.7
-  mac_myri0: 00:60:dd:47:88:ff
-  ip_myri0: 172.24.89.7
-  ip_mgt: 172.26.149.7
-  mac_mgt: 00:11:25:91:49:15
-gdx-260:
-  mac_eth0: 00:11:25:c4:33:82
-  ip_eth0: 172.24.22.8
-  mac_eth1: 00:11:25:c4:33:83
-  ip_eth1: 172.24.149.8
-  mac_myri0: 00:60:dd:47:7d:b0
-  ip_myri0: 172.24.89.8
-  ip_mgt: 172.26.149.8
-  mac_mgt: 00:11:25:91:45:D3
-gdx-261:
-  mac_eth0: 00:11:25:c4:2d:72
-  ip_eth0: 172.24.22.9
-  mac_eth1: 00:11:25:c4:2d:73
-  ip_eth1: 172.24.149.9
-  mac_myri0: 00:60:dd:47:88:f8
-  ip_myri0: 172.24.89.9
-  ip_mgt: 172.26.149.9
-  mac_mgt: 00:11:25:91:48:7B
-gdx-262:
-  mac_eth0: 00:11:25:c4:34:e8
-  ip_eth0: 172.24.22.10
-  mac_eth1: 00:11:25:c4:34:e9
-  ip_eth1: 172.24.149.10
-  mac_myri0: 00:60:dd:47:7d:11
-  ip_myri0: 172.24.89.10
-  ip_mgt: 172.26.149.10
-  mac_mgt: 00:11:25:91:47:46
-gdx-263:
-  mac_eth0: 00:11:25:c4:35:88
-  ip_eth0: 172.24.22.11
-  mac_eth1: 00:11:25:c4:35:89
-  ip_eth1: 172.24.149.11
-  mac_myri0: 00:60:dd:47:89:c5
-  ip_myri0: 172.24.89.11
-  ip_mgt: 172.26.149.11
-  mac_mgt: 00:11:25:91:48:07
-gdx-264:
-  mac_eth0: 00:11:25:c4:33:5e
-  ip_eth0: 172.24.22.12
-  mac_eth1: 00:11:25:c4:33:5f
-  ip_eth1: 172.24.149.12
-  mac_myri0: 00:60:dd:47:89:ca
-  ip_myri0: 172.24.89.12
-  ip_mgt: 172.26.149.12
-  mac_mgt: 00:11:25:91:48:14
-gdx-266:
-  mac_eth0: 00:11:25:c4:34:8a
-  ip_eth0: 172.24.23.14
-  mac_eth1: 00:11:25:c4:34:8b
-  ip_eth1: 172.24.150.14
-  mac_myri0: 00:60:dd:47:89:8b
-  ip_myri0: 172.24.90.14
-  ip_mgt: 172.26.150.14
-  mac_mgt: 00:11:25:91:46:60
-gdx-268:
-  mac_eth0: 00:11:25:c4:34:4e
-  ip_eth0: 172.24.23.16
-  mac_eth1: 00:11:25:c4:34:4f
-  ip_eth1: 172.24.150.16
-  mac_myri0: 00:60:dd:47:89:c7
-  ip_myri0: 172.24.90.16
-  ip_mgt: 172.26.150.16
-  mac_mgt: 00:11:25:91:45:87
-gdx-269:
-  mac_eth0: 00:11:25:c4:33:0e
-  ip_eth0: 172.24.23.17
-  mac_eth1: 00:11:25:c4:33:0f
-  ip_eth1: 172.24.150.17
-  mac_myri0: 00:60:dd:47:89:c9
-  ip_myri0: 172.24.90.17
-  ip_mgt: 172.26.150.17
-  mac_mgt: 00:11:25:91:46:D0
-gdx-26:
-  mac_eth0: 00:11:25:c4:35:a4
-  ip_eth0: 172.24.3.26
-  mac_eth1: 00:11:25:c4:35:a5
-  ip_eth1: 172.24.130.26
-  mac_myri0: 00:60:dd:47:5a:59
-  ip_myri0: 172.24.70.26
-  ip_mgt: 172.26.130.26
-  mac_mgt: 00:11:25:91:48:A5
-gdx-270:
-  mac_eth0: 00:11:25:c4:35:48
-  ip_eth0: 172.24.23.18
-  mac_eth1: 00:11:25:c4:35:49
-  ip_eth1: 172.24.150.18
-  mac_myri0: 00:60:dd:47:89:c4
-  ip_myri0: 172.24.90.18
-  ip_mgt: 172.26.150.18
-  mac_mgt: 00:11:25:91:46:CF
-gdx-271:
-  mac_eth0: 00:11:25:c4:31:92
-  ip_eth0: 172.24.23.19
-  mac_eth1: 00:11:25:c4:31:93
-  ip_eth1: 172.24.150.19
-  mac_myri0: 00:60:dd:47:7c:cc
-  ip_myri0: 172.24.90.19
-  ip_mgt: 172.26.150.19
-  mac_mgt: 00:11:25:91:47:7D
-gdx-272:
-  mac_eth0: 00:11:25:c4:2f:20
-  ip_eth0: 172.24.23.20
-  mac_eth1: 00:11:25:c4:2f:21
-  ip_eth1: 172.24.150.20
-  mac_myri0: 00:60:dd:47:89:ce
-  ip_myri0: 172.24.90.20
-  ip_mgt: 172.26.150.20
-  mac_mgt: 00:11:25:91:48:15
-gdx-273:
-  mac_eth0: 00:11:25:c4:32:ee
-  ip_eth0: 172.24.23.21
-  mac_eth1: 00:11:25:c4:32:ef
-  ip_eth1: 172.24.150.21
-  mac_myri0: 00:60:dd:47:89:c8
-  ip_myri0: 172.24.90.21
-  ip_mgt: 172.26.150.21
-  mac_mgt: 00:11:25:91:46:99
-gdx-274:
-  mac_eth0: 00:11:25:c4:35:c0
-  ip_eth0: 172.24.23.22
-  mac_eth1: 00:11:25:c4:35:c1
-  ip_eth1: 172.24.150.22
-  mac_myri0: 00:60:dd:47:89:d2
-  ip_myri0: 172.24.90.22
-  ip_mgt: 172.26.150.22
-  mac_mgt: 00:11:25:91:45:C9
-gdx-275:
-  mac_eth0: 00:11:25:c4:11:38
-  ip_eth0: 172.24.23.23
-  mac_eth1: 00:11:25:c4:11:39
-  ip_eth1: 172.24.150.23
-  mac_myri0: 00:60:dd:47:89:90
-  ip_myri0: 172.24.90.23
-  ip_mgt: 172.26.150.23
-  mac_mgt: 00:11:25:91:45:F0
-gdx-276:
-  mac_eth0: 00:11:25:c4:35:b6
-  ip_eth0: 172.24.23.24
-  mac_eth1: 00:11:25:c4:35:b7
-  ip_eth1: 172.24.150.24
-  mac_myri0: 00:60:dd:47:89:0d
-  ip_myri0: 172.24.90.24
-  ip_mgt: 172.26.150.24
-  mac_mgt: 00:09:6B:5E:FB:10
-gdx-277:
-  mac_eth0: 00:11:25:c4:34:58
-  ip_eth0: 172.24.24.25
-  mac_eth1: 00:11:25:c4:34:59
-  ip_eth1: 172.24.151.25
-  mac_myri0: 00:60:dd:47:89:87
-  ip_myri0: 172.24.91.25
-  ip_mgt: 172.26.151.25
-  mac_mgt: 00:11:25:91:49:5E
-gdx-278:
-  mac_eth0: 00:11:25:c4:34:46
-  ip_eth0: 172.24.24.26
-  mac_eth1: 00:11:25:c4:34:47
-  ip_eth1: 172.24.151.26
-  mac_myri0: 00:60:dd:47:c7:3e
-  ip_myri0: 172.24.91.26
-  ip_mgt: 172.26.151.26
-  mac_mgt: 00:11:25:91:47:6C
-gdx-279:
-  mac_eth0: 00:11:25:c4:33:96
-  ip_eth0: 172.24.24.27
-  mac_eth1: 00:11:25:c4:33:97
-  ip_eth1: 172.24.151.27
-  mac_myri0: 00:60:dd:47:c7:fd
-  ip_myri0: 172.24.91.27
-  ip_mgt: 172.26.151.27
-  mac_mgt: 00:11:25:91:46:42
-gdx-27:
-  mac_eth0: 00:11:25:c4:31:4e
-  ip_eth0: 172.24.3.27
-  mac_eth1: 00:11:25:c4:31:4f
-  ip_eth1: 172.24.130.27
-  mac_myri0: 00:60:dd:47:59:33
-  ip_myri0: 172.24.70.27
-  ip_mgt: 172.26.130.27
-  mac_mgt: 00:11:25:91:49:1C
-gdx-280:
-  mac_eth0: 00:11:25:c4:33:20
-  ip_eth0: 172.24.24.28
-  mac_eth1: 00:11:25:c4:33:21
-  ip_eth1: 172.24.151.28
-  mac_myri0: 00:60:dd:47:c7:fc
-  ip_myri0: 172.24.91.28
-  ip_mgt: 172.26.151.28
-  mac_mgt: 00:11:25:91:46:92
-gdx-281:
-  mac_eth0: 00:11:25:c4:33:18
-  ip_eth0: 172.24.24.29
-  mac_eth1: 00:11:25:c4:33:19
-  ip_eth1: 172.24.151.29
-  mac_myri0: 00:60:dd:47:c7:7d
-  ip_myri0: 172.24.91.29
-  ip_mgt: 172.26.151.29
-  mac_mgt: 00:11:25:91:45:7F
-gdx-282:
-  mac_eth0: 00:11:25:c4:31:44
-  ip_eth0: 172.24.24.30
-  mac_eth1: 00:11:25:c4:31:45
-  ip_eth1: 172.24.151.30
-  mac_myri0: 00:60:dd:47:89:1c
-  ip_myri0: 172.24.91.30
-  ip_mgt: 172.26.151.30
-  mac_mgt: 00:11:25:91:47:11
-gdx-283:
-  mac_eth0: 00:11:25:c4:34:5e
-  ip_eth0: 172.24.24.31
-  mac_eth1: 00:11:25:c4:34:5f
-  ip_eth1: 172.24.151.31
-  mac_myri0: 00:60:dd:47:89:86
-  ip_myri0: 172.24.91.31
-  ip_mgt: 172.26.151.31
-  mac_mgt: 00:11:25:91:45:9E
-gdx-285:
-  mac_eth0: 00:11:25:c4:35:be
-  ip_eth0: 172.24.24.33
-  mac_eth1: 00:11:25:c4:35:bf
-  ip_eth1: 172.24.151.33
-  mac_myri0: 00:60:dd:47:89:cc
-  ip_myri0: 172.24.91.33
-  ip_mgt: 172.26.151.33
-  mac_mgt: 00:11:25:91:48:CE
-gdx-286:
-  mac_eth0: 00:11:25:c4:2a:c2
-  ip_eth0: 172.24.24.34
-  mac_eth1: 00:11:25:c4:2a:c3
-  ip_eth1: 172.24.151.34
-  mac_myri0: 00:60:dd:47:89:c2
-  ip_myri0: 172.24.91.34
-  ip_mgt: 172.26.151.34
-  mac_mgt: 00:11:25:91:45:DA
-gdx-287:
-  mac_eth0: 00:11:25:c4:34:40
-  ip_eth0: 172.24.24.35
-  mac_eth1: 00:11:25:c4:34:41
-  ip_eth1: 172.24.151.35
-  mac_myri0: 00:60:dd:47:89:c6
-  ip_myri0: 172.24.91.35
-  ip_mgt: 172.26.151.35
-  mac_mgt: 00:11:25:91:46:33
-gdx-288:
-  mac_eth0: 00:11:25:c4:34:66
-  ip_eth0: 172.24.24.36
-  mac_eth1: 00:11:25:c4:34:67
-  ip_eth1: 172.24.151.36
-  mac_myri0: 00:60:dd:47:89:cd
-  ip_myri0: 172.24.91.36
-  ip_mgt: 172.26.151.36
-  mac_mgt: 00:11:25:91:46:58
-gdx-289:
-  mac_eth0: 00:11:25:c4:33:68
-  ip_eth0: 172.24.25.1
-  mac_eth1: 00:11:25:c4:33:69
-  ip_eth1: 172.24.152.1
-  mac_myri0: 00:60:dd:47:89:1d
-  ip_myri0: 172.24.92.1
-  ip_mgt: 172.26.152.1
-  mac_mgt: 00:11:25:91:48:22
-gdx-28:
-  mac_eth0: 00:11:25:c4:34:6e
-  ip_eth0: 172.24.3.28
-  mac_eth1: 00:11:25:c4:34:6f
-  ip_eth1: 172.24.130.28
-  mac_myri0: 00:60:dd:47:5a:b6
-  ip_myri0: 172.24.70.28
-  ip_mgt: 172.26.130.28
-  mac_mgt: 00:11:25:91:49:01
-gdx-291:
-  mac_eth0: 00:11:25:c4:33:1c
-  ip_eth0: 172.24.25.3
-  mac_eth1: 00:11:25:c4:33:1d
-  ip_eth1: 172.24.152.3
-  mac_myri0: 00:60:dd:47:c7:fa
-  ip_myri0: 172.24.92.3
-  ip_mgt: 172.26.152.3
-  mac_mgt: 00:11:25:91:47:77
-gdx-292:
-  mac_eth0: 00:11:25:c4:33:88
-  ip_eth0: 172.24.25.4
-  mac_eth1: 00:11:25:c4:33:89
-  ip_eth1: 172.24.152.4
-  mac_myri0: 00:60:dd:47:c7:ff
-  ip_myri0: 172.24.92.4
-  ip_mgt: 172.26.152.4
-  mac_mgt: 00:11:25:91:46:19
-gdx-293:
-  mac_eth0: 00:11:25:c4:33:4a
-  ip_eth0: 172.24.25.5
-  mac_eth1: 00:11:25:c4:33:4b
-  ip_eth1: 172.24.152.5
-  mac_myri0: 00:60:dd:47:89:13
-  ip_myri0: 172.24.92.5
-  ip_mgt: 172.26.152.5
-  mac_mgt: 00:11:25:91:43:D8
-gdx-294:
-  mac_eth0: 00:11:25:c4:33:24
-  ip_eth0: 172.24.25.6
-  mac_eth1: 00:11:25:c4:33:25
-  ip_eth1: 172.24.152.6
-  mac_myri0: 00:60:dd:47:89:78
-  ip_myri0: 172.24.92.6
-  ip_mgt: 172.26.152.6
-  mac_mgt: 00:11:25:91:47:EF
-gdx-295:
-  mac_eth0: 00:11:25:c4:33:7a
-  ip_eth0: 172.24.25.7
-  mac_eth1: 00:11:25:c4:33:7b
-  ip_eth1: 172.24.152.7
-  mac_myri0: 00:60:dd:47:89:88
-  ip_myri0: 172.24.92.7
-  ip_mgt: 172.26.152.7
-  mac_mgt: 00:11:25:91:46:5A
-gdx-296:
-  mac_eth0: 00:11:25:c4:20:06
-  ip_eth0: 172.24.25.8
-  mac_eth1: 00:11:25:c4:20:07
-  ip_eth1: 172.24.152.8
-  mac_myri0: 00:60:dd:47:89:b1
-  ip_myri0: 172.24.92.8
-  ip_mgt: 172.26.152.8
-  mac_mgt: 00:11:25:91:47:AB
-gdx-297:
-  mac_eth0: 00:11:25:c4:33:3c
-  ip_eth0: 172.24.25.9
-  mac_eth1: 00:11:25:c4:33:3d
-  ip_eth1: 172.24.152.9
-  mac_myri0: 00:60:dd:47:89:85
-  ip_myri0: 172.24.92.9
-  ip_mgt: 172.26.152.9
-  mac_mgt: 00:11:25:91:47:D2
-gdx-298:
-  mac_eth0: 00:11:25:c4:33:48
-  ip_eth0: 172.24.25.10
-  mac_eth1: 00:11:25:c4:33:49
-  ip_eth1: 172.24.152.10
-  mac_myri0: 00:60:dd:47:89:95
-  ip_myri0: 172.24.92.10
-  ip_mgt: 172.26.152.10
-  mac_mgt: 00:11:25:91:46:8E
-gdx-299:
-  mac_eth0: 00:11:25:c4:33:46
-  ip_eth0: 172.24.25.11
-  mac_eth1: 00:11:25:c4:33:47
-  ip_eth1: 172.24.152.11
-  mac_myri0: 00:60:dd:47:89:0e
-  ip_myri0: 172.24.92.11
-  ip_mgt: 172.26.152.11
-  mac_mgt: 00:11:25:91:47:0B
-gdx-2:
-  mac_eth0: 00:11:25:c4:35:56
-  ip_eth0: 172.24.1.2
-  mac_eth1: 00:11:25:c4:35:57
-  ip_eth1: 172.24.128.2
-  mac_myri0: 00:60:dd:47:59:75
-  ip_myri0: 172.24.68.2
-  ip_mgt: 172.26.128.2
-  mac_mgt: 00:11:25:91:48:A7
-gdx-300:
-  mac_eth0: 00:11:25:c4:33:14
-  ip_eth0: 172.24.25.12
-  mac_eth1: 00:11:25:c4:33:15
-  ip_eth1: 172.24.152.12
-  mac_myri0: 00:60:dd:47:89:1b
-  ip_myri0: 172.24.92.12
-  ip_mgt: 172.26.152.12
-  mac_mgt: 00:11:25:91:45:A9
-gdx-301:
-  mac_eth0: 00:11:25:c4:35:06
-  ip_eth0: 172.24.26.13
-  mac_eth1: 00:11:25:c4:35:07
-  ip_eth1: 172.24.153.13
-  mac_myri0: 00:60:dd:47:89:93
-  ip_myri0: 172.24.93.13
-  ip_mgt: 172.26.153.13
-  mac_mgt: 00:11:25:91:45:C4
-gdx-302:
-  mac_eth0: 00:11:25:c4:34:42
-  ip_eth0: 172.24.26.14
-  mac_eth1: 00:11:25:c4:34:43
-  ip_eth1: 172.24.153.14
-  mac_myri0: 00:60:dd:47:89:83
-  ip_myri0: 172.24.93.14
-  ip_mgt: 172.26.153.14
-  mac_mgt: 00:11:25:91:46:64
-gdx-303:
-  mac_eth0: 00:11:25:c4:0f:10
-  ip_eth0: 172.24.26.15
-  mac_eth1: 00:11:25:c4:0f:11
-  ip_eth1: 172.24.153.15
-  mac_myri0: 00:60:dd:47:89:7d
-  ip_myri0: 172.24.93.15
-  ip_mgt: 172.26.153.15
-  mac_mgt: 00:11:25:91:45:9A
-gdx-304:
-  mac_eth0: 00:11:25:c4:33:58
-  ip_eth0: 172.24.26.16
-  mac_eth1: 00:11:25:c4:33:59
-  ip_eth1: 172.24.153.16
-  mac_myri0: 00:60:dd:47:89:8f
-  ip_myri0: 172.24.93.16
-  ip_mgt: 172.26.153.16
-  mac_mgt: 00:11:25:91:47:9C
-gdx-305:
-  mac_eth0: 00:11:25:c4:34:62
-  ip_eth0: 172.24.26.17
-  mac_eth1: 00:11:25:c4:34:63
-  ip_eth1: 172.24.153.17
-  mac_myri0: 00:60:dd:47:88:b0
-  ip_myri0: 172.24.93.17
-  ip_mgt: 172.26.153.17
-  mac_mgt: 00:11:25:91:46:5B
-gdx-306:
-  mac_eth0: 00:11:25:c4:41:5a
-  ip_eth0: 172.24.26.18
-  mac_eth1: 00:11:25:c4:41:5b
-  ip_eth1: 172.24.153.18
-  mac_myri0: 00:60:dd:47:89:96
-  ip_myri0: 172.24.93.18
-  ip_mgt: 172.26.153.18
-  mac_mgt: 00:11:25:91:46:35
-gdx-30:
-  mac_eth0: 00:11:25:c4:35:2c
-  ip_eth0: 172.24.3.30
-  mac_eth1: 00:11:25:c4:35:2d
-  ip_eth1: 172.24.130.30
-  mac_myri0: 00:60:dd:47:65:de
-  ip_myri0: 172.24.70.30
-  ip_mgt: 172.26.130.30
-  mac_mgt: 00:11:25:91:46:61
-gdx-31:
-  mac_eth0: 00:11:25:c4:35:24
-  ip_eth0: 172.24.3.31
-  mac_eth1: 00:11:25:c4:35:25
-  ip_eth1: 172.24.130.31
-  mac_myri0: 00:60:dd:47:59:69
-  ip_myri0: 172.24.70.31
-  ip_mgt: 172.26.130.31
-  mac_mgt: 00:11:25:91:45:C5
-gdx-32:
-  mac_eth0: 00:11:25:c4:35:08
-  ip_eth0: 172.24.3.32
-  mac_eth1: 00:11:25:c4:35:09
-  ip_eth1: 172.24.130.32
-  mac_myri0: 00:60:dd:47:65:b7
-  ip_myri0: 172.24.70.32
-  ip_mgt: 172.26.130.32
-  mac_mgt: 00:11:25:91:49:3D
-gdx-33:
-  mac_eth0: 00:11:25:c4:34:70
-  ip_eth0: 172.24.3.33
-  mac_eth1: 00:11:25:c4:34:71
-  ip_eth1: 172.24.130.33
-  mac_myri0: 00:60:dd:47:5a:20
-  ip_myri0: 172.24.70.33
-  ip_mgt: 172.26.130.33
-  mac_mgt: 00:11:25:91:45:EB
-gdx-34:
-  mac_eth0: 00:11:25:c4:33:8e
-  ip_eth0: 172.24.3.34
-  mac_eth1: 00:11:25:c4:33:8f
-  ip_eth1: 172.24.130.34
-  mac_myri0: 00:60:dd:47:5a:91
-  ip_myri0: 172.24.70.34
-  ip_mgt: 172.26.130.34
-  mac_mgt: 00:11:25:91:49:34
-gdx-35:
-  mac_eth0: 00:11:25:c4:34:7a
-  ip_eth0: 172.24.3.35
-  mac_eth1: 00:11:25:c4:34:7b
-  ip_eth1: 172.24.130.35
-  mac_myri0: 00:60:dd:47:65:bb
-  ip_myri0: 172.24.70.35
-  ip_mgt: 172.26.130.35
-  mac_mgt: 00:11:25:91:47:C5
-gdx-36:
-  mac_eth0: 00:11:25:c4:33:56
-  ip_eth0: 172.24.3.36
-  mac_eth1: 00:11:25:c4:33:57
-  ip_eth1: 172.24.130.36
-  mac_myri0: 00:60:dd:47:5a:90
-  ip_myri0: 172.24.70.36
-  ip_mgt: 172.26.130.36
-  mac_mgt: 00:11:25:91:45:E7
-gdx-37:
-  mac_eth0: 00:11:25:c4:31:66
-  ip_eth0: 172.24.4.1
-  mac_eth1: 00:11:25:c4:31:67
-  ip_eth1: 172.24.131.1
-  mac_myri0: 00:60:dd:47:59:aa
-  ip_myri0: 172.24.71.1
-  ip_mgt: 172.26.131.1
-  mac_mgt: 00:11:25:91:48:3C
-gdx-38:
-  mac_eth0: 00:11:25:c4:34:6c
-  ip_eth0: 172.24.4.2
-  mac_eth1: 00:11:25:c4:34:6d
-  ip_eth1: 172.24.131.2
-  mac_myri0: 00:60:dd:47:59:b1
-  ip_myri0: 172.24.71.2
-  ip_mgt: 172.26.131.2
-  mac_mgt: 00:11:25:91:47:26
-gdx-39:
-  mac_eth0: 00:11:25:c4:34:4a
-  ip_eth0: 172.24.4.3
-  mac_eth1: 00:11:25:c4:34:4b
-  ip_eth1: 172.24.131.3
-  mac_myri0: 00:60:dd:47:59:71
-  ip_myri0: 172.24.71.3
-  ip_mgt: 172.26.131.3
-  mac_mgt: 00:11:25:91:45:A8
-gdx-3:
-  mac_eth0: 00:11:25:c4:35:3a
-  ip_eth0: 172.24.1.3
-  mac_eth1: 00:11:25:c4:35:3b
-  ip_eth1: 172.24.128.3
-  mac_myri0: 00:60:dd:47:59:76
-  ip_myri0: 172.24.68.3
-  ip_mgt: 172.26.128.3
-  mac_mgt: 00:11:25:91:47:3B
-gdx-40:
-  mac_eth0: 00:11:25:c4:33:66
-  ip_eth0: 172.24.4.4
-  mac_eth1: 00:11:25:c4:33:67
-  ip_eth1: 172.24.131.4
-  mac_myri0: 00:60:dd:47:68:87
-  ip_myri0: 172.24.71.4
-  ip_mgt: 172.26.131.4
-  mac_mgt: 00:11:25:91:46:84
-gdx-41:
-  mac_eth0: 00:11:25:c4:34:86
-  ip_eth0: 172.24.4.5
-  mac_eth1: 00:11:25:c4:34:87
-  ip_eth1: 172.24.131.5
-  mac_myri0: 00:60:dd:47:59:04
-  ip_myri0: 172.24.71.5
-  ip_mgt: 172.26.131.5
-  mac_mgt: 00:11:25:91:45:AB
-gdx-42:
-  mac_eth0: 00:11:25:c4:2b:f0
-  ip_eth0: 172.24.4.6
-  mac_eth1: 00:11:25:c4:2b:f1
-  ip_eth1: 172.24.131.6
-  mac_myri0: 00:60:dd:47:67:94
-  ip_myri0: 172.24.71.6
-  ip_mgt: 172.26.131.6
-  mac_mgt: 00:11:25:91:49:2C
-gdx-43:
-  mac_eth0: 00:11:25:c4:33:2a
-  ip_eth0: 172.24.4.7
-  mac_eth1: 00:11:25:c4:33:2b
-  ip_eth1: 172.24.131.7
-  mac_myri0: 00:60:dd:47:59:05
-  ip_myri0: 172.24.71.7
-  ip_mgt: 172.26.131.7
-  mac_mgt: 00:11:25:91:45:BD
-gdx-44:
-  mac_eth0: 00:11:25:c4:2f:50
-  ip_eth0: 172.24.4.8
-  mac_eth1: 00:11:25:c4:2f:51
-  ip_eth1: 172.24.131.8
-  mac_myri0: 00:60:dd:47:59:00
-  ip_myri0: 172.24.71.8
-  ip_mgt: 172.26.131.8
-  mac_mgt: 00:11:25:91:48:EC
-gdx-45:
-  mac_eth0: 00:11:25:c4:35:18
-  ip_eth0: 172.24.4.9
-  mac_eth1: 00:11:25:c4:35:19
-  ip_eth1: 172.24.131.9
-  mac_myri0: 00:60:dd:47:59:a3
-  ip_myri0: 172.24.71.9
-  ip_mgt: 172.26.131.9
-  mac_mgt: 00:11:25:91:49:3F
-gdx-46:
-  mac_eth0: 00:11:25:c4:09:c6
-  ip_eth0: 172.24.4.10
-  mac_eth1: 00:11:25:c4:09:c7
-  ip_eth1: 172.24.131.10
-  mac_myri0: 00:60:dd:47:65:db
-  ip_myri0: 172.24.71.10
-  ip_mgt: 172.26.131.10
-  mac_mgt: 00:11:25:91:76:3B
-gdx-47:
-  mac_eth0: 00:11:25:c4:35:99
-  ip_eth0: 172.24.4.11
-  mac_eth1: 00:11:25:c4:35:9a
-  ip_eth1: 172.24.131.11
-  mac_myri0: 00:60:dd:47:58:f6
-  ip_myri0: 172.24.71.11
-  ip_mgt: 172.26.131.11
-  mac_mgt: 00:11:25:91:48:52
-gdx-48:
-  mac_eth0: 00:11:25:c4:2d:6c
-  ip_eth0: 172.24.4.12
-  mac_eth1: 00:11:25:c4:2d:6d
-  ip_eth1: 172.24.131.12
-  mac_myri0: 00:60:dd:47:5a:85
-  ip_myri0: 172.24.71.12
-  ip_mgt: 172.26.131.12
-  mac_mgt: 00:11:25:91:46:06
-gdx-49:
-  mac_eth0: 00:11:25:c4:33:16
-  ip_eth0: 172.24.5.13
-  mac_eth1: 00:11:25:c4:33:17
-  ip_eth1: 172.24.132.13
-  mac_myri0: 00:60:dd:47:5a:80
-  ip_myri0: 172.24.72.13
-  ip_mgt: 172.26.132.13
-  mac_mgt: 00:11:25:91:49:11
-gdx-4:
-  mac_eth0: 00:11:25:c4:35:40
-  ip_eth0: 172.24.1.4
-  mac_eth1: 00:11:25:c4:35:41
-  ip_eth1: 172.24.128.4
-  mac_myri0: 00:60:dd:47:59:74
-  ip_myri0: 172.24.68.4
-  ip_mgt: 172.26.128.4
-  mac_mgt: 00:11:25:91:49:63
-gdx-50:
-  mac_eth0: 00:11:25:c4:33:92
-  ip_eth0: 172.24.5.14
-  mac_eth1: 00:11:25:c4:33:93
-  ip_eth1: 172.24.132.14
-  mac_myri0: 00:60:dd:47:67:92
-  ip_myri0: 172.24.72.14
-  ip_mgt: 172.26.132.14
-  mac_mgt: 00:11:25:91:49:3C
-gdx-51:
-  mac_eth0: 00:11:25:c4:49:8e
-  ip_eth0: 172.24.5.15
-  mac_eth1: 00:11:25:c4:49:8f
-  ip_eth1: 172.24.132.15
-  mac_myri0: 00:60:dd:47:5a:8d
-  ip_myri0: 172.24.72.15
-  ip_mgt: 172.26.132.15
-  mac_mgt: 00:11:25:91:45:C1
-gdx-52:
-  mac_eth0: 00:11:25:c4:35:97
-  ip_eth0: 172.24.5.16
-  mac_eth1: 00:11:25:c4:35:98
-  ip_eth1: 172.24.132.16
-  mac_myri0: 00:60:dd:47:5a:7c
-  ip_myri0: 172.24.72.16
-  ip_mgt: 172.26.132.16
-  mac_mgt: 00:11:25:91:47:21
-gdx-54:
-  mac_eth0: 00:11:25:c4:35:bc
-  ip_eth0: 172.24.5.18
-  mac_eth1: 00:11:25:c4:35:bd
-  ip_eth1: 172.24.132.18
-  mac_myri0: 00:60:dd:47:5a:84
-  ip_myri0: 172.24.72.18
-  ip_mgt: 172.26.132.18
-  mac_mgt: 00:11:25:91:45:93
-gdx-55:
-  mac_eth0: 00:11:25:c4:3b:bc
-  ip_eth0: 172.24.5.19
-  mac_eth1: 00:11:25:c4:3b:bd
-  ip_eth1: 172.24.132.19
-  mac_myri0: 00:60:dd:47:59:6f
-  ip_myri0: 172.24.72.19
-  ip_mgt: 172.26.132.19
-  mac_mgt: 00:11:25:91:49:0B
-gdx-56:
-  mac_eth0: 00:11:25:c4:3c:7c
-  ip_eth0: 172.24.5.20
-  mac_eth1: 00:11:25:c4:3c:7d
-  ip_eth1: 172.24.132.20
-  mac_myri0: 00:60:dd:47:59:40
-  ip_myri0: 172.24.72.20
-  ip_mgt: 172.26.132.20
-  mac_mgt: 00:11:25:91:47:96
-gdx-57:
-  mac_eth0: 00:11:25:c4:3c:24
-  ip_eth0: 172.24.5.21
-  mac_eth1: 00:11:25:c4:3c:25
-  ip_eth1: 172.24.132.21
-  mac_myri0: 00:60:dd:47:88:43
-  ip_myri0: 172.24.72.21
-  ip_mgt: 172.26.132.21
-  mac_mgt: 00:11:25:91:49:50
-gdx-58:
-  mac_eth0: 00:11:25:c4:39:3e
-  ip_eth0: 172.24.5.22
-  mac_eth1: 00:11:25:c4:39:3f
-  ip_eth1: 172.24.132.22
-  mac_myri0: 00:60:dd:47:68:42
-  ip_myri0: 172.24.72.22
-  ip_mgt: 172.26.132.22
-  mac_mgt: 00:11:25:91:46:51
-gdx-59:
-  mac_eth0: 00:11:25:c4:2e:30
-  ip_eth0: 172.24.5.23
-  mac_eth1: 00:11:25:c4:2e:31
-  ip_eth1: 172.24.132.23
-  mac_myri0: 00:60:dd:47:67:89
-  ip_myri0: 172.24.72.23
-  ip_mgt: 172.26.132.23
-  mac_mgt: 00:11:25:91:49:03
-gdx-5:
-  mac_eth0: 00:11:25:c4:33:52
-  ip_eth0: 172.24.1.5
-  mac_eth1: 00:11:25:c4:33:53
-  ip_eth1: 172.24.128.5
-  mac_myri0: 00:60:dd:47:59:68
-  ip_myri0: 172.24.68.5
-  ip_mgt: 172.26.128.5
-  mac_mgt: 00:11:25:91:47:B0
-gdx-6:
-  mac_eth0: 00:11:25:c4:35:1e
-  ip_eth0: 172.24.1.6
-  mac_eth1: 00:11:25:c4:35:1f
-  ip_eth1: 172.24.128.6
-  mac_myri0: 00:60:dd:47:59:77
-  ip_myri0: 172.24.68.6
-  ip_mgt: 172.26.128.6
-  mac_mgt: 00:11:25:91:48:17
-gdx-71:
-  mac_eth0: 00:11:25:c4:35:78
-  ip_eth0: 172.24.6.35
-  mac_eth1: 00:11:25:c4:35:79
-  ip_eth1: 172.24.133.35
-  mac_myri0: 00:60:dd:47:68:7f
-  ip_myri0: 172.24.73.35
-  ip_mgt: 172.26.133.35
-  mac_mgt: 00:11:25:91:49:1F
-gdx-73:
-  mac_eth0: 00:11:25:c4:35:9e
-  ip_eth0: 172.24.7.1
-  mac_eth1: 00:11:25:c4:35:9f
-  ip_eth1: 172.24.134.1
-  mac_myri0: 00:60:dd:47:59:6d
-  ip_myri0: 172.24.74.1
-  ip_mgt: 172.26.134.1
-  mac_mgt: 00:11:25:91:46:80
-gdx-74:
-  mac_eth0: 00:11:25:c4:2d:0a
-  ip_eth0: 172.24.7.2
-  mac_eth1: 00:11:25:c4:2d:0b
-  ip_eth1: 172.24.134.2
-  mac_myri0: 00:60:dd:47:59:73
-  ip_myri0: 172.24.74.2
-  ip_mgt: 172.26.134.2
-  mac_mgt: 00:11:25:91:48:46
-gdx-75:
-  mac_eth0: 00:11:25:c4:39:ae
-  ip_eth0: 172.24.7.3
-  mac_eth1: 00:11:25:c4:39:af
-  ip_eth1: 172.24.134.3
-  mac_myri0: 00:60:dd:47:59:07
-  ip_myri0: 172.24.74.3
-  ip_mgt: 172.26.134.3
-  mac_mgt: 00:11:25:91:49:00
-gdx-76:
-  mac_eth0: 00:11:25:c4:2b:2c
-  ip_eth0: 172.24.7.4
-  mac_eth1: 00:11:25:c4:2b:2d
-  ip_eth1: 172.24.134.4
-  ip_mgt: 172.26.134.4
-  mac_mgt: 00:11:25:91:49:37
-gdx-77:
-  mac_eth0: 00:11:25:c4:38:94
-  ip_eth0: 172.24.7.5
-  mac_eth1: 00:11:25:c4:38:95
-  ip_eth1: 172.24.134.5
-  mac_myri0: 00:60:dd:47:5a:7a
-  ip_myri0: 172.24.74.5
-  ip_mgt: 172.26.134.5
-  mac_mgt: 00:11:25:91:46:46
-gdx-78:
-  mac_eth0: 00:11:25:c4:26:56
-  ip_eth0: 172.24.7.6
-  mac_eth1: 00:11:25:c4:26:57
-  ip_eth1: 172.24.134.6
-  mac_myri0: 00:60:dd:47:59:06
-  ip_myri0: 172.24.74.6
-  ip_mgt: 172.26.134.6
-  mac_mgt: 00:11:25:91:47:F1
-gdx-79:
-  mac_eth0: 00:11:25:c4:35:76
-  ip_eth0: 172.24.7.7
-  mac_eth1: 00:11:25:c4:35:77
-  ip_eth1: 172.24.134.7
-  mac_myri0: 00:60:dd:47:67:97
-  ip_myri0: 172.24.74.7
-  ip_mgt: 172.26.134.7
-  mac_mgt: 00:11:25:91:48:4D
-gdx-80:
-  mac_eth0: 00:11:25:c4:3a:be
-  ip_eth0: 172.24.7.8
-  mac_eth1: 00:11:25:c4:3a:bf
-  ip_eth1: 172.24.134.8
-  mac_myri0: 00:60:dd:47:67:95
-  ip_myri0: 172.24.74.8
-  ip_mgt: 172.26.134.8
-  mac_mgt: 00:11:25:91:45:A3
-gdx-82:
-  mac_eth0: 00:11:25:c4:24:04
-  ip_eth0: 172.24.7.10
-  mac_eth1: 00:11:25:c4:24:05
-  ip_eth1: 172.24.134.10
-  mac_myri0: 00:60:dd:47:59:a0
-  ip_myri0: 172.24.74.10
-  ip_mgt: 172.26.134.10
-  mac_mgt: 00:11:25:91:45:D5
-gdx-83:
-  mac_eth0: 00:11:25:c4:26:8a
-  ip_eth0: 172.24.7.11
-  mac_eth1: 00:11:25:c4:26:8b
-  ip_eth1: 172.24.134.11
-  mac_myri0: 00:60:dd:47:5a:c8
-  ip_myri0: 172.24.74.11
-  ip_mgt: 172.26.134.11
-  mac_mgt: 00:11:25:91:46:03
-gdx-84:
-  mac_eth0: 00:11:25:c4:3a:86
-  ip_eth0: 172.24.7.12
-  mac_eth1: 00:11:25:c4:3a:87
-  ip_eth1: 172.24.134.12
-  mac_myri0: 00:60:dd:47:65:a6
-  ip_myri0: 172.24.74.12
-  ip_mgt: 172.26.134.12
-  mac_mgt: 00:11:25:91:46:1A
-gdx-85:
-  mac_eth0: 00:11:25:c4:3b:44
-  ip_eth0: 172.24.8.13
-  mac_eth1: 00:11:25:c4:3b:45
-  ip_eth1: 172.24.135.13
-  mac_myri0: 00:60:dd:47:59:72
-  ip_myri0: 172.24.75.13
-  ip_mgt: 172.26.135.13
-  mac_mgt: 00:11:25:91:48:93
-gdx-86:
-  mac_eth0: 00:11:25:c4:26:4c
-  ip_eth0: 172.24.8.14
-  mac_eth1: 00:11:25:c4:26:4d
-  ip_eth1: 172.24.135.14
-  mac_myri0: 00:60:dd:47:59:6c
-  ip_myri0: 172.24.75.14
-  ip_mgt: 172.26.135.14
-  mac_mgt: 00:11:25:91:49:47
-gdx-87:
-  mac_eth0: 00:11:25:c4:4d:f4
-  ip_eth0: 172.24.8.15
-  mac_eth1: 00:11:25:c4:4d:f5
-  ip_eth1: 172.24.135.15
-  mac_myri0: 00:60:dd:47:68:81
-  ip_myri0: 172.24.75.15
-  ip_mgt: 172.26.135.15
-  mac_mgt: 00:11:25:91:48:B4
-gdx-88:
-  mac_eth0: 00:11:25:c4:4e:28
-  ip_eth0: 172.24.8.16
-  mac_eth1: 00:11:25:c4:4e:29
-  ip_eth1: 172.24.135.16
-  mac_myri0: 00:60:dd:47:67:93
-  ip_myri0: 172.24.75.16
-  ip_mgt: 172.26.135.16
-  mac_mgt: 00:11:25:91:46:3A
-gdx-89:
-  mac_eth0: 00:11:25:c4:4e:5c
-  ip_eth0: 172.24.8.17
-  mac_eth1: 00:11:25:c4:4e:5d
-  ip_eth1: 172.24.135.17
-  mac_myri0: 00:60:dd:47:68:79
-  ip_myri0: 172.24.75.17
-  ip_mgt: 172.26.135.17
-  mac_mgt: 00:11:25:91:45:CE
-gdx-90:
-  mac_eth0: 00:11:25:c4:51:02
-  ip_eth0: 172.24.8.18
-  mac_eth1: 00:11:25:c4:51:03
-  ip_eth1: 172.24.135.18
-  mac_myri0: 00:60:dd:47:59:02
-  ip_myri0: 172.24.75.18
-  ip_mgt: 172.26.135.18
-  mac_mgt: 00:11:25:91:49:5A
-netgdx-10:
-  mac_eth0: 00:11:25:c4:28:42
-  ip_eth0: 172.24.110.10
-  mac_eth1: 00:11:25:c4:28:43
-  ip_eth1: 172.24.240.10
-  mac_eth2: 00:10:18:16:4d:f9
-  ip_eth2: 172.24.190.10
-  ip_mgt: 172.26.240.10
-  mac_mgt: 00:11:25:91:48:4C
-netgdx-11:
-  mac_eth0: 00:11:25:c4:4f:56
-  ip_eth0: 172.24.110.11
-  mac_eth1: 00:11:25:c4:4f:57
-  ip_eth1: 172.24.240.11
-  mac_eth2: 00:10:18:16:4d:dc
-  ip_eth2: 172.24.190.11
-  ip_mgt: 172.26.240.11
-  mac_mgt: 00:11:25:91:45:A4
-netgdx-12:
-  mac_eth0: 00:11:25:c4:4d:ea
-  ip_eth0: 172.24.110.12
-  mac_eth1: 00:11:25:c4:4d:eb
-  ip_eth1: 172.24.240.12
-  mac_eth2: 00:10:18:16:4d:57
-  ip_eth2: 172.24.190.12
-  ip_mgt: 172.26.240.12
-  mac_mgt: 00:11:25:91:45:C0
-netgdx-13:
-  mac_eth0: 00:11:25:c4:52:b6
-  ip_eth0: 172.24.110.13
-  mac_eth1: 00:11:25:c4:52:b7
-  ip_eth1: 172.24.240.13
-  mac_eth2: 00:10:18:16:4d:cb
-  ip_eth2: 172.24.190.13
-  ip_mgt: 172.26.240.13
-  mac_mgt: 00:11:25:91:45:86
-netgdx-14:
-  mac_eth0: 00:11:25:c4:52:62
-  ip_eth0: 172.24.110.14
-  mac_eth1: 00:11:25:c4:52:63
-  ip_eth1: 172.24.240.14
-  mac_eth2: 00:10:18:16:4f:d9
-  ip_eth2: 172.24.190.14
-  ip_mgt: 172.26.240.14
-  mac_mgt: 00:11:25:91:48:E0
-netgdx-15:
-  mac_eth0: 00:11:25:c4:4f:76
-  ip_eth0: 172.24.110.15
-  mac_eth1: 00:11:25:c4:4f:77
-  ip_eth1: 172.24.240.15
-  mac_eth2: 00:10:18:16:4f:0b
-  ip_eth2: 172.24.190.15
-  ip_mgt: 172.26.240.15
-  mac_mgt: 00:11:25:91:49:51
-netgdx-16:
-  mac_eth0: 00:11:25:c4:4f:48
-  ip_eth0: 172.24.110.16
-  mac_eth1: 00:11:25:c4:4f:49
-  ip_eth1: 172.24.240.16
-  mac_eth2: 00:10:18:16:4f:0e
-  ip_eth2: 172.24.190.16
-  ip_mgt: 172.26.240.16
-  mac_mgt: 00:11:25:91:48:F6
-netgdx-17:
-  mac_eth0: 00:11:25:c4:42:e0
-  ip_eth0: 172.24.110.17
-  mac_eth1: 00:11:25:c4:42:e1
-  ip_eth1: 172.24.240.17
-  mac_eth2: 00:10:18:16:4f:23
-  ip_eth2: 172.24.190.17
-  ip_mgt: 172.26.240.17
-  mac_mgt: 00:11:25:91:48:3E
-netgdx-18:
-  mac_eth0: 00:11:25:c4:4e:c6
-  ip_eth0: 172.24.110.18
-  mac_eth1: 00:11:25:c4:4e:c7
-  ip_eth1: 172.24.240.18
-  mac_eth2: 00:10:18:16:28:1c
-  ip_eth2: 172.24.190.18
-  ip_mgt: 172.26.240.18
-  mac_mgt: 00:11:25:91:47:B7
-netgdx-19:
-  mac_eth0: 00:11:25:c4:4f:8a
-  ip_eth0: 172.24.110.19
-  mac_eth1: 00:11:25:c4:4f:8b
-  ip_eth1: 172.24.240.19
-  mac_eth2: 00:10:18:16:4f:74
-  ip_eth2: 172.24.190.19
-  ip_mgt: 172.26.240.19
-  mac_mgt: 00:11:25:91:46:65
-netgdx-1:
-  mac_eth0: 00:11:25:c4:4f:62
-  ip_eth0: 172.24.110.1
-  mac_eth1: 00:11:25:c4:4f:63
-  ip_eth1: 172.24.240.1
-  mac_eth2: 00:10:18:16:4f:2e
-  ip_eth2: 172.24.190.1
-  ip_mgt: 172.26.240.1
-  mac_mgt: 00:11:25:91:48:1E
-netgdx-20:
-  mac_eth0: 00:11:25:c4:4d:7c
-  ip_eth0: 172.24.110.20
-  mac_eth1: 00:11:25:c4:4d:7d
-  ip_eth1: 172.24.240.20
-  mac_eth2: 00:10:18:16:4e:ec
-  ip_eth2: 172.24.190.20
-  ip_mgt: 172.26.240.20
-  mac_mgt: 00:11:25:91:47:7E
-netgdx-21:
-  mac_eth0: 00:11:25:c4:50:2e
-  ip_eth0: 172.24.110.21
-  mac_eth1: 00:11:25:c4:50:2f
-  ip_eth1: 172.24.240.21
-  mac_eth2: 00:10:18:0b:e2:c2
-  ip_eth2: 172.24.190.21
-  ip_mgt: 172.26.240.21
-  mac_mgt: 00:11:25:91:47:A5
-netgdx-22:
-  mac_eth0: 00:11:25:c4:4f:7e
-  ip_eth0: 172.24.110.22
-  mac_eth1: 00:11:25:c4:4f:7f
-  ip_eth1: 172.24.240.22
-  mac_eth2: 00:10:18:0b:d8:a3
-  ip_eth2: 172.24.190.22
-  ip_mgt: 172.26.240.22
-  mac_mgt: 00:11:25:91:46:5F
-netgdx-23:
-  mac_eth0: 00:11:25:c4:4f:fe
-  ip_eth0: 172.24.110.23
-  mac_eth1: 00:11:25:c4:4f:ff
-  ip_eth1: 172.24.240.23
-  mac_eth2: 00:10:18:00:fa:12
-  ip_eth2: 172.24.190.23
-  ip_mgt: 172.26.240.23
-  mac_mgt: 00:11:25:91:46:68
-netgdx-24:
-  mac_eth0: 00:11:25:c4:54:8a
-  ip_eth0: 172.24.110.24
-  mac_eth1: 00:11:25:c4:54:8b
-  ip_eth1: 172.24.240.24
-  mac_eth2: 00:10:18:06:4f:a5
-  ip_eth2: 172.24.190.24
-  ip_mgt: 172.26.240.24
-  mac_mgt: 00:11:25:91:46:A2
-netgdx-25:
-  mac_eth0: 00:11:25:c4:52:68
-  ip_eth0: 172.24.110.25
-  mac_eth1: 00:11:25:c4:52:69
-  ip_eth1: 172.24.240.25
-  mac_eth2: 00:10:18:06:4f:e8
-  ip_eth2: 172.24.190.25
-  ip_mgt: 172.26.240.25
-  mac_mgt: 00:11:25:91:46:4B
-netgdx-26:
-  mac_eth0: 00:11:25:c4:52:ba
-  ip_eth0: 172.24.110.26
-  mac_eth1: 00:11:25:c4:52:bb
-  ip_eth1: 172.24.240.26
-  mac_eth2: 00:10:18:06:4e:db
-  ip_eth2: 172.24.190.26
-  ip_mgt: 172.26.240.26
-  mac_mgt: 00:11:25:91:48:ED
-netgdx-28:
-  mac_eth0: 00:11:25:c4:4d:28
-  ip_eth0: 172.24.110.28
-  mac_eth1: 00:11:25:c4:4d:29
-  ip_eth1: 172.24.240.28
-  mac_eth2: 00:10:18:06:4f:ae
-  ip_eth2: 172.24.190.28
-  ip_mgt: 172.26.240.28
-  mac_mgt: 00:11:25:91:47:48
-netgdx-29:
-  mac_eth0: 00:11:25:c4:4f:9e
-  ip_eth0: 172.24.110.29
-  mac_eth1: 00:11:25:c4:4f:9f
-  ip_eth1: 172.24.240.29
-  mac_eth2: 00:10:18:06:4f:b5
-  ip_eth2: 172.24.190.29
-  ip_mgt: 172.26.240.29
-  mac_mgt: 00:11:25:91:45:F3
-netgdx-2:
-  mac_eth0: 00:11:25:c4:52:bc
-  ip_eth0: 172.24.110.2
-  mac_eth1: 00:11:25:c4:52:bd
-  ip_eth1: 172.24.240.2
-  mac_eth2: 00:10:18:16:50:6c
-  ip_eth2: 172.24.190.2
-  ip_mgt: 172.26.240.2
-  mac_mgt: 00:11:25:91:47:B2
-netgdx-30:
-  mac_eth0: 00:11:25:c4:4f:38
-  ip_eth0: 172.24.110.30
-  mac_eth1: 00:11:25:c4:4f:39
-  ip_eth1: 172.24.240.30
-  mac_eth2: 00:10:18:06:4f:b0
-  ip_eth2: 172.24.190.30
-  ip_mgt: 172.26.240.30
-  mac_mgt: 00:11:25:91:49:2D
-netgdx-3:
-  mac_eth0: 00:11:25:c4:4f:66
-  ip_eth0: 172.24.110.3
-  mac_eth1: 00:11:25:c4:4f:67
-  ip_eth1: 172.24.240.3
-  mac_eth2: 00:10:18:16:4a:f0
-  ip_eth2: 172.24.190.3
-  ip_mgt: 172.26.240.3
-  mac_mgt: 00:11:25:91:45:CB
-netgdx-4:
-  mac_eth0: 00:11:25:c4:50:94
-  ip_eth0: 172.24.110.4
-  mac_eth1: 00:11:25:c4:50:95
-  ip_eth1: 172.24.240.4
-  mac_eth2: 00:10:18:16:4f:31
-  ip_eth2: 172.24.190.4
-  ip_mgt: 172.26.240.4
-  mac_mgt: 00:11:25:91:47:BA
-netgdx-5:
-  mac_eth0: 00:11:25:c4:50:90
-  ip_eth0: 172.24.110.5
-  mac_eth1: 00:11:25:c4:50:91
-  ip_eth1: 172.24.240.5
-  mac_eth2: 00:10:18:16:4e:c9
-  ip_eth2: 172.24.190.5
-  ip_mgt: 172.26.240.5
-  mac_mgt: 00:11:25:91:47:83
-netgdx-7:
-  mac_eth0: 00:11:25:c4:4f:60
-  ip_eth0: 172.24.110.7
-  mac_eth1: 00:11:25:c4:4f:61
-  ip_eth1: 172.24.240.7
-  mac_eth2: 00:10:18:16:4d:86
-  ip_eth2: 172.24.190.7
-  ip_mgt: 172.26.240.7
-  mac_mgt: 00:11:25:91:48:4A
-netgdx-8:
-  mac_eth0: 00:11:25:c4:4f:d4
-  ip_eth0: 172.24.110.8
-  mac_eth1: 00:11:25:c4:4f:d5
-  ip_eth1: 172.24.240.8
-  mac_eth2: 00:10:18:16:4e:f0
-  ip_eth2: 172.24.190.8
-  ip_mgt: 172.26.240.8
-  mac_mgt: 00:11:25:91:45:95
-netgdx-9:
-  mac_eth0: 00:11:25:c4:54:5c
-  ip_eth0: 172.24.110.9
-  mac_eth1: 00:11:25:c4:54:5d
-  ip_eth1: 172.24.240.9
-  mac_eth2: 00:10:18:16:4f:91
-  ip_eth2: 172.24.190.9
-  ip_mgt: 172.26.240.9
-  mac_mgt: 00:11:25:91:45:E6