diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
index bf9792dec0e55dab5c8276bf5b9fd5c5fbb06df2..11ef51727a5fbd78482fa556f6e35e6a864b51fe 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.131",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.131",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-1-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index 36f1abce5f9a6bdddd072b2e633d29e5346e29c5..3c908850898721fc88851aa64db82c44a49e45bc 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.140",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.140",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-10-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
index 5e213f6430a630b6f555e13a5f0eb2a31e4d8648..f9e5656ebba2770544fdd35a2168d12a323ce5e1 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.141",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.141",
@@ -35,6 +37,44 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Device 10c9 (rev 01)"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "mac": "00:30:48:da:6f:67",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s  (rev a0)"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.2.141",
+      "mac": "00:30:48:da:77:38",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "adonis-11-bmc.grenoble.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.33"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
index 194aa66206051fe168172c039a27e4bb6fce89c3..a1e6a9ddb29841e6af843f9c539e942627e3852a 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.142",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.142",
@@ -35,6 +37,44 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "Device 10c9 (rev 01)"
+    },
+    {
+      "device": "eth1",
+      "enabled": false,
+      "interface": "Ethernet",
+      "mac": "00:25:90:01:eb:fd",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s  (rev a0)"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.2.142",
+      "mac": "00:25:90:01:e7:fb",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "adonis-12-bmc.grenoble.grid5000.fr",
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.33"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
index 081d3267b07f749ea34402755985746b09fcb867..399ed32484821dbe7fa5bade5f6d0272604d3e7b 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.132",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.132",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-2-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index 82c3d76e365c48a6ed692861c64326638db702b7..1f475ae762e3f35bbd2cbf8c314638403a7fdc8c 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.133",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.133",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-3-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index f771604be9187ff244da976f6a224b921e0abe13..04a7a6a15feb799c92467571a403c2169c975feb 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.134",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.134",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-4-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index 9c6ae9c9f60ca3227dd3eefd809e072e4715a8ac..7269aba4b4e59fba5e90c840a38b3d886c5fdb86 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.135",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.135",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-5-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index 7d9e1071b8c290a5f58f9fce3b183d4f2e1014e2..bc3e53981ae3bad7eaa019c72ebd03dd52dac317 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.136",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.136",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-6-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index 3b719cf74d830f78bd1f03f73c615ad7cf80a2f5..23ca2c08ec00c98c507d55d0b5fb834e982055b8 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.137",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.137",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-7-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index 9d3e64afbc48c9dba9620eb00cf8af53dda9e571..26da87cc280828a2431ed8400b1b5a6d2d3fcde8 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.138",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.138",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-8-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index 4df2f72301e64b2c507537bfdd33af8cfef8d74e..c2bb2200120a9e4079dc36dc9f3743ae3eefc6ab 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.139",
@@ -24,6 +25,7 @@
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.139",
@@ -44,7 +46,9 @@
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10c9 (rev 01)"
     },
     {
       "enabled": true,
@@ -55,7 +59,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "adonis-9-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Super Micro Computer Inc.",
+      "version": "1.15"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index a42cf03cf76b326cc5e3c701b7bdd8acc881deb9..a0219058c67dfe97b27db993e2c88c06f804199a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.51",
@@ -20,10 +21,24 @@
       "network_address": "edel-1-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.51",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-1-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-1-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index f5554aff6e37b2a32efdcd751270791b16def80e..58e868e83f043d139e39f9be0726c069db6dbc60 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.60",
@@ -20,10 +21,24 @@
       "network_address": "edel-10-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.60",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-10-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:95",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-10-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index 45c4895b87073845a91e378d85a1b4f4728df623..24c7bfa9c810b87adf97331293f96e3ecbe0b416 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.61",
@@ -20,10 +21,24 @@
       "network_address": "edel-11-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.61",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-11-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:91",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-11-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index 55fab92b25fe7d855f4ae86b6c67305ad2093602..81d580c81e8d2f617166c1858d50f25aefa49ede 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.62",
@@ -20,10 +21,24 @@
       "network_address": "edel-12-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.62",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-12-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:3d",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-12-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index aa6fe4ea242fac43756580102c56a97bac46401d..d47d80409ed5e187afed090736978256e494ebbd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.63",
@@ -20,10 +21,24 @@
       "network_address": "edel-13-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.63",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-13-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:dd",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-13-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index adde872bc7d963f17c2adaf80ec1ff28065ccd12..184459b28283354e6eb472ddb12879fc3e8d2409 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.64",
@@ -20,10 +21,24 @@
       "network_address": "edel-14-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.64",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-14-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:ad",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-14-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 2d5e48e46dcf8adac0cf773bf4c5c1c1ec37b0b3..327ecb506d88b7ce532ea839b5be8932167d96ee 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.65",
@@ -20,10 +21,24 @@
       "network_address": "edel-15-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.65",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-15-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:fd",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-15-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index 73313fcce6e91574d11cc3b7de5ce2a444395076..a3d23f96cfcc3c179d32a2cccdaa6ac20417278c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.66",
@@ -20,10 +21,24 @@
       "network_address": "edel-16-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.66",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-16-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:0d",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-16-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index f1bb81c5adeaad9958e33bfa9a0ded4bd2c01575..ac3ca2a9eaa2a1e2c90ac4d1f7e0b8ddf81e6d48 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.67",
@@ -20,10 +21,24 @@
       "network_address": "edel-17-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.67",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-17-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:9f",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-17-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index 9e6dac870caa612591365593b1b1e1f191030471..b136a18758e407ea39a90fc22fd621dfc73a144c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.68",
@@ -20,10 +21,24 @@
       "network_address": "edel-18-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.68",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-18-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:83",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-18-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index 67fc511ff2cc71fab17002c4a57f9b115d4a14c1..2d0af5e29afa4c3ea6ca5f5eaf096417bd57273e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.69",
@@ -20,10 +21,24 @@
       "network_address": "edel-19-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.69",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-19-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:d1",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-19-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index c88627fe6f98da2b47b7eeaf3e244f7b559aff65..1fdabd8be494e01993e46f1b7828e12eaeea74ca 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.52",
@@ -20,10 +21,24 @@
       "network_address": "edel-2-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.52",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-2-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-2-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index 7b4bc3419f8d0237043576b9c64ed7a9060f1aae..ace28d1d247a2e16c431f1f6e1cb1016925c2be3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.70",
@@ -20,10 +21,24 @@
       "network_address": "edel-20-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.70",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-20-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:79",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-20-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index ac344a57a35c0f0267842a564ec559cf87f49c3a..f682c30f26a51d4dea69567b7403152b27732c07 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.71",
@@ -20,10 +21,24 @@
       "network_address": "edel-21-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.71",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-21-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:4b",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-21-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index 8e588ac08acbe718f16ba34f516033a37c24bfd4..29b08c9ddd79fd84362604e01e1fd961462f00f4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.72",
@@ -20,10 +21,24 @@
       "network_address": "edel-22-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.72",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-22-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:9d",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-22-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index a9466949bc7cb18b5e2a469b69a8b7fe63035d0b..a36947e2b4d68bd3571e20f954461d4f11b41bb1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.73",
@@ -20,10 +21,24 @@
       "network_address": "edel-23-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.73",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-23-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:d7",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-23-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index 846166209504c34d72dea60035c20761e30bf960..c3366441207b1408b2afd48f207f6835b2a78376 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.74",
@@ -20,10 +21,24 @@
       "network_address": "edel-24-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.74",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-24-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:27",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-24-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index e5006c33a1c83dc00f550260fdb9e45378d2fb8d..c5f6036331f9b8ea4ad148be4bceece47952bb0c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.75",
@@ -20,10 +21,24 @@
       "network_address": "edel-25-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.75",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-25-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:aa:b9",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-25-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index ecb613415c94df895fc9458928416d12f1071b93..532f584a37749ccd6fb0c81be6505df5019400d7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.76",
@@ -20,10 +21,24 @@
       "network_address": "edel-26-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.76",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-26-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:55",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-26-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
index 71299a3d9433e2827136c830db0726cf7ae8e638..bc76d27339aa9b5ad73e89f6ade2ff3c6b3080dc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.77",
@@ -20,10 +21,24 @@
       "network_address": "edel-27-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.77",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-27-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:3f",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-27-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index 42d6b7bc84a271f61ed9f385e7e41c98cec2dad5..fe0f7c5b6740ac08054e48aa8042277434a53823 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.78",
@@ -20,10 +21,24 @@
       "network_address": "edel-28-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.78",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-28-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:49",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-28-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index f4a8a6a4602e44251c9c64b4e503332b3f0ef6a9..0070a7bd55ee08f1dc02f083e9d2f610b0ee099b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.79",
@@ -20,10 +21,24 @@
       "network_address": "edel-29-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.79",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-29-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:bf",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-29-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index c81c4287a22ca2fde8ccd46ad3cb7bff210a3f63..326085ac6791404bbe7349ebabe4b698c9fe967b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.53",
@@ -20,10 +21,24 @@
       "network_address": "edel-3-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.53",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-3-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:8d",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-3-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index 7d8b06cccd93b22f78f65a16be7a0bc0b861dee1..6865a04ea0768d2d83c2ac03a8ef8088816d7125 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.80",
@@ -20,10 +21,24 @@
       "network_address": "edel-30-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.80",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-30-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:bb",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-30-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index 8afb66b23a38fedf752e4b7630f909f71bcd5107..260f25c3ce11a87986634d70c909bb77e992ee87 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.81",
@@ -20,10 +21,24 @@
       "network_address": "edel-31-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.81",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-31-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:af:3f",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-31-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index 3e0fb1cb0c345c35da3c5a61c1a3b7cbcc512baf..0b1e0bfc40d7347a67267bbe666433d5d3b9775e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.82",
@@ -20,10 +21,24 @@
       "network_address": "edel-32-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.82",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-32-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:47",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-32-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index d507d5557c2caf9395be60b704e91f53a18a0616..f48e3f9757fc62776a0326640922e30f762bfd5b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.83",
@@ -20,10 +21,24 @@
       "network_address": "edel-33-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.83",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-33-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:4d",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-33-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index 028536349ab1c98abf968e9fe57053de77a10b42..4b094be0b24373c7839668fa0ac86dc433ec8049 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.84",
@@ -20,10 +21,24 @@
       "network_address": "edel-34-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.84",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-34-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:a3",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-34-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index 24903526b9c836db315d9f00f0840f9a124fa504..b586503b337033ca0246126474f92f469830798a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.85",
@@ -20,10 +21,24 @@
       "network_address": "edel-35-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.85",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-35-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:63",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-35-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index 5c91a0de79bedc44895bc287cf481444c7c7c3ef..a6768383b7325ccb7caf1b048ce72f627b710678 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.86",
@@ -20,10 +21,24 @@
       "network_address": "edel-36-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.86",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-36-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:e7",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-36-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index 8e68d7488b811e534f5963c6aa1b50ed5e9ade06..343004a004558101ce47ecab6415aafa00426194 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.87",
@@ -20,10 +21,24 @@
       "network_address": "edel-37-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.87",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-37-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:aa:65",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-37-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index 651db6540e0118172ca1ca8b9a32c823d10af3e1..37f52183d6782e883d99a9d78f1b213b53c5d47c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.88",
@@ -20,10 +21,24 @@
       "network_address": "edel-38-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.88",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-38-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:d3",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-38-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index 53b66a692c752bc2d5ad2d7b916048a065a16280..dab255a88fc61bc7022e61d86a3aaf505b910ada 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.89",
@@ -20,10 +21,24 @@
       "network_address": "edel-39-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.89",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-39-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:2b",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-39-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index 796ad35f7eaf8ffa3ee51401fcf4966909c7e353..a654a1370ef287ec211ad98d31cc5974c1ea3cb5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.54",
@@ -20,10 +21,24 @@
       "network_address": "edel-4-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.54",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-4-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": null,
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-4-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index 426668044e514acc3d5bd0ac1a2e87671cd29902..1e811293ef28b443f113f97cc7f1db9923a1ed58 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.90",
@@ -20,10 +21,24 @@
       "network_address": "edel-40-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.90",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-40-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:a9",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-40-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index b2df3a24475367577d0cad76b2a32582c0427b89..fab9438564d523bb0e3902b8982c86e7be3ba2a1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.91",
@@ -20,10 +21,24 @@
       "network_address": "edel-41-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.91",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-41-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:37",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-41-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index 661a6329cf28eae6584b36f71c2a95db8467d800..61587b70832e1d0478ad47463032321572c8e8f6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.92",
@@ -20,10 +21,24 @@
       "network_address": "edel-42-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.92",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-42-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-42-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index a5da05fc38c89c4e1aebe4fd7478ed6060eec5df..9d8cd1a0c417e7eb2903dae44c2e14a398e5e32f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.93",
@@ -20,10 +21,24 @@
       "network_address": "edel-43-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.93",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-43-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:d5",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-43-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index f6d2d0610aab7543f44efc10685829ae4924895b..15706c0c5f4991880d71906b02f1f30249305c95 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.94",
@@ -20,10 +21,24 @@
       "network_address": "edel-44-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.94",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-44-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:ab",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-44-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
index c30b2a735192032d1ff6a72ea5cf954506d73f54..ea33d71ef46c177d882c035507f8873161a39fbf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.95",
@@ -20,10 +21,24 @@
       "network_address": "edel-45-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.95",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-45-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:23",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-45-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index 5bfdc85d460a0b3d43bc5b66e2d99cafade38036..0d5dd24faacd55684597ffa5b6d9974a978c860a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.96",
@@ -20,10 +21,24 @@
       "network_address": "edel-46-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.96",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-46-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:4b",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-46-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index caaa5c30dfd67c8969550eef129b8482a34399ba..51f89be52b8cdefd8c7ccdaf53b3c57b46d27d01 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.97",
@@ -20,10 +21,24 @@
       "network_address": "edel-47-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.97",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-47-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:bd",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-47-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index 58c4504433444e1f72b079ea1fc3fa648954f68e..1ca818bba44bad5306f5671ae03f2b6afa953aa9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.98",
@@ -20,10 +21,24 @@
       "network_address": "edel-48-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.98",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-48-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:71",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-48-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index 31a9ae3d215cd383e05961e42d0ddb249c55fcd0..ea5d71b2542aa3f7226f05422b5f3a347ffac90c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.99",
@@ -20,10 +21,24 @@
       "network_address": "edel-49-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.99",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-49-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:b7",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-49-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index 6ca8c1188327c6f2dfceff20c30a46fd49a44938..4e12a04629fb34b94c657c2a252622da8fd0a737 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.55",
@@ -20,10 +21,24 @@
       "network_address": "edel-5-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.55",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-5-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:93",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-5-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index 73f755be38e77d3c25c5cd8fe55b110d624ba462..cadc4db65f5ee3c5214532a944fd75ad7113d261 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.100",
@@ -20,10 +21,24 @@
       "network_address": "edel-50-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.100",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-50-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:11",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-50-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 65a07c072e7a937f3765b3ef6841c24ae1795c80..a57d14a98d4778167707d99f10a43d0ae855a5ab 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.101",
@@ -20,10 +21,24 @@
       "network_address": "edel-51-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.101",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-51-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:41",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-51-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index 0f5281119160f2ece0797b77a19b82b7d540d0e2..f2230d48b3d49c326440e5cc7bdca138ed486a68 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.102",
@@ -20,10 +21,24 @@
       "network_address": "edel-52-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.102",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-52-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:1b",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-52-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index 9c9676f3a969c48aa379830e27a60200eb1f2001..d50cd92cde42c3b9fccb272d47c62b5fce621672 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.103",
@@ -20,10 +21,24 @@
       "network_address": "edel-53-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.103",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-53-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:35",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-53-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
index 7829b8a417000cd5a4f7879e293dc224a097edb0..9ff2e66de77985fe60d9ee04bfa9925133a8090d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.104",
@@ -20,10 +21,24 @@
       "network_address": "edel-54-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.104",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-54-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:3b",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-54-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index 3ae3a5f6eebbcad37790b3b8f27e3392a6b0aaac..151088a324d2c7b0c8b5ed084be1bacddc8a39eb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.105",
@@ -20,10 +21,24 @@
       "network_address": "edel-55-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.105",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-55-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:e9",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-55-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 4ba2166ea780d1fd4b5633cd324120713b4fa4d0..69e267e5864d8bd6afb1ac8743bd98cbe5b897c1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.106",
@@ -20,10 +21,24 @@
       "network_address": "edel-56-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.106",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-56-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:01",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-56-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index 4993e793765817c2add672ce6653406249fc29db..0100609cf75e67d7744e5bb7e246ab4fd314ae03 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.107",
@@ -20,10 +21,24 @@
       "network_address": "edel-57-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.107",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-57-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:af",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-57-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index fc7062f2f994eddb070c0fd8d4c4608c14776081..846a32b76ca666c79ce6d7be8b02a364acd9be7d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.108",
@@ -20,10 +21,24 @@
       "network_address": "edel-58-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.108",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-58-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:09",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-58-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index 3a4aa17d05acc5aad0b4a45cc8475c88a46434e8..ec8cb8e9e499430ba8af17a6dd6da476296a0958 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.109",
@@ -20,10 +21,24 @@
       "network_address": "edel-59-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.109",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-59-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:5b",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-59-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index 330779de389f123881c2c75e53faca29e750cf3f..ba9409a80c8a7a3550361ed9c055dfba45b421f5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.56",
@@ -20,10 +21,24 @@
       "network_address": "edel-6-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.56",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-6-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:55",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-6-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index 21a82953c90e11d2ba6a05e60c62e38771253af7..49f3132bca8c73cacf647b2322831614fd33f841 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.110",
@@ -20,10 +21,24 @@
       "network_address": "edel-60-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.110",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-60-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:25",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-60-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
index 375155d94a994787b2c02c78edcbf4ad07947455..65afd17db355556af90f0455da2ede009db7512e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.111",
@@ -20,10 +21,24 @@
       "network_address": "edel-61-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.111",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-61-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:5d",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-61-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index 47d5e3c149ba2019ec0fb8edc46143fd400a06de..9b3117c3a66a0cd99b2b53b893f13179bc7ff364 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.112",
@@ -20,10 +21,24 @@
       "network_address": "edel-62-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.112",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-62-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:db",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-62-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index 436c3dcb2d8b544677559fc224229e7b19b6b33d..f0d485a77c2dfbda93897f4387336a5db073ae04 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.113",
@@ -20,10 +21,24 @@
       "network_address": "edel-63-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.113",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-63-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:b3",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-63-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index 2da880d3d9480a0324e0aabbd854ebc43cadf467..f4fbe895753f012e2457b9af4bf984e7f841977c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.114",
@@ -20,10 +21,24 @@
       "network_address": "edel-64-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.114",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-64-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:aa:21",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-64-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index b99627be59e73a8beba88e13361f779527e0f245..cb90561f35a9a52d02b3bc67b5e16a6e826bc714 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.115",
@@ -20,10 +21,24 @@
       "network_address": "edel-65-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.115",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-65-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:e5",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-65-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index 16cb2f2655164cc087d5ee68d5c09a5df5d2a023..9a5f45f3258da015b5a253b554cbe952b6742b57 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.116",
@@ -20,10 +21,24 @@
       "network_address": "edel-66-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.116",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-66-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:15",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-66-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index a50b4e1c11e274728f8b20f3f5c5280b27c56ed2..5e6b63be28388d80e522e10f03c3f6fe40b452af 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.117",
@@ -20,10 +21,24 @@
       "network_address": "edel-67-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.117",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-67-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:fb",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-67-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index 4d0ff4293e1074fefbf1c10c230d88bee58603ce..67ab278e68d3c8210027efeecc01394c7dd5a458 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.118",
@@ -20,10 +21,24 @@
       "network_address": "edel-68-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.118",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-68-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:b1",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-68-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index 6f31a85f02e759dae5b108e5a04ead7608e848b5..b3e7966744e08f41bc63982404abedae4d658a03 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.119",
@@ -20,10 +21,24 @@
       "network_address": "edel-69-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.119",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-69-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:69",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-69-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index 6b042db769dc7c5a376eac55ec420bdd9676481b..6c00fa84550000f4329fba312677e9be2326b083 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.57",
@@ -20,10 +21,24 @@
       "network_address": "edel-7-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.57",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-7-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:41",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-7-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index abfe9c5b193341852c466f81bc65417ecdd7f97d..eec3371138b0baca037f2b94e3cdc68f55c9abdd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.120",
@@ -20,10 +21,24 @@
       "network_address": "edel-70-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.120",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-70-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ac:67",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-70-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index 797fa52e51e212e4f32d875b980460a9e570f9cc..5c920e18d72a9566e89a106d70be2010b729fbd3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.121",
@@ -20,10 +21,24 @@
       "network_address": "edel-71-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.121",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-71-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:67",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-71-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index 5d3490ea9c08e2893618e5408bf6b1cfea401891..f2d029027a78edc81a81c13dc829e4640b385a0a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.122",
@@ -20,10 +21,24 @@
       "network_address": "edel-72-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.122",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-72-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:51",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-72-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index c00145d0f265dc764e1a0482a2ab77fa0b29f2d0..c01947f61f4300172d6825108e8a75f529a4923a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.58",
@@ -20,10 +21,24 @@
       "network_address": "edel-8-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.58",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-8-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:57",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-8-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index df407be9f543abd984ce5b1e155cdef7d9824547..65bc22354ebc7021829ac800a907a1548cfb30ac 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.59",
@@ -20,10 +21,24 @@
       "network_address": "edel-9-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
-      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
+    },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "interface": "InfiniBand",
+      "ip": "",
+      "management": false,
+      "mountable": true,
+      "mounted": false,
+      "rate": 40000000000,
+      "vendor": "Mellanox",
+      "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)"
     },
     {
       "device": "eth0",
+      "driver": "igb",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.59",
@@ -32,15 +47,21 @@
       "mountable": true,
       "mounted": true,
       "network_address": "edel-9-eth0.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
+      "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "08:00:38:35:ab:d9",
       "management": false,
       "mountable": false,
       "mounted": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Device 10e7 (rev 01)"
     },
     {
       "enabled": true,
@@ -51,7 +72,9 @@
       "mountable": false,
       "mounted": false,
       "network_address": "edel-9-bmc.grenoble.grid5000.fr",
-      "rate": 100000000
+      "rate": 100000000,
+      "vendor": "Unknown",
+      "version": "1.7"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
index f4c7a4c71260c6b95fbb37266783184a368c9bec..2cc2cacabc6891fb80d11ba95e9bdf5108c22237 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.1",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:85:be",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.1",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-1.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-1-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
index 6728bb1124cf51635e5df82fcc1e115bb8f82724..5f50ffd09cf2e2c2db02d60b50c7e9bfc9d5ef5c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.10",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:41:fc",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.10",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-10.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-10-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
index 3114b639595e3c94f1e499030c3662c57e4a3bfa..3b0f7a5a8aca4d7772736a58dcecddd5813d5ea4 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.11",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:42:06",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.11",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-11.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-11-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
index ca9a982ea9877e22ba9eeb21c0c0b8380bc465c6..14f4f6728707e4c14c9dce3b8824d0ed0d7fe33d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.12",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7e:a3:d4",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.12",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-12.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-12-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
index 3acb0ac4efd895713f51a19a1642f5b3948e6e5d..ea3a4ddd9061ebdfc87234d015c040392d6cb354 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.13",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:3e:c6",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.13",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-13.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-13-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
index 0aeccc97df776511b665abc9abf0a3c36fe2f3f9..75799e1b0cbf3c705dbfb7f0358d8b5b2b50a394 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.14",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:41:f2",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.14",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-14.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-14-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
index 5fd8f248103db2cd27c02900a885014965276fe6..d0004572d2f1f97f4286b39ba6de488eda6121af 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.15",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:3e:f2",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.15",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-15.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-15-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
index f252a1d297273394cb3a942484ce0f4c06101dbb..74f765414a900d7002c18c5a80f5ec8784fb989c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.16",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:3e:b8",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.16",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-16.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-16-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
index 9f08a0d83eaf334cc158368e7545cece633c2dda..f56154b915f730538b8cc0106e5c2827a777319d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.17",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:8a:8c",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.17",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-17.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-17-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
index 00e89e42060b436cffa31e43fdc3588dd8adff41..491f468b66c4179d7307ca1ac9b12fa6cecc3bd7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.18",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:85:fa",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.18",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-18.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-18-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
index fdb6a66577e3f980c5f3cddd926f8b3ccb9e1b0a..6d847f50ec4a754a70278011f714a5271741b0f5 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.19",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:8a:8a",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.19",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-19.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-19-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
index b24e7eb92e634f343c2bf97e242dba8a5d4a7043..d132c416be8135350ab9cfa59ed162030d00e328 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.2",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:91:62",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.2",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-2.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-2-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
index f04ea4bbac45a5c8ef430bd8272acd51e83123de..e03c73599198841ed39ff7d780933115ddfde318 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.20",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:8a:86",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.20",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-20.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-20-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
index 5fe5c39b1391ad094ca2abb61aeeba1a355edbd5..d959a88ff2163e1d6f7a579a632db8f117935e23 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.21",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:3e:f0",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.21",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-21.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-21-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
index 43b99bd95d5f18d80c7a4cd2e9065c4ef6232945..571798e6ef99b7f580063f140cc311c06636c3d1 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.22",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:41:f4",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.22",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-22.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-22-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
index 6fc68b7859e4248b0fb340fe5c828e14c712949f..67c78a57644dfb9a4dc6d01278b486aba5c93d83 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.23",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:29:dc",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.23",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-23.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-23-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
index 22bf124cdd25fdb3e3c74aca737ce87d98300581..90e04db254c3cc4cf27b0adac9d1f7525cd80ae8 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.24",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:29:de",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.24",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-24.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-24-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
index 1027efef39b2f0d44d7e59e2d0814093e8c5f143..de2f2379cfbaa41192480678ebd50bc6fda6a1e7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.25",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:41:5a",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.25",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-25.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-25-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
index d29dd616a73feae5641706193a9c2b9ff536d39d..43c2de41cca717f79367acd6fd794893f13d984d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.26",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:41:5c",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.26",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-26.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-26-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
index 9d71aecbd84f1ff8fc11f549ff3233adcbb2f724..40eb328c9fbb436a16619f7cf27586e9f8d472f7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.27",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:41:4e",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.27",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-27.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-27-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
index b983e19e1014f9585f8e86d89927a271e41a45e9..4f2a4bfa61d9b065609a1a087f4f307379ef85a7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.28",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:41:5e",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.28",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-28.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-28-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
index 5b21bc73168764f1d09e529f2e2ab86f288873cf..6d0573621bea36a509760bc3832a5f41eee2d555 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.29",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:29:ec",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.29",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-29.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-29-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
index 1703dacb9aaa5c0fd2f6686b8651c06c7b8a5fee..15891227c865fcaeebd6372229e9dec650238ae5 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.3",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:3f:0a",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.3",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-3.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-3-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
index 16d3edc3fe7ef8640aea7f425c397999205ecdbd..da2041f17193dc0be191608615d56fb4f04556d1 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.30",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:29:da",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.30",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-30.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-30-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
index 1e341d7d37ff5e640a7155c23e90cea8c0203d11..2f3d7251026f196b2c7f68c250628ba48648f032 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.31",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.31",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-31.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-31-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
index 041d713c372f872dbfd4bf82af9644f6394cb2b1..e19bdc64c6da8ee0fc895ea3d8bf220d8bce681b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.32",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:41:50",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.32",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-32.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-32-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
index 7448b202e9ce802065ad11beda8a48976aa8ffc2..a56892ac3926c270ed35eb6f2669688b0036199c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.33",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:29:ee",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.33",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-33.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-33-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
index 3f88e05b3b6eb23c653a337632626b595a5d7970..4a92cf714bed60b4f37a0b1ddc36845cba7cebdb 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.34",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:29:40",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.34",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-34.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-34-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
index 678cddf398ef827f66cafd411d729b9446b3a50c..2583233c181e1ddecb737eb4098a344ee8ea72eb 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.4",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:44:8c",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.4",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-4.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-4-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
index bbf5c7ef91ddc210d9ad31878bd3c2b20ca54348..26b5c5a82cec8cb410ae6b6b23d976f37d13a026 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.5",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:c1:b4:a6",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.5",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-5.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-5-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
index c5e4d0edb0c17ef3997598ef5317565547efdf4f..2f9460cd17d8669a0f389bd8ec44166b172b3864 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.6",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.6",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-6.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-6-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
index e781d9f0c7f683719816d9005708610e6270c668..54c663a96c39a39abed19e49e42d628f217701a1 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.7",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:29:e0",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.7",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-7.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-7-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
index 3879a3bc413b18dbfc1c6ae86538c337a81ce191..734721f60350e706bf9560473d59e2551ec1f4e2 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.8",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:29:e2",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.8",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-8.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-8-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
index d89a46f440529dcc4ad788d2232687134d1729ae..47f751d778b8aaf4cd4e8cc5e91cebd82f41c0f1 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -11,6 +11,7 @@
   "network_adapters": [
     {
       "device": "ib0",
+      "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
       "ip": "172.16.18.9",
@@ -28,10 +29,13 @@
       "interface": "Ethernet",
       "mac": "00:30:48:7f:3e:ea",
       "management": false,
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "device": "eth1",
+      "driver": "e1000e",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.9",
@@ -40,7 +44,9 @@
       "mountable": true,
       "mounted": true,
       "network_address": "genepi-9.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Intel",
+      "version": "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
     },
     {
       "enabled": true,
@@ -50,7 +56,9 @@
       "management": true,
       "mountable": false,
       "network_address": "genepi-9-bmc.grenoble.grid5000.fr",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Peppercon AG (10437)",
+      "version": "1.50"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
index bd2645afa4c2d42f77e5fd4e9c1abf6aba43982e..953f2e9be4558605805cbb0a3c85c27c798d19a0 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-1-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
index 0ebf18db5cd16f0ef86da1b036484e5b5d015a8f..ef96d39b82838487d6c0e1fae3787319e8478269 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-10-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
index 58222edb23bfb11b7fb16c64adf013d15443d2d7..f4b3f62ecb684bbbb3a9ca61ebcaf1105757c5b2 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-11-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
index a34bef21542c5be3c8860c1b6048f1a686a09c09..4ac0e38299dbfb0f9d82593480de52cdc732b981 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-12-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
index ec8a9a32dc914ab245bf79dcb0c5fe24987fcb2a..b684bb8ceac4e9bac5c1f596ab1e1b167ade0d98 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-13-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
index b35310eb1ce360346ee8c4c052b7019ae4402208..9901d6a58f9ef2179a49c2336d7d5e6339ab346f 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-14-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
index 41d3ba38ddf43989e451760def96a64f3432e486..80d06de039747bf83ce764007ba87924a8907e47 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-15-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
index 22812a275ff4b76c5d1a2f877fd31f12c73e76a8..c0e0b63988527a79d35c4f3b64cf423ccfd2eb0d 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-16-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
index bfc186689d026ebdef460c735c306cc74a3c61b4..a479d9712ba05accba177a4ba14e9d26713b2008 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-17-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
index bc3e9ed61f1cae71fa6a9e262fe6714fd57e7022..ee5c292e757591d23c0ae93d8c5efd9662e0b18c 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-18-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
index 47e62bf0b805ddefce6f33812e985040b3722b8f..691ae8e98b5008c2a42395d0a2746e9cd87dabdb 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-19-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
index 44ac698c8d254141cf5c2fdc955de27c72fcc804..84ef90379760e1fadc75e79cf2e394ea3522ad5f 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-2-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
index 5192cabf62e2858f99ddb07cfca36424aed7f6f3..fccf35850880f1a7731f85ca277d1d297c12a365 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-20-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
index 1f75db4701302d92abede38ffbf2b4cc6699927b..2b0dd367863f53d6daffa1c2569dad306ec37efb 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-21-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
index 4c41426ae04ef1e8a57640d706b726b863cf2f63..7ac0c0a4aeea9f718435319957ca64d004789509 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-22-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
index f273623758c6842e4eb2ca2a0f7ebd62766f1d4b..9834db1598ae4bd270cbae235d1f3d750859621c 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-23-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
index e13a15eaa8d63e334ea74595220a91fb96d5af5d..9df926a9d3bdd0d90de1e9149786069f3c82a77d 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-24-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
index e8c5e8117ce1346eaa8417c7188f12e2f43dcc73..a209dcf17667bcadc7aa9f59c77663d58e4ce179 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-25-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
index 7b80ef1136d128e3eec8f62d31d2b920d60eb847..d6830a15499e8dca872b1d25dee158ea538461c6 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-26-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
index 1204ff92e5ca0de9dea34d953214ab5f3ededf58..21127d4b11f741ee9f95396ea40096749dab3265 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-3-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
index 248895f8373467992e90db6cf59f134e38ab1033..f84e4335d6488f1c58efb9b8fc0da3415eba8218 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-4-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
index 545766c7e7c9b00837540baea02141acf810e438..0e28b65b89e75cca0f0a38c63f35d13587463416 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-5-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
index b8ba7cb91396855fb5a05a5e75990dcaa0d39975..d804d0c76392a90d8e57ab9ba41fdd406217e37c 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-6-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
index 1100619c8108e7efd73c1740f4add9c7ceea2282..698f4ce3e84b0d15f9b9eda845e4d04445b82a71 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-7-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
index 73add55abff92812a981ff45e84db817acd70e54..b5987f2e1e5fdda64627ed8754f717aff9df5dda 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-8-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
index be534efafa5c4217d1729b5922459039338513fc..745643cba08e8f2c35d4062fbac9e5016c4213d9 100755
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
@@ -52,8 +52,8 @@
       "network_address": "chicon-9-rsa.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "IBM",
+      "version": "1.18"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
index 95f466367897714aee2f9c3469613fc170ebf338..c65d92bd93ac55d7ca8ac3ede0fb0f7b75e17b7d 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-1-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
index fe56fbe219f47c00f19d073ca59230f248692f47..29afa21b6eacc12eefd0f9ad3e72e30ef0e7f9db 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-10-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
index 73b13a786190297b0c2e25bc884ffb01771064ae..ff263a96ca1bfa3dda37ce99b5526fd7da5b3983 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-11-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
index c799b485089fa2394f07da5068d6b8b42e7ba669..a45cd75ec678fbf57efc2e4101cc023df0223277 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-12-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
index 6e02b299d66097659589bafe19c5e8656f6c955b..47f18af87c54274d23e5108666d96b66eba5964b 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-13-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
index e6f91de5cb8ad12d81d69ea98870fd01887955a9..7d8bbca9e9abd009c24b689c8650d2a1f1ad0146 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-14-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
index 4e26caea13f98c51dbb7c16597cd97323c877d8b..7a1432d9f64797e63dd13f196f9a76f79b90912f 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-15-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
index 04c4bbfa6bd318d2fadd9a847166e0e74461dd1e..ae893cbc55381c425f2396ca145cb6613479a926 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-16-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
index 2d584edc23ddfefc815daaf90c5bf87976af0876..74629a6f6caa3f145c7b7c9eb6eae32b301106b8 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-17-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
index a65648f453a03b01236de0dc239ef4df77fc5b8f..3679a0b02234d0dc36b31b96103e6db6d6ffc236 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-18-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
index d1a271d204831f3e8b48ec1e58a26c23519df589..8520c57cf3e6250ed02f115b09c605ad2c4781fa 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-19-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
index 7eb8b861f12aecd6afa17b4107c1db7313075c13..691f6df5b68a83c874c8707215ee8ad73e0ed58e 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-2-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
index b3d90b1b4e2b73bb3feb2856df476fe5da9dbf58..3164add25c5891287fd3015634f74fda83c568a5 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-20-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
index 76cd1d0d8e665649fb0c2b78bb69fc8c8f360109..260127b70d24513c1b7a4727612675e23c6ed147 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-3-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
index b1eb35b980b6c3b1d4cf42386d887282cf69a430..b4d147786642435182c736d4a3b404a48db4ffb1 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-4-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
index 833c5e5e791fd34c8af1817a97db9010dca8176e..ea03b1d58f970263ac606df049642402f4be4a2b 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-5-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
index 913b05417b1127982f9468fabec6744fc8f631f8..08879d396f0ed41943d516eae5f45c65573978fc 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-6-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
index 4d4b2807b47397eed69f8e58a8ca683470c6500c..4f761204127895946959a15abb324ef3f1d5a743 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-7-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
index 8e3189e2d4eda31c644d4867054b2c28a7b3825f..7feb471c0a98ecca779a03a7eb178bf0bce7b7a7 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-8-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
index 50541756cf73fca03c57eb6c9c46ae58ddc3d76f..6520ea1d67f5a1e8212083e67d1da59fd5e19a44 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
@@ -52,8 +52,8 @@
       "network_address": "chimint-9-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Dell",
+      "version": "1.54"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
index a3bb418b75366d85ec9d18f56f21762f565141c6..5bc4e85b05cc3bb565d649ca40f6da2a11b4f8bd 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-1-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
index 655a1043d060483b0fcc3545b4e2b0e23154c970..0fe1e58cb44b82b5d18bb5bdd820cd5efce5a3df 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-10-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
index 121e5cb558c9d55c7d478eb50b0bde765c5be89a..dc6d728c0026b5fa3b067b3bbc78c012e761b595 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-11-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
index 9c2637921b9e9cca4ed4ea532195789f94094fb8..9e8a86156eed4e9ea737fb80da133531f65287e9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-12-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
index deab623efe19dc84f9a3f06ee7ad9eae813ef3ad..a9e9e8f51abc376e2b138264117d1ee9db24abe0 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-13-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
index 570ccd4cf6f5af34c6e0dd5f2de985f2fd176abb..aafaf756d7e781a9d2f649022666b5c40673d32a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-14-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
index 116de4f22001abdaa1dc22fc590b474bae1431df..bbd63e834c39cf2e4f5130809bb6a7db40fe07c9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-15-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
index f4e0aec9ba921814843b9122daf88ce3fa8617cb..a44778bb29c026878e22a17d79b46b3acfe60f76 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-16-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
index f9e8f246c37b151bcff5a79546b2d2697c243050..b08f93234e7f9d8fe5719b6fa4bf31d37dc7138d 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-17-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
index b77eb43105daa833a0af20cfdf40cd7d72dfaf9e..a80f599fb29c226905f744388bad9e25e929d0c4 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-18-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
index eeaeee54e235ceeb89eeef5f19a1b9ffb208596a..d6d385264e6cb008dce72fe12df0bb3c2caf1e0a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-19-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
index 5b91cbcbd549d6abaaeb7ccca16bfe632459a7fd..2bc316e27f6a37085ad75fb0d1396e97abef1cc6 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-2-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
index 9c9c01e6673218cb5be7b39882d826c4594fdfc0..179cafa6484e95dc289fbc2fca280e9263dbae31 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-20-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
index 3b605e7d629606a287f95a41516fa739c15c4f5b..e60b64d264707257fa8d67c9257b2edb6c24ac38 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-21-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
index 52cdba283d37a9e3092fa23c7c30bf8f5f54c7bf..42c18a7205dfa3984f3fe0758d7adc059220da65 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-22-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
index ebf6b3a364fc26bdc01d6efbe21d907a43071085..5cec17e50d7303e623486c4f14e89c094dafc3f4 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-23-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
index 4f641b9574f2d976561e2acdbaa509f51bdd36d8..d28bd0bf99296b3585863e370278e4fc0709066f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-24-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
index 13319d39632d93669f8e29b724723271e059f377..39d607aa3375e1ae800497cd4cd0a06987db5d5f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-25-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
index 98bb0b945aea350e4caea1fd5e52006c16c818d9..a1a2ac060d13abc19bdf7d89238620f6d1bff5ee 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-26-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
index 1703affb2637affe3ef9ffdca7378a34bd260367..aa34834d24e2a4fb6b191728e37966734d78e883 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-27-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
index 6b44953324b31357efbc7bb2b8caae053dbfe660..d4f7bc7143f0c78e551791ff290871f690e5dea8 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-28-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
index 1634fe9e89e4893bc7fc66baa18ef6b061d0a541..6bb31bed5039ee73e622b84da9e8494c2731505d 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-29-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
index d76d9ca2ca0625e4b35c21ac346e5136f9d1a4b6..38cd8cd9e10dc06df8a0b59f402405e61f6b789a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-3-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
index 6fd5f39ba0801c6a9fbb6592e5cbbfb85039d150..d7ec69d8db1a565bf7e48fbbfb5ccbbf34cb60ab 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-30-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
index c3f72a5a024d67abc46d9a0a7daa0d98d6b57bd5..42c5f1c4ab4fcfde02698e1715f9265321108dde 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-31-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
index 0aef221ab3099b941e25d2f0d7a52fce5c502a07..4f650b2278e8dc3ff453299357da6498090efb6c 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-32-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
index 5433b091f9c49c85f9fe3721064a269e50bea4a8..c2c0bd49bca721e42de66a83372706a8792698d6 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-33-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
index b074b0c59955db438325c855e168dd11686e58b5..0c0bfb93d16f63d41de55f5edbc16dae4f4e09db 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-34-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
index 9e2a21172df9b4f19b7a8518f83b399497a1136b..0eb9eb2632cff2338b4beb19eb6a1962751d9992 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-35-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
index e91e4c3c13f220ee161e8ff25ee64a40b1502d6a..3598db2db98c76ed7605e0d695177d3d95fc597f 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-36-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
index 4c2cf13fd4800e38a225a5d60ceb5c46fcdee32d..431ab55e360e904a2005ce1fa7819b7bc7687dd5 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-37-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
index ded6b52860e5f2237e2a26b8a4aedb8540fb9f9f..e730cd6db185e9fe4836d4ba409f05203d5ceb60 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-38-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
index f9fed2cf7134ab81a665ee7f4a9146258d1c64e3..816bdbf5a19690b02c0902815e33e1636bd48ed9 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-39-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
index 92298e824810091b5df9e5c2e4c4786ad006449f..e5f7c24d1a4ab6b17a5950c5f71b8d60053fab8a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-4-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
index 2d19922e0941bc744f56ef2e9794546c000acd2d..46e00b3c67ba880d2d31112c9d92657e8c24e945 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-40-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
index d69f9b9188fee0abf093d7967e579fbc0043618d..0f28e2d26aff400001f0c335b4b7d6b6d3d6cc0a 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-41-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
index 3b6eccd368c3661486a5b7c2c5e5aceb8bebb23c..77464721e8c488d3dfdc02a7c6ee0e64f14b50aa 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-42-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
index 04a586c315d71c3b61757000b6fae8a94b915a1b..1e404138d608d8880db7b715222675d7412d0804 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-43-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
index e69c9fac8765441abcb317d61a066358214000df..d987aa4288534f23b0b8c46bcfe4b4e14cac3e8d 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-44-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
index 8e6aa4e35ab05b2eec75557485068ae227861599..1fc9a60eb3519c18ba058d67166cb20b0d8ff4db 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-45-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
index ec0a82ae23f6c47a7b1e4ae5b8f872cbed33d579..6a2e2e78ca83e15764e10ab112dba9ea615dc80e 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-46-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
index 3be67590cf284181537eed2df42a287bf1e8b1ab..756d109ae1384b8315f8c92272a48b5a131d95b5 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-5-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
index 28d560f901cd50d972dd6efab043f3e24b00a77c..b0f20e2329a95b136c6d32cf5e6f8c1fdec76ba0 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-6-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
index 1b529d6aa16d3d28453d071712ed5d674d835c26..d7a09b0ab10543f3d8f722048a7a27e550b6b4de 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-7-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
index 8be2aa18fe1ab25626a79478cb230f4e7715622e..465bdacb38a26c9d641db6eba263cbefa8a9eaec 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-8-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
index 168f1eb150ef9becfe4f889f496bb1b01b46067f..1bf37f6328a62a1d6dc4c34d5f808fffef1d0a75 100755
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
@@ -52,8 +52,8 @@
       "network_address": "chinqchint-9-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Peppercon",
+      "version": "1.46"
     },
     {
       "device": "myri0",
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
index 04377d73315fc38cfc72246483cd5a22738a47eb..bfbf9436741386691891e40b1993c75e96cc5e99 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
@@ -52,8 +52,8 @@
       "network_address": "chirloute-1-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Inventec",
+      "version": 1.14
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
index 013e9bd1460dc97a46c96347b5ef8c5952ec82a5..38001410cc3b5d05fdeb79201501029401ec6824 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
@@ -52,8 +52,8 @@
       "network_address": "chirloute-2-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Inventec",
+      "version": 1.14
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
index c8a5eb6f7f80c246e29612471cc3634714c22fb6..699aa3a9ccbe97b7f4683ddbc39b3e3a0169fd6f 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
@@ -52,8 +52,8 @@
       "network_address": "chirloute-3-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Inventec",
+      "version": 1.14
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
index 875c0e0a4a8699e8de576b734f9388663735ceb8..f08f3bc742ea7799ba547a5e59dbee44b6db4f10 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
@@ -52,8 +52,8 @@
       "network_address": "chirloute-4-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Inventec",
+      "version": 1.14
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
index edfcc99d8bb3283e4450676a1390b88e6b6357a3..18f649ce610b68c605e705df23efc0dd4777b563 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
@@ -52,8 +52,8 @@
       "network_address": "chirloute-5-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Inventec",
+      "version": 1.14
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
index 2a1a933fbd348594e09d798b8b50cbbd78295582..249d06613d9333fb9ed791b7a08255dd6ff5a851 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
@@ -52,8 +52,8 @@
       "network_address": "chirloute-6-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Inventec",
+      "version": 1.14
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
index 1cf18b046f736c4803a3fb7384b81250dde88baa..3e29c007b8cb7078cd3b7016d29759ee7eca3405 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
@@ -52,8 +52,8 @@
       "network_address": "chirloute-7-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Inventec",
+      "version": 1.14
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
index 960a55162db9d2376d18471569079b8dc758aa3b..7440504e29c97e4cb0b52a129358ba3104d53ee1 100644
--- a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
@@ -52,8 +52,8 @@
       "network_address": "chirloute-8-ipmi.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
-      "vendor": null,
-      "version": null
+      "vendor": "Inventec",
+      "version": 1.14
     }
   ],
   "operating_system": {
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..a75da1a931494179aab49fcf2794d67af375716f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..f0aff7c5af13352c123ade7a42b4b6b4935a0dff 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..64f369f4787f676f91c4ee502b45d7b49773a4d1 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..ec36795093c731eae393888d9c87c10c120d35e2 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..79af57e862d76bf4a005ec58feb96046035e93dc 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..de3a37a4ef871bb50893d0e680669c528c58a3ed 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..33208ad1e453eb503212cbd2fbf6cb6acc40dda8 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..c949be3c2c3031a57d095da01b205e192d08690b 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..3d94160031bf47fdada9f6fb14994dcc0ffe1b5d 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..d2af3d7c4216b321810a2f5b8135cb2e7356d682 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..412a996ff580d9e7ae4e95b2f8f2dea6b11eea31 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": false,
+      "mounted": false,
+      "network_address": "gdx-108-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.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": "nil",
+      "switch_mac": "nil",
       "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": "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.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..5a91a1aa875bc8d039dfbbb568bc46073b8bda42 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:53:23",
       "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..254783612128151f55dbd109262d58d2a7e68552 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..75901726d16ece69dd3b1cb8e5e8267194438e4d 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:51:A5",
       "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..4313f8a9dd5ad47c2a5c0c8a657395f2aa5b9bff 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:50:31",
       "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..0c8d30507261b90a14082b7505012ba5bc43c912 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4F:C7",
       "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..40223466f8f31f31d5a13f594dbebe1d755c202b 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:51:49",
       "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..89d9f2c7ca34be4abcaedb3f15f4cc00241f68a4 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:53:01",
       "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..bca40f7e8d9a6f1515e49887be51d20908c8fa86 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4E:45",
       "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..a20c09b601c5612ddf0702f7d4d1ccdd446872e8 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.10.8",
-      "mac": null,
+      "mac": "00:11:25:C4:52:A2",
       "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": "00:11:25:C4:52:A3",
       "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..ebec6b899c384b2db856d93c6153811b83bf23f7 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:52:ED",
       "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..c40d56c71ef31fbe485cc9becb18daeae554bfb7 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:53:EB",
       "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..aa2a267ec42560d536911012dd869597bc01b197 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:51:AD",
       "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..ff63ebe41be53caac605a3703fe98d27a6690f22 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..880ced199b5451ccaa44f53e660b1e4d92ecc20d 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4F:D3",
       "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..339656a3a8b0dc9f695298307369916d122ebc69 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:50:1B",
       "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..9e988ba1eca14948d98ea402addf6a08dec8eb82 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4D:85",
       "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..a124fee9f5e502b62fac8c62dd106bc873541faa 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4E:B1",
       "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..4b18902833e1d6c692ca252824c9c0fdd81ea733 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4D:C9",
       "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..d7e961dee5ab9d8d4537ef7c76721765234b3b0e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:51:F9",
       "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..05727354b46e3f3109fd7c7ddb8d0c4d54132261 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "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.18",
-      "mac": null,
+      "mac": "00:11:25:C4:53:0F",
       "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..424b62fdbe5b69d24c812d9a65fd04813371def5 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..9fc54dd4f23d1bc49da918753c166e6db72b272f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..c22114800bc11f4db3947a616f8d2f16db398a09 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..6d6606a77bc1cae9ebc400c1eef5d1f9802ae034 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..e410a3f941d0c30e19ba6c5771a211162f35e3ee 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..a73d1a371d5e130d8a138d5c4843189c4d2d9ec5 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..37a9edf97e554826afde279109d754e98e5272d2 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..7c6460aca8990e7e984b13be31cffabd91541fae 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..709da780bb0d126c5516773cd1e9a21f25492849 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..1d5f652c7f5906e7f5f56e2439f06f27a147540f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..ba80fd18c7bc0e0afb0a1a0c3b5dbfe6d2273122 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..63523766aec31d289e90ce6a9e103558955e8879 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..b2bf9c1dd1c1b076e4c90a61d34e92e0ebaab1d6 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..3c1cdd831e13c5378e94d3ee952fb4d55849789a 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..0ccc04a954c59d7101e62703997453e56aa33215 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..787f556130ffbf4fd491c25d6f4b4a0799852ff4 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..3870b9beb3342e6ee618ae30924180f50929ac84 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..46a63562b77ce28dc3cee027434433175a3761da 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..bbb3122cff130e36c06f4d1d682cbdf8f50f4dde 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..c1b328280d3020ec4c40ff877b5edbd5b8423773 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": false,
+      "mounted": false,
+      "network_address": "gdx-144-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.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": "nil",
+      "switch_mac": "nil",
       "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,
+      "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.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..3f57d4a492a12b1b7387de97a642dfd08a1dd0fc 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..41f2ac4eda20a586d958cc8c117a5fab46b101c4 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..42a16e904cfebbd08f95c01c80d158ffa7349958 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..4d36f99f310a042ed7c97801c520c0bcd4499ac4 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..16acbca9cfb2b83d4321c7d65744616f7616a90a 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..4830bc6e0a2297f1cf9e4f1703f115088181884d 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..d6cf5dbf96e0708e4fc4c109b852c5f8b49143a1 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..a063917628710900e92979ee3132da7a65fc1bce 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..e16e445dab14a830c62bd09f2cd9cb45a7848348 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..d3ce5e06667b6d1c82506e0bd6e5c48045d8c948 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..6147176757c907dd002a99e7e06d326541bd20c1 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..c088874ebbe57ba360760188c5b0a76a68993e7c 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..3b16fa9b87e7ba6af3c9455b81b02f4dfba484de 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..d874cda2e81a6b3bae49c5092304e277ed86e542 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..9b947ad520057d35eeae228d92db00b33a8bbf0e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..574d33f52788cfa77680ad5226b068d46f47909c 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..c28700534848628e6dfcee26c3143c6a192eb4f7 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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 fa4e84962a69f23711754375a5cf582fe68b0fde..926f45e0d249c51fec27353668fbff779eedb106 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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": 1000000000,
+      "rate": 0,
       "switch": null,
+      "switch_ip": null,
+      "switch_mac": null,
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.26",
+    "name": "debian-x64-5-prod",
+    "release": "5.1.2",
+    "version": "5"
   },
   "processor": {
     "cache_l1": null,
@@ -77,7 +104,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..0cc4ac4417582af15d7c13d2980570f53c3b2bea 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "nil",
       "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..e5179bce2d7efeb86804df0886898685299ee6a9 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "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..d18adb3df94966199ca2f21c73adeff87b671cef 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.19",
-      "mac": null,
+      "mac": "00:11:25:C4:50:86",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.19",
-      "mac": null,
+      "mac": "00:11:25:C4:50:06",
       "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..916bdf117119172c2cda00e88d3fc5117277e315 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.20",
-      "mac": null,
+      "mac": "00:11:25:C4:53:A0",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.20",
-      "mac": null,
+      "mac": "00:11:25:C4:53:A1",
       "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..934836d4812e976faab714636219ba8b3156e7e2 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.21",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:6A",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.21",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:6B",
       "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..3b21c83e7fac304176e0cdc3a52c1167c69e5d61 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.22",
-      "mac": null,
+      "mac": "00:11:25:C4:04:DE",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.22",
-      "mac": null,
+      "mac": "00:11:25:C4:3A:91",
       "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..fcbc53cb45e2c6ab844f727e4c37cc1dd9226087 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.23",
-      "mac": null,
+      "mac": "00:11:25:C4:50:02",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.23",
-      "mac": null,
+      "mac": "00:11:25:C4:50:03",
       "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..f1bf69817ddc90371d1dbb4c10f758e8fcf2501f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.24",
-      "mac": null,
+      "mac": "00:11:25:C4:54:4C",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.141.24",
-      "mac": null,
+      "mac": "00:11:25:C4:54:4D",
       "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..aa2c41c2c89cc665cbc9a2df8ce91024ca7e9c94 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.25",
-      "mac": null,
+      "mac": "00:11:25:C4:45:B0",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.25",
-      "mac": null,
+      "mac": "00:11:25:C4:45:B1",
       "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..c0a21b9eea0e9c983d0409a4d823ad87ee2a8bad 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..1a8ac14c8ac9655cc0a4041db7b6793ae583ec35 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.26",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:00",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.26",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:01",
       "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..f10dfd777410b866f123f6498236d2718aeb5127 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.27",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:08",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.27",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:09",
       "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..1c1cbeb4c4e599182ee97a69bb64913030071363 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.28",
-      "mac": null,
+      "mac": "00:11:25:C4:54:18",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.28",
-      "mac": null,
+      "mac": "00:11:25:C4:54:19",
       "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..d2b431ff38b77a77740e4e3c96ddcb534fa3cd5a 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.29",
-      "mac": null,
+      "mac": "00:11:25:C4:51:DA",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.29",
-      "mac": null,
+      "mac": "00:11:25:C4:51:DB",
       "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..4476a437ef988f84d4c4ba4ecfad64240e15b7e8 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.30",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:46",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.30",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:47",
       "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..7ec563de9cb50240c2f0452532e51d2e310fc36b 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.31",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:AC",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.31",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:AD",
       "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..4008afe176df56b5dbfb40fb89035e716b29205b 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.32",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:CA",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.32",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:CB",
       "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..d3e843ba50eb872924f15696353c64e7a7e11f8b 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.33",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:C4",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.33",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:C5",
       "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..1a0a7f817d43e3f5deb997abc06198bc7c41e4da 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.34",
-      "mac": null,
+      "mac": "00:11:25:C4:50:0A",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.34",
-      "mac": null,
+      "mac": "00:11:25:C4:50:0B",
       "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..658ee7186ae346232e0078cfb8958c6fe8d0255f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.35",
-      "mac": null,
+      "mac": "00:11:25:C4:50:76",
       "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": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.35",
-      "mac": null,
+      "mac": "00:11:25:C4:50:77",
       "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..738ba4343458b2d16741bcd5257eb87b33068e37 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "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.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..30eef328417ec5504a398da40ea24018cb6ec8ec 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": false,
+      "mounted": false,
+      "network_address": "gdx-180-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.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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.15.36",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:E6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-180.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.142.36",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:E7",
       "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..0a2426bc2df45de1c8939f33be677f572d24c357 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": "00:11:25:91:45:DD",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-181-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch14.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.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.1",
-      "mac": null,
+      "mac": "00:11:25:C4:53:4A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-181.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.143.1",
-      "mac": null,
+      "mac": "00:11:25:C4:53:4B",
       "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..3c18a455b87ec5d89e7808eaf424e4bcd42dd5c5 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": "00:11:25:91:47:A0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-182-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch14.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.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.2",
-      "mac": null,
+      "mac": "00:11:25:C4:52:88",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-182.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.143.2",
-      "mac": null,
+      "mac": "00:11:25:C4:52:89",
       "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..ad81554e0896964fc64a7ad7856b85e088bf6a71 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": "00:11:25:91:47:91",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-183-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch14.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.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.3",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:5E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-183.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.143.3",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:5F",
       "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..7a5bc968775e121d77b43e26c0f1abaf811cdb89 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": "00:11:25:91:46:3B",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-184-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch14.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.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.4",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:08",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-184.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.143.4",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:09",
       "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..1ef5fea6586260d9cffb78356bdcc0a78e3c1cca 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": "00:11:25:91:46:A0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-185-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch14.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.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.5",
-      "mac": null,
+      "mac": "00:11:25:C4:53:B6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-185.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.143.5",
-      "mac": null,
+      "mac": "00:11:25:C4:53:B7",
       "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..19338dbab422ce8f557b1ddf97b0b2128a7655e3 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": "00:11:25:91:47:F6",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-186-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch14.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.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.6",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:48",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-186.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.143.6",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:49",
       "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..7233ffa211ab03c084da3012e0740a925d9d9251 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": "00:11:25:91:48:58",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-187-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch15.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.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.7",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:70",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-187.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.143.7",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:71",
       "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..99613636f3d315950d75f1fc87819d693ed05036 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": "00:11:25:91:47:30",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-188-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch15.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.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.8",
-      "mac": null,
+      "mac": "00:11:25:C4:52:4E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-188.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.143.8",
-      "mac": null,
+      "mac": "00:11:25:C4:52:4F",
       "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..d1097f3bd1f9157334cc7f15dfcee8aa9bcb71ff 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": "00:11:25:91:48:5F",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-189-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch15.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.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.9",
-      "mac": null,
+      "mac": "00:11:25:C4:52:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-189.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.143.9",
-      "mac": null,
+      "mac": "00:11:25:C4:52:47",
       "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..2038b49bf2d40db581c265e2693f06a457609684 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..6f08ece662d608199448523a9e94f55fb150c85c 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": "00:11:25:91:48:11",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-190-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch15.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.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.10",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:34",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-190.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.143.10",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:35",
       "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..6c59da3f8670c2b57cbcd1daa9d521e4e912b4d3 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": "00:11:25:91:49:4D",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-191-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch15.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.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.11",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:3A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-191.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.143.11",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:3B",
       "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..d4dfe09296ce1390a11ccef395f01c5db59cb038 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": "00:11:25:91:47:56",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-192-bmc.orsay.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "switch15.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.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.16.12",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:A8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-192.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.143.12",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:A9",
       "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..7da58773cfd1bcf0603a5b7810ee885025b4ff3c 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": "00:11:25:91:49:12",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.13",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-193.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.13",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:15",
       "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..c542cd363d4cf7fba06fa65328772978f7251aff 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": "00:11:25:91:47:74",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.14",
-      "mac": null,
+      "mac": "00:11:25:C4:52:D0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-194.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.14",
-      "mac": null,
+      "mac": "00:11:25:C4:52:D1",
       "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..fb90a2b20e3eee6e0e7a40a418070284915a6cb6 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": "00:11:25:91:47:F5",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.15",
-      "mac": null,
+      "mac": "00:11:25:C4:38:D4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-195.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.15",
-      "mac": null,
+      "mac": "00:11:25:C4:38:D5",
       "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..f616f3704219c1844ddb28d7ac9ff4f1e29c4d1d 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": "00:11:25:91:45:7B",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.16",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:E4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-196.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.16",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:E5",
       "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..0ceb00b1718e23688d0c113cb1a8985fb0a5c5cc 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": "00:11:25:91:45:F9",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.17",
-      "mac": null,
+      "mac": "00:11:25:C4:51:72",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-197.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.17",
-      "mac": null,
+      "mac": "00:11:25:C4:51:73",
       "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..4dcd0c0f59c29f74256812d33e5d7e13c667470f 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": "00:11:25:91:48:95",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.18",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:C8",
       "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": "00:11:25:C4:4E:C9",
       "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..ed8acfd52e6037167111a604738387667270b425 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": "00:11:25:91:48:99",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.19",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:CC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-199.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.19",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:CD",
       "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..0101c216e8d6052f84d8db1b3e33b6a5e8117f65 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..fbd765e022ffe9d1eac97deda0c52f536a75d6b4 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..9efd52d8beee624608ee1229bb9559a46515411c 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": "00:11:25:91:47:C9",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.20",
-      "mac": null,
+      "mac": "00:11:25:C4:50:D2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-200.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.20",
-      "mac": null,
+      "mac": "00:11:25:C4:50:D3",
       "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..11ba05345fa2a7f372f98781404ff7011b852289 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": "00:11:25:91:47:A2",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.21",
-      "mac": null,
+      "mac": "00:11:25:C4:51:B2",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-201.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.21",
-      "mac": null,
+      "mac": "00:11:25:C4:51:B3",
       "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..23e6f0e55474fd522066dc1b4f27e4ecca6f9f53 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": "00:11:25:91:47:A8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.22",
-      "mac": null,
+      "mac": "00:11:25:C4:53:F8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-202.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.22",
-      "mac": null,
+      "mac": "00:11:25:C4:53:F9",
       "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..0d3bb93d407551b4784d1f3c47917b01f6cb56fb 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": "00:11:25:91:45:F5",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.23",
-      "mac": null,
+      "mac": "00:11:25:C4:4C:FC",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-203.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.23",
-      "mac": null,
+      "mac": "00:11:25:C4:4C:FD",
       "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..43b295b1ab7a6032cc9147fb2008973eb4f7e729 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": "00:11:25:91:46:16",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.17.24",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:04",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-204.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.144.24",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:05",
       "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..31e08a4a26329a91413e0f6e106373d3eaa6571d 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": "00:11:25:91:47:95",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.25",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-205.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.25",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:15",
       "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..71d16629e619b7e0d4f521cccbc961308fcf91ba 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": "00:11:25:91:46:54",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.26",
-      "mac": null,
+      "mac": "00:11:25:C4:52:64",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-206.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.26",
-      "mac": null,
+      "mac": "00:11:25:C4:52:65",
       "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..71c0aa0937b194c81c9f1c31b9153402c0f3cfe3 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": "00:11:25:91:48:D5",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.27",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:B4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-207.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.27",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:B5",
       "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..a56fcd2ebdb432b9b810a9c892b17bb8475aff76 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": "00:11:25:91:46:7D",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.28",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:AE",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-208.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.28",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:AF",
       "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..5d8179a58fd97ccb22eb10f28a0a77b63c3f3fa4 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": "00:11:25:91:45:82",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.29",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:C4",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-209.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.29",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:C5",
       "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..8e93de34cab807737b8f4bfbb86237ff532e9161 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": "00:11:25:91:47:F8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.21",
-      "mac": null,
+      "mac": "00:11:25:C4:35:A8",
       "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": "00:11:25:C4:35:A9",
       "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..62aa586bd4872a14c040a5eb0dd44102fe86534a 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": "00:11:25:91:45:AA",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.30",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-210.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.30",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:95",
       "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..dddca8cf8512ae5ba6b796027c9cbba97758d566 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": "00:11:25:91:48:38",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.31",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:94",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-211.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.31",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:95",
       "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..768870502d1544a5ea8c543c82803dd42dfb1950 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": "00:11:25:91:47:C3",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.32",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:BA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-212.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.32",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:BB",
       "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..790cb9b09bc509b0809ece4dda815495c1a7ce1f 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": "00:11:25:91:47:EE",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.33",
-      "mac": null,
+      "mac": "00:11:25:C4:54:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-213.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.33",
-      "mac": null,
+      "mac": "00:11:25:C4:54:51",
       "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..9ac46fd78b0987df2689fa0c12dbb753e19bc3ad 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": "00:11:25:91:47:C7",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.34",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-214.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.34",
-      "mac": null,
+      "mac": "00:11:25:C4:4E:51",
       "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..201a356a5290cfb752e83f2a4aad42884411841c 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": "00:11:25:91:46:83",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.35",
-      "mac": null,
+      "mac": "00:11:25:C4:54:7E",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-215.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.35",
-      "mac": null,
+      "mac": "00:11:25:C4:54:7F",
       "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..0e0dee6419e04bfecb4313c69aeb2b55415af556 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": "00:11:25:91:47:AF",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "gdx-216-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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.18.36",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:1C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-216.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.145.36",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:1D",
       "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..5412ca04d6c6c027e9508de5632652ce915fb718 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": "00:11:25:91:46:70",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.1",
-      "mac": null,
+      "mac": "00:11:25:C4:3B:7C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-217.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.1",
-      "mac": null,
+      "mac": "00:11:25:C4:3B:7D",
       "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..528c13ae170f1dece52b2b375264257ee06957c2 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": "00:11:25:91:48:D2",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.2",
-      "mac": null,
+      "mac": "00:11:25:C4:35:46",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-218.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.2",
-      "mac": null,
+      "mac": "00:11:25:C4:35:47",
       "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..0cbd9124cfb7404057810cc5a030a4d820ea9dc2 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": "00:11:25:91:48:AA",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.3",
-      "mac": null,
+      "mac": "00:11:25:C4:39:A8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-219.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.3",
-      "mac": null,
+      "mac": "00:11:25:C4:39:A9",
       "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..2993be5a996fe13cf429720a60923b9c28af1894 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..5c85bf1f987e1c3c3dc0cdbd5cc47e580768f6bc 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": "00:11:25:91:48:39",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.4",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:6A",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-220.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.4",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:6B",
       "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..555b487a0809cd586b78ac1286f65f9f9f880aaf 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": "00:11:25:91:45:C3",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.5",
-      "mac": null,
+      "mac": "00:11:25:C4:3D:96",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-221.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.5",
-      "mac": null,
+      "mac": "00:11:25:C4:3D:97",
       "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..bb5771bfaaf94a3c2ff335768f7741651c3cc306 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": "00:11:25:91:48:16",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.6",
-      "mac": null,
+      "mac": "00:11:25:C4:39:54",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-222.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.6",
-      "mac": null,
+      "mac": "00:11:25:C4:39:55",
       "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..5582a0fe97b7a1d9a7b8eeaa6192c48861aeaf8b 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": "00:11:25:91:48:A4",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.7",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:14",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-223.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.7",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:15",
       "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..0628f3e0fc0d688c0e45b504a1e0cc25e37a7516 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": "00:11:25:91:46:7E",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.8",
-      "mac": null,
+      "mac": "00:11:25:C4:39:00",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-224.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.8",
-      "mac": null,
+      "mac": "00:11:25:C4:39:01",
       "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..8e3be7c099f73d6f03e579ca16732733b370b3c8 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": "00:11:25:91:46:AE",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.9",
-      "mac": null,
+      "mac": "00:11:25:C4:38:D0",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-225.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.9",
-      "mac": null,
+      "mac": "00:11:25:C4:38:D1",
       "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..650062d2b57000b689f6ee0a8545cdfa57c4f1d6 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": "00:11:25:91:48:35",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.10",
-      "mac": null,
+      "mac": "00:11:25:C4:38:F6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-226.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.10",
-      "mac": null,
+      "mac": "00:11:25:C4:38:F7",
       "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..acb5c6014f89b5527abb01d4ad750ad478c64489 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": "00:14:5E:65:C6:4A",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.11",
-      "mac": null,
+      "mac": "00:11:25:C4:34:52",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-227.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.11",
-      "mac": null,
+      "mac": "00:11:25:C4:39:8F",
       "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..0eeacc4b141e05cb185c8e028455e2d425b79678 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": "00:11:25:91:46:0C",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.19.12",
-      "mac": null,
+      "mac": "00:11:25:C4:32:A6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-228.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.146.12",
-      "mac": null,
+      "mac": "00:11:25:C4:32:A7",
       "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..3dde5b072ea5fca64aba46045013fcf754ed32f5 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": "00:11:25:91:45:8A",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.13",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:76",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-229.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.13",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:77",
       "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..e4cb05d3b9e635b8473236d9ea41a1062ba3c7d3 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..db8e527f17e0454b181c1b6269157a02234adfb4 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": "00:11:25:91:45:B4",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.14",
-      "mac": null,
+      "mac": "00:11:25:C4:35:A6",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-230.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.14",
-      "mac": null,
+      "mac": "00:11:25:C4:35:A7",
       "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..0df4c238e508526567b0791af341f71692c03fd7 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": "00:11:25:91:47:E5",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.15",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:78",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-231.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.15",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:79",
       "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..07b0a512e92a70dcde9fe1ad7bb2114e171059f6 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": "00:11:25:91:45:79",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.16",
-      "mac": null,
+      "mac": "00:11:25:C4:38:CA",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-232.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.16",
-      "mac": null,
+      "mac": "00:11:25:C4:38:CB",
       "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..8ed69d81bc273b9ce9d6c1b09fd24410c73afc10 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": "00:11:25:91:45:96",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.17",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:20",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-233.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.17",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:21",
       "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..60fcf0c2718852fa81cbf403f397805eaf1de881 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": "00:11:25:91:46:08",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.18",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:42",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-234.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.18",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:43",
       "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..f26caab35f9b3cd015847b4ae041bb768b4c46a5 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": "00:11:25:91:47:EB",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.19",
-      "mac": null,
+      "mac": "00:11:25:C4:35:50",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-235.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.147.19",
-      "mac": null,
+      "mac": "00:11:25:C4:35:51",
       "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..d948eb9c37b803b22768bf6456b544438cd1a348 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..751b17a6f4d7f79b7ea2bbfc2434e5221d038686 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..bf7e3cc1c4edf276bc77ddb591658b4a43286d72 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..5b1ae84b8b47fdfcfaeb9666a5de51b917b7023e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..52035dd9acb8682444814b88af187f1fbdb3e769 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..f2f6f7fb555e4bdb387b677a7cf36ee95c7fccd6 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..51b26ebe2357de7785a339a6c0bb87ab48a7a433 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..70bc5dda269f03b8f520933f14be664876ad5444 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..795ecb8bb127ab59018d31a66252c38fb4e1b08c 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..47ad49e99636c452012232d224d8ec3962de9159 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..47f2257c014daababe96f6c632791098114ea659 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..505ee1c2fcbbcac64a93c7260293b32e5d02d562 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..9b49aac530531f14393f76ffe55a72944c51b7bf 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..a885ba932f3b1203fd1857d46650dd87e8d7fe10 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..1c5e9ff47742b2577e2cee957bbe34384eb7976d 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..2780a976fd20ca42738fc299d04d058a8e62dc88 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.25",
-      "mac": null,
+      "mac": "00:11:25:C4:35:1C",
       "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": "00:11:25:C4:35:1D",
       "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..22d874a642ebd845a3058c9ea4fc6a22d5579297 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..472d66e675b8f22867aac033d05c79790d841b80 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..cb83b6dd303ad2a9fdaf7d6e8564c2e037fe35fe 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": false,
+      "mounted": false,
+      "network_address": "gdx-252-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": "nil",
+      "switch_ip": "172.26.120.157",
+      "switch_mac": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "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..0ccfe50fcda434f403cd093895a52ed83d6773c1 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..e4fe83f40ca44e9ac1e17eb4fc91c6e79d378665 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..684caf6b22e8d0a6306b2eaa06922d8c30ee1ccd 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..d7d17312e7b362606ccac7bf026b6a52fff11d54 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..0068be08a6457c4b8da3aec9066c85c8cddb0ac5 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..52817cb1783b44fe2ad59a103dab8b001e825584 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..ab301c5c886c18196d23f61339192035cce84a29 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..8ba08f83de2f39d7c74c2ff303dff80c57b916bc 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..3b4a4edeb3880e526a97aa53786d04f9e4e97ab1 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..21cfb4c7a20f0c94d07f4e49d3f48c6b71893e97 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..b381cba39faced86ce18412380b14a8c6c4d3481 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..eae0c1c3c09d07df903818d2b7105d3a87457ce2 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..d6b9abd29b8d7f50e33001b7c770489433149928 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..f557121b9a5d4fc1f7a4d4e3806e1abe37cf7503 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:34:65",
       "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..352477385e9aa1dd948faa1a00231a9e047ac998 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..f0c27225156925935fca4ff8e900ddabfc29f483 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:35:37",
       "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..ffd16b38b1edbc47fbab385e19e58cdf3137f9d1 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..be6161346083721f981d1b42cf3f22c05c283bd3 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..19389f99ba534c63120537bf50d9d03491c76970 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..f0c05e2c526b7cbae1d7cc9dbc13311fa7cbc30a 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "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.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..e009c2d90048fe09db6f36334dcd0544848334b8 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..31389a77f8e131300c2fa0e308dcaf1a2d508d5b 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..bcaf4326a26bb686b08f28428e132c118fbb6077 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..6a00dccefb9d4884b9dc99ff1b8584aaf3204a19 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..71c2ef18146a13b909c52752a1be56003a35ac9f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..dc7e372adbaf85502e04a037f024820b6e1f0f98 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..e3b7fd05b5865c4b2ec78fa6ad1f5d2a0a1f812e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..a93413b58ff69928e2a0b4172df29d82d3e516ea 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..6fa634b4117411c18f87f349937af31723c1676d 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..d28152013cc74c06c02a563786cfc7b657baad5e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..89e6ce31e73938e819cecb60f7750ce8f12cfee9 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..27c5defb06b1064c1007a40d209ccce80ec65a17 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..870f00013ed6e220040209a70c5bd859d6e62b22 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..004e4a6546e0253c9204ec65944d463d913ef42c 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..8859b639e4299a4e05daf9c064a8d5c2d3ecc49e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.32",
-      "mac": null,
+      "mac": "00:11:25:C4:49:DE",
       "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": "00:11:25:C4:49:DF",
       "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..54c4d2a6abb10e6a4eb8967616ed97af1f5e09b8 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..eead004c773b1861a9eebd1b48de0cb8597a3357 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..9b2f0e20249ab9e0e0d8bf378601c34eeba0e53b 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..6d66f350a344f87d7a8641ab5cf622d61ea44ff8 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": false,
+      "mounted": false,
+      "network_address": "gdx-288-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": "nil",
+      "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.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": "nil",
+      "switch_mac": "nil",
       "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,
+      "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.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..6279624cdfa8e9b7cfa3708f65d12ab0d86ff568 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..4093afbb4a8ccd8faf48f7b819b6024c218e12a3 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": "00:14:5E:65:C6:29",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.29",
-      "mac": null,
+      "mac": "00:11:25:C4:05:0C",
       "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": "00:11:25:C4:34:53",
       "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..9c2ff515797ca038ff7550be4fd9b66ef8c1b591 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": "00:11:25:91:48:A4",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.2",
-      "mac": null,
+      "mac": "00:11:25:C4:33:7C",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-290.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
     {
       "device": "eth1",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.24.152.2",
-      "mac": null,
+      "mac": "00:11:25:C4:33:7D",
       "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..6eb862b16352d16a169559b8f25e0125d039ef8b 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..0a5c256f867ef9fae7dead245aedf99a3c982eec 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..46885322440fd76bcff2d0452891789cc13e4b52 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..76aacff29cc241ab250feb59f27108af893d9123 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..b492b1f7bef6bd66894e1b1cacee22113946cf04 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..521a0331698c976412aa22e7d2f94a76b9441001 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..a4ccaddc82ec122b7688c2aa923f49a9fdeb4cef 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..26e32e6d0591e5d20655981ef2ce06a52d48f25f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..368870bbdf153550c259955daca3a08af7bff0c4 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..02f70776f27a6053a196b6a4ae02a3986430bdac 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..79c77c1ea7740b18ea837d70e76da26980406a83 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..0e40f17fc149850c9816185f85ec6042a4d34de6 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..14ebae0ff7dced44c5f096f5dfbb9137eb29aa73 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..2077c372eb8b1431c6853b002c2930c545997e51 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..aadebdb4295c9366db071deab06a842e351e1c28 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..ad9569104ee6e166165e863acdf2520bc98022de 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..55b035340d4ed4b4200486b3177a3c7997740bbd 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..ef624a140c06ceb29c658a11b4a2b41e38359099 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "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..ea138eaa0e8088ce91e7150bdc10f804f611950e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.19",
-      "mac": null,
+      "mac": "00:11:25:C4:33:4C",
       "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": "00:11:25:C4:33:4D",
       "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..5d4b1a6bc883e9c359a02e78774d4d38a07e58b7 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.20",
-      "mac": null,
+      "mac": "00:11:25:C4:32:6A",
       "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": "00:11:25:C4:32:6B",
       "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..2808d76781b0f223bc556a7d639767cd81d0313e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.21",
-      "mac": null,
+      "mac": "00:11:25:C4:33:30",
       "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": "00:11:25:C4:33:31",
       "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..b56c3872778e4e7c6df1dee9301000c97b88e894 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..d3ddee07232ce143ce242764df8752b37bcbb5a8 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.22",
-      "mac": null,
+      "mac": "00:11:25:C4:33:D0",
       "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": "00:11:25:C4:33:D1",
       "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..fa7921fed453193b708c091627df9ee239b592fc 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..cf8fb062fd63495a0733f05875bd2760fadb4045 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..4b878ddd0252f4e1d2063596858b931beafdbe35 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..2798d9101c6fe4a66118ecd6229c44f19773e2f8 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..b56a015e0e816f9de7e517db8558009ec0770b07 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": false,
+      "mounted": false,
+      "network_address": "gdx-36-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": "nil",
+      "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.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": "nil",
+      "switch_mac": "nil",
       "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": "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.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..5581e9ece9c4e1789e5292727ae6c6749e1ac5e9 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..127001a651fb78fc8f7732847f637caa0293f285 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..885e936a3f988df6bf1eeee4cdcff9626f93c775 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..ececa24aaaa2c4634ad39eb8127f6362085dcb46 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..9eb7c0bf93c79a48c78386c04bdab201b4624ef3 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..81fe964e10f3c2765f5bae8df2761d6eee398193 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..b2e547c6d8428414970fa85973d67008e98c041d 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..d5dcf8edfe1ef0565be43c6ad626798dc84c7965 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..354f54d403d486e431801fc22215a0fb8f56fe2f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..823ea91eac81198f0ce037776d03316f053ca60e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..a2fabd8f1f24d296b9d60d731245b89ca1f73289 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..ce3e70a2f7209d26348b8c5a8a34250f8954bcb0 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..e892bf6fd0d86576fbb7e4fc9417d9a3829333d3 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..d1a0ef68bab899848dc44038e55aced0b8701754 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..bd97d69838c8fc9a095ad29584b1aefa4aeb8773 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..636387ef0bbb1b72bd0f8f4b240bdb469bd92ed4 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..54cdb55a2b9705dc0b8add0e342a32d796656aab 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..5607a2bba65e4229ca0e7ab1ed584032181066fb 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..1e6fec1ac239205001dee32fddc8d645c8a87f83 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.17",
-      "mac": null,
+      "mac": "00:11:25:C4:3B:F6",
       "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": "00:11:25:C4:3B:F7",
       "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..c0d51555673b463161509222cf36cf72237f8c80 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "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.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..0ae8e9d0462f68e54f0b90416fa3357028c4b8e8 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..fa5e59ceed876ea3fedf739d68a343caf131f6bc 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..22187f8a404257b1428415b5a3d8e2b86cc7f779 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..d755c747ece62b77add17dc1c523999c16050a0c 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..9c930dc9f19fc42e5ab76015ce0e20dab8850d5e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..da0b41c6fc8c9f5f6f474c72e3bf83ac0452f34f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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..c6ef2afc7e441fda715883e467595c7ba8be8d9a 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:3E:2D",
       "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..a13cb085000a92b66307aa1a9cc9fb004959420d 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4E:11",
       "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..d29ea93725b48860b438d0d5cfe2cde05730844f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:3C:63",
       "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..d798a51a012ebc50e8f3d297a87032d8bab4b9df 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:3B:B5",
       "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..893bd02256d52ce775ad0fe6af899b3c47bd1945 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:39:87",
       "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..068523fb3dfe52d91236aa20044abc7ea774ccfb 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": "00:11:25:91:46:C0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.29",
-      "mac": null,
+      "mac": "00:11:25:C4:3C:4C",
       "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": "00:11:25:C4:3C:4D",
       "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..f756cb7d9eaa561c5dde27ae00b23e8bd60dfaf7 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": "00:11:25:91:46:E1",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.30",
-      "mac": null,
+      "mac": "00:11:25:C4:3B:E0",
       "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": "00:11:25:C4:3B:E1",
       "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..c6f4108b11c79c76ffde0cf5df03d3afccf74410 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": "00:11:25:91:47:09",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.31",
-      "mac": null,
+      "mac": "00:11:25:C4:35:66",
       "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": "00:11:25:C4:35:67",
       "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..3bc42844e2ef272956be424892455a66c8cc685e 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:3C:19",
       "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..550d4a34e29f3e7f6d003c089bde1eaf125829df 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:34:83",
       "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..655e44c7d0bd98800b060ae86aff4aa41aaa1439 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": "00:11:25:91:46:05",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.7",
-      "mac": null,
+      "mac": "00:11:25:C4:35:92",
       "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": "00:11:25:C4:35:93",
       "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..adf0e2a5c6c7b25f3a820bb06688c2847620629a 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:3C:4B",
       "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..94432947e5125a1a0073b7bb06789a4d9e1b46ed 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..91904cf8b87655e5624c5382872fb37ae96d8405 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": false,
+      "mounted": false,
+      "network_address": "gdx-72-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.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": "nil",
+      "switch_mac": "nil",
       "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": "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.36",
-      "mac": null,
+      "mac": "00:11:25:C4:3E:3D",
       "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..4b4c55ed31255ea8d479551787cf4e79d678fad9 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..10bf3393b818344d757e1c4fa59a983dfdb92eb3 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..42a1f0a43cad9f736169dff0cc1baa90396b5394 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..9efd4e39ea4550a78c4f83d992afaacf6036ed1f 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..9b0750daaa42ae81c566d42f30d9f3a180fe0bcc 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..0ec0927622c66a04b520165f470a18dbeab4257a 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..0ec57197e46c15bc1918609f248b5137c690a870 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..cf37f8df689e21ae63160867605b691de64d1c36 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:35:C3",
       "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..633145345ec38f66d72af86e1bb5f8635d80c437 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..fe8a326e180161ccb799ed69c8b7177edc7715aa 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.9",
-      "mac": null,
+      "mac": "00:11:25:C4:26:50",
       "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": "00:11:25:C4:26:51",
       "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..c6d3038b77525e2d1ba574dc3e260c5076aadab0 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..9e18920bd66e162c25ce46dcc95eb4f829bbdeb1 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..ff43330eea925fd9906007246e373ae16fedf975 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..f88e6830533803929088ca9f602863214ec7ac9c 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..a1ace87eb4c79eea1fe8df88d88f6d1cd4d458ae 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..98663b95277d280d5197dd0c3e12fe9291158d81 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..dac1ac0690cf7be682e7d9516026149d455ec193 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..b77e1804dc9f2476b621dc4a4840c6a3e30028e1 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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..a1dd31a69707a2df4bd9f1cbedc1a3ecd402a540 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": false,
+      "mounted": false,
+      "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": "nil",
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:34:6B",
       "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..53d58c0840523c97559baf9f099f970e5bbd7fe2 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "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.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..247c5a8d928b5c28cf015ecd7bb89693b0b61a9b 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:51:4D",
       "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..61c501f3b9c3bba4e32d1285105617afa1fc12f1 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": "00:11:25:91:46:4D",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.20",
-      "mac": null,
+      "mac": "00:11:25:C4:4D:82",
       "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": "00:11:25:C4:4D:83",
       "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..cff14d703539537cab461dcd00fe92d79bc71731 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4F:A7",
       "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..febbc1653c46963a40083420109de3fc62b55105 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:53:FD",
       "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..03caf17506eb71c953a6f1adc1edd9c7ee0c2481 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4F:31",
       "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..e07856dc847bf05624c1cf553362eddd1a1ace56 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:50:A7",
       "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..f4e34a2605485456494bbaeea62503131351e140 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -31,37 +53,42 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.25",
-      "mac": null,
+      "mac": "00:11:25:C4:4F:06",
       "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": "00:11:25:C4:4F:07",
       "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..7336c73cebc842bc2116c11fe5dc17bbf6f40a3c 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4E:1B",
       "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..62db8b44b2ed889f1a2e477da09e73baae5dfb9a 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": false,
+      "mounted": false,
+      "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": "nil",
+      "switch_mac": "nil",
       "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": "00:11:25:C4:4F:3F",
       "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..d4c5bdda46f98f57a9ec6a38a0fc3dec80ee8f91 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": false,
+      "mounted": false,
+      "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..ca410bf60ffc76f11f07772f5145b006e6498e65 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": false,
+      "mounted": false,
+      "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..ffdef8095d09edfbd425e4f3f2b0c5f5d6572850 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": false,
+      "mounted": false,
+      "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..0e3c2e0a7d2b483d98b57ed4b6dfd67157f4ac80 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": false,
+      "mounted": false,
+      "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..2060804d289f9500421935357e3b93a3440df709 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": false,
+      "mounted": false,
+      "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..c10737a947349d895735660282e5930fb1373eb8 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": false,
+      "mounted": false,
+      "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..3861545a2447ccb5bc8bf6c0ec885ec1cc071b2e 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": false,
+      "mounted": false,
+      "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..9c0622a74c01373b7e4c44612494d05be825195a 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": false,
+      "mounted": false,
+      "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..84ee4238e7f404577b5eab07bf66240279123d3c 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": false,
+      "mounted": false,
+      "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..1253df84604198df4dc4e2dcf052202aceaf524e 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": false,
+      "mounted": false,
+      "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..f9e93ee2b9ed53bc91dc9a5d6e6dbdd0cd60032e 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": false,
+      "mounted": false,
+      "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..54dbf9370e4db0112ad522058cc60b0cddb70ff0 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": false,
+      "mounted": false,
+      "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..4646790bc65caa514b355e63f82534e51d7dd42e 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": false,
+      "mounted": false,
+      "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..3f8ef1b4829762ff44ca47f0040e6b7da1daf880 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": false,
+      "mounted": false,
+      "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..a766dd24ad229d538f68951dc00c6167efad855f 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": false,
+      "mounted": false,
+      "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..b6c8f87d4f68a90e207ae045a2be8b5168c669b1 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": false,
+      "mounted": false,
+      "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..139d36a3f26537c1716ff1e7469b696489a19594 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": false,
+      "mounted": false,
+      "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..6bcb10edc2f52cbbc9c93aa70c7e62574e5c64b2 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": false,
+      "mounted": false,
+      "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..3a12a199918405bacb07247c811cb3b97af85840 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": false,
+      "mounted": false,
+      "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..1738781f25a61bffd1982b45aa0e7259b64c28bb 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": false,
+      "mounted": false,
+      "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..b1e1b1ed9faaf1134756378c6e7e4432ae7477b7 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": false,
+      "mounted": false,
+      "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..4744fdbe93b9223047f485bbfb8387015f9eb3c6 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": false,
+      "mounted": false,
+      "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..4658e826e843a9a7ad978b9612ca31ff5cd79be1 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": false,
+      "mounted": false,
+      "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..8b7e4edd2c07ac7a7b32914d4e8f35d4260f69fd 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": false,
+      "mounted": false,
+      "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..0a92ae7317c611b5de5afdc5da5711985c6b0875 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": false,
+      "mounted": false,
+      "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..21e12e1576e04ee00d07ee1eae01a721971a07bc 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": false,
+      "mounted": false,
+      "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..f7e696970ca57d33e49e4af3087512dc9450af69 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": false,
+      "mounted": false,
+      "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..ad45e5d8caebcecc009f44081ba8ed30edf00e56 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": false,
+      "mounted": false,
+      "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..7ab7ae68be53aaa05cbef96a5f92cfc4d991adb1 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": false,
+      "mounted": false,
+      "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..da3af1557a5575388d54acebdbfd7608ba54956f 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": false,
+      "mounted": false,
+      "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/data/grid5000/sites/orsay/orsay.json b/data/grid5000/sites/orsay/orsay.json
index 8c1413ed6780043602b38972b5c3ff13dbb62591..200637b60b2683e443f4d438c20ebcdd050076ad 100755
--- a/data/grid5000/sites/orsay/orsay.json
+++ b/data/grid5000/sites/orsay/orsay.json
@@ -1,14 +1,4 @@
 {
-  "description": "",
-  "email_contact": null,
-  "latitude": 48.7,
-  "location": "Orsay, France",
-  "longitude": 2.2,
-  "name": "Orsay",
-  "security_contact": null,
-  "sys_admin_contact": null,
   "type": "site",
-  "uid": "orsay",
-  "user_support_contact": null,
-  "web": null
+  "uid": "orsay"
 }
\ No newline at end of file
diff --git a/generators/input/grenoble.rb b/generators/input/grenoble.rb
index 45b76186047fa8a31d30460b040eb639e98dafff..efa0e71c39fbbeee14e4ea21926f62420bb11634 100755
--- a/generators/input/grenoble.rb
+++ b/generators/input/grenoble.rb
@@ -58,9 +58,11 @@ site :grenoble do |site_uid|
           :mountable => true,
           :mounted => true,
           :management => false,
-          :vendor => 'Mellanox', :version => "InfiniHost MHGH29-XTC",
+          :vendor => 'Mellanox',
+          :version => "InfiniHost MHGH29-XTC",
           :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
+          :driver => "mlx4_core"
         },
         {
           :interface => 'Ethernet',
@@ -68,7 +70,9 @@ site :grenoble do |site_uid|
           :device => "eth0",
           :enabled => false,
           :management => false,
-          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0')
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0'),
+          :vendor => "Intel",
+          :version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
         },
         {
           :interface => 'Ethernet',
@@ -80,7 +84,10 @@ site :grenoble do |site_uid|
           :management => false,
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1'),
+          :vendor => "Intel",
+          :version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
+          :driver => "e1000e"
         },
         {
           :interface => 'Ethernet',
@@ -90,7 +97,9 @@ site :grenoble do |site_uid|
           :management => true,
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
-          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt')
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt'),
+          :vendor => "Peppercon AG (10437)",
+          :version => "1.50"
         }]
       end
     end
@@ -139,7 +148,9 @@ site :grenoble do |site_uid|
           :mounted => true,
           :mountable => true,
           :management => false,
-          :vendor => 'Mellanox', :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+          :vendor => 'Mellanox',
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+          :driver => "mlx4_core",
           :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
         },
@@ -151,10 +162,12 @@ site :grenoble do |site_uid|
           :mounted => true,
           :mountable => true,
           :management => false,
-	  :vendor => 'Intel', :version => "Device 10c9 (rev 01)",
+          :vendor => 'Intel',
+          :version => "Device 10c9 (rev 01)",
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
-          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0')
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0'),
+          :driver => "igb"
         },
         {
           :interface => 'Ethernet',
@@ -164,6 +177,8 @@ site :grenoble do |site_uid|
           :mountable => false,
           :mounted => false,
           :management => false,
+          :vendor => 'Intel',
+          :version => "Device 10c9 (rev 01)",
           :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
         },
         {
@@ -175,7 +190,9 @@ site :grenoble do |site_uid|
           :management => true,
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
-          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt')
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt'),
+          :vendor => 'Super Micro Computer Inc.',
+          :version => "1.15"
         }]
       end
     end
@@ -220,7 +237,9 @@ site :grenoble do |site_uid|
           :mounted => true,
           :mountable => true,
           :management => false,
-          :vendor => 'Mellanox', :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+          :vendor => 'Mellanox',
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+          :driver => "mlx4_core",
           :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
         },
@@ -232,11 +251,52 @@ site :grenoble do |site_uid|
           :mountable => true,
           :mounted => true,
           :management => false,
-	  :vendor => 'Intel', :version => "Device 10c9 (rev 01)",
+          :vendor => 'Intel',
+          :version => "Device 10c9 (rev 01)",
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
-          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0')
-        }]
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0'),
+			 :driver => "igb"
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          :device => "eth1",
+          :enabled => false,
+          :mountable => false,
+          :mounted => false,
+          :management => false,
+          :vendor => 'Intel',
+          :version => "Device 10c9 (rev 01)",
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
+        },
+        {
+          :interface => 'InfiniBand',
+          :rate => 40.G,
+          :device => "ib1",
+          :enabled => true,
+          :mounted => false,
+          :mountable => true,
+          :management => false,
+          :vendor => 'Mellanox',
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s  (rev a0)",
+          :ip => "",
+          :driver => "mlx4_core"
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          :enabled => true,
+          :mounted => false,
+          :mountable => false,
+          :management => true,
+          :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt'),
+	  		 :vendor => 'Super Micro Computer Inc.',
+			 :version => "1.33"
+        }
+		  ]
       end
     end
   end
@@ -285,9 +345,25 @@ site :grenoble do |site_uid|
           :mounted => true,
           :mountable => true,
           :management => false,
-          :vendor => 'Mellanox', :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+          :vendor => 'Mellanox',
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)",
           :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
+          :driver => "mlx4_core"
+        },
+        {
+          :interface => 'InfiniBand',
+          :rate => 40.G,
+          :enabled => true,
+          :device => "ib1",
+          :mounted => false,
+          :mountable => true,
+          :management => false,
+          :vendor => 'Mellanox',
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)",
+          :driver => "mlx4_core",
+          :ip => ""
+
         },
         {
           :interface => 'Ethernet',
@@ -299,15 +375,22 @@ site :grenoble do |site_uid|
           :management => false,
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
-          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0')
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0'),
+          :vendor => "Intel",
+          :version => "Device 10e7 (rev 01)",
+          :driver => "igb"
         },
         {
           :interface => 'Ethernet',
           :rate => 1.G,
+          :device => "eth1",
           :enabled => false,
           :mounted => false,
           :mountable => false,
-          :management => false
+          :management => false,
+          :vendor => "Intel",
+          :version => "Device 10e7 (rev 01)",
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
         },
         {
           :interface => 'Ethernet',
@@ -318,7 +401,9 @@ site :grenoble do |site_uid|
           :management => true,
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
-          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt')
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt'),
+          :vendor => "Unknown",
+          :version => "1.7"
         }]
       end
     end
diff --git a/generators/input/lille.rb b/generators/input/lille.rb
index 8e6ea5462a28231d91b44962fd795ce1690fa400..fa245e464313f823352c82d558bd9d2a3cef5f56 100755
--- a/generators/input/lille.rb
+++ b/generators/input/lille.rb
@@ -87,8 +87,8 @@ cluster :chirloute do |cluster_uid|
             :interface => 'Ethernet',
             :rate => 1.G,
             :mac => lookup('lille', node_uid, 'network_interfaces', 'bmc', 'mac'),
-            :vendor => nil,
-            :version => nil,
+            :vendor => 'Inventec',
+            :version => 1.14,
             :enabled => true,
             :management => true,
             :mountable => false,
@@ -173,8 +173,8 @@ cluster :chirloute do |cluster_uid|
             :interface => 'Ethernet',
             :rate => 1.G,
             :mac => lookup('lille', node_uid, 'network_interfaces', 'bmc', 'mac'),
-            :vendor => nil,
-            :version => nil,
+            :vendor => 'Dell',
+            :version => '1.54',
             :enabled => true,
             :management => true,
             :mountable => false,
@@ -257,8 +257,8 @@ cluster :chirloute do |cluster_uid|
             :interface => 'Ethernet', 
             :rate => 1.G,
             :mac => lookup('lille',"#{node_uid}", 'mac_mgt'),
-            :vendor => nil,
-            :version => nil,
+            :vendor => 'IBM',
+            :version => '1.18',
             :enabled => true,
             :management => true,
             :mountable => false,
@@ -355,8 +355,8 @@ cluster :chirloute do |cluster_uid|
             :interface => 'Ethernet', 
             :rate => 1.G,
             :mac => lookup('lille',"#{node_uid}", 'mac_mgt'),
-            :vendor => nil,
-            :version => nil,
+            :vendor => 'Peppercon',
+            :version => '1.46',
             :enabled => true,
             :management => true,
             :mountable => false,
diff --git a/generators/input/orsay-gdx.rb b/generators/input/orsay-gdx.rb
new file mode 100644
index 0000000000000000000000000000000000000000..30c062d747600f3fa39f89212c703ea0284bb93b
--- /dev/null
+++ b/generators/input/orsay-gdx.rb
@@ -0,0 +1,151 @@
+require 'net/ssh'
+
+def switch_match_node(switch,id); switch != nil and (switch[:nodes][0] <= id and id <= switch[:nodes][1]); end
+def get_switch_for_node(switches,id)
+  switches.each{|k,v| 
+    arr = v.split(",").map{|s| s.to_i}
+    next if id < arr[0] or arr[1] < id
+    return lookup('orsay-network',k).merge({:nodes=>arr})
+  }
+  lookup('orsay-network',"switch-nil").merge({:nodes=>[0,0]})
+end
+
+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| 
+      switch_eth0 = get_switch_for_node lookup("orsay-links","links-eth0","gdx"), i if not switch_match_node switch_eth0, i
+      switch_bmc = get_switch_for_node lookup("orsay-links","links-bmc","gdx"), i if not switch_match_node switch_bmc, i
+      switch_rsa = get_switch_for_node lookup("orsay-links","links-rsa","gdx"), i if not switch_match_node switch_rsa, i
+      switch_mx = get_switch_for_node lookup("orsay-links","links-mx","gdx"), i if not switch_match_node switch_mx, 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 switch_bmc["rate"]),
+            :mac => lookup('orsay-gdx', "#{node_uid}", 'mac_bmc'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme BCM5780',
+            :enabled => true,
+            :management => true,
+            :mountable => false,
+            :mounted => false,
+            :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup_through_ssh(ssh,"#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
+            :switch => (switch_bmc["name"]+".#{site_uid}.grid5000.fr"),
+            :switch_ip => switch_bmc["ip"],
+            :switch_mac => switch_bmc["mac"],
+#            :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 => (switch_rsa["name"]+".#{site_uid}.grid5000.fr"),
+            :switch_console_ip => switch_rsa["ip"],
+            :switch_console_mac => switch_rsa["mac"]
+          },{
+            :interface => 'Myrinet',
+            :device => 'myri0',
+            :rate => (eval 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 => (switch_mx["name"]+".#{site_uid}.grid5000.fr"),
+            :switch_ip => switch_mx["ip"],
+            :switch_mac => switch_mx["mac"]
+          },{
+            :interface => 'Ethernet',
+            :device => 'eth0',
+            :rate => (eval switch_eth0["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 => (switch_eth0["name"]+".#{site_uid}.grid5000.fr"),
+            :switch_ip => switch_eth0["ip"],
+            :switch_mac => switch_eth0["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..c88209a70c3d698e10b76a14ce5aeaf3c62e51bc
--- /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: 00:11:25:C4:34:6B
+  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: 00:11:25:C4:4F:BA
+  mac_myri0: 00:60:DD:47:B5:EF
+  mac_eth1: 00:11:25:C4:4F:BB
+  mac_bmc: 00:11:25:91:47:C3
+gdx-29: 
+  mac_eth0: 00:11:25:C4:05:0C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:34:53
+  mac_bmc: 00:14:5E:65:C6:29
+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: 00:11:25:C4:26:50
+  mac_myri0: 00:11:25:C4:26:51
+  mac_eth1: 00:11:25:C4:26:51
+  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: 00:11:25:C4:54:50
+  mac_myri0: 00:60:DD:47:86:5D
+  mac_eth1: 00:11:25:C4:54:51
+  mac_bmc: 00:11:25:91:47:EE
+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: 00:11:25:C4:4E:50
+  mac_myri0: 00:60:DD:47:B4:C4
+  mac_eth1: 00:11:25:C4:4E:51
+  mac_bmc: 00:11:25:91:47:C7
+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: 00:11:25:C4:54:7E
+  mac_myri0: 00:60:DD:47:89:EC
+  mac_eth1: 00:11:25:C4:54:7F
+  mac_bmc: 00:11:25:91:46:83
+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: 00:11:25:C4:53:23
+  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: 00:11:25:C4:4D:1C
+  mac_myri0: 00:60:DD:47:89:76
+  mac_eth1: 00:11:25:C4:4D:1D
+  mac_bmc: 00:11:25:91:47:AF
+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: 00:11:25:C4:50:86
+  mac_myri0: 00:60:DD:47:65:A7
+  mac_eth1: 00:11:25:C4:50:06
+  mac_bmc: 00:11:25:91:48:34
+gdx-217: 
+  mac_eth0: 00:11:25:C4:3B:7C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3B:7D
+  mac_bmc: 00:11:25:91:46:70
+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: 00:11:25:C4:53:A0
+  mac_myri0: 00:60:DD:47:5A:C6
+  mac_eth1: 00:11:25:C4:53:A1
+  mac_bmc: 00:11:25:91:47:AE
+gdx-190: 
+  mac_eth0: 00:11:25:C4:4E:34
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:35
+  mac_bmc: 00:11:25:91:48:11
+gdx-218: 
+  mac_eth0: 00:11:25:C4:35:46
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:47
+  mac_bmc: 00:11:25:91:48:D2
+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: 00:11:25:C4:4D:6A
+  mac_myri0: 00:60:DD:47:5A:C7
+  mac_eth1: 00:11:25:C4:4D:6B
+  mac_bmc: 00:11:25:91:45:D0
+gdx-191: 
+  mac_eth0: 00:11:25:C4:4E:3A
+  mac_myri0: 00:60:DD:47:86:53
+  mac_eth1: 00:11:25:C4:4E:3B
+  mac_bmc: 00:11:25:91:49:4D
+gdx-219: 
+  mac_eth0: 00:11:25:C4:39:A8
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:39:A9
+  mac_bmc: 00:11:25:91:48:AA
+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: 00:11:25:C4:04:DE
+  mac_myri0: 00:60:DD:47:59:FE
+  mac_eth1: 00:11:25:C4:3A:91
+  mac_bmc: 00:11:25:91:47:5C
+gdx-192: 
+  mac_eth0: 00:11:25:C4:4E:A8
+  mac_myri0: 00:60:DD:47:86:45
+  mac_eth1: 00:11:25:C4:4E:A9
+  mac_bmc: 00:11:25:91:47:56
+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: 00:11:25:C4:4E:14
+  mac_myri0: 00:60:DD:47:86:62
+  mac_eth1: 00:11:25:C4:4E:15
+  mac_bmc: 00:11:25:91:49:12
+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: 00:11:25:C4:50:02
+  mac_myri0: 00:60:DD:47:5A:BB
+  mac_eth1: 00:11:25:C4:50:03
+  mac_bmc: 00:11:25:91:46:9C
+gdx-194: 
+  mac_eth0: 00:11:25:C4:52:D0
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:52:D1
+  mac_bmc: 00:11:25:91:47:74
+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: 00:11:25:C4:54:4C
+  mac_myri0: 00:60:DD:47:5A:B2
+  mac_eth1: 00:11:25:C4:54:4D
+  mac_bmc: 00:11:25:91:49:17
+gdx-195: 
+  mac_eth0: 00:11:25:C4:38:D4
+  mac_myri0: 00:60:DD:47:5A:A3
+  mac_eth1: 00:11:25:C4:38:D5
+  mac_bmc: 00:11:25:91:47:F5
+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: 00:11:25:C4:45:B0
+  mac_myri0: 00:60:DD:47:5A:B3
+  mac_eth1: 00:11:25:C4:45:B1
+  mac_bmc: 00:11:25:91:48:F0
+gdx-196: 
+  mac_eth0: 00:11:25:C4:4F:E4
+  mac_myri0: 00:60:DD:47:7C:0F
+  mac_eth1: 00:11:25:C4:4F:E5
+  mac_bmc: 00:11:25:91:45:7B
+gdx-197: 
+  mac_eth0: 00:11:25:C4:51:72
+  mac_myri0: 00:60:DD:47:86:52
+  mac_eth1: 00:11:25:C4:51:73
+  mac_bmc: 00:11:25:91:45:F9
+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: 00:11:25:C4:4E:C8
+  mac_myri0: 00:60:DD:47:89:0B
+  mac_eth1: 00:11:25:C4:4E:C9
+  mac_bmc: 00:11:25:91:48:95
+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: 00:11:25:C4:4E:CC
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:CD
+  mac_bmc: 00:11:25:91:48:99
+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: 00:11:25:C4:50:D2
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:50:D3
+  mac_bmc: 00:11:25:91:47:C9
+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: 00:11:25:C4:4F:D3
+  mac_bmc: 00:11:25:91:48:19
+gdx-201: 
+  mac_eth0: 00:11:25:C4:51:B2
+  mac_myri0: 00:60:DD:47:86:51
+  mac_eth1: 00:11:25:C4:51:B3
+  mac_bmc: 00:11:25:91:47:A2
+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: 00:11:25:C4:50:1B
+  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: 00:11:25:C4:3C:4B
+  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: 00:11:25:C4:4D:85
+  mac_bmc: 00:11:25:91:46:29
+gdx-202: 
+  mac_eth0: 00:11:25:C4:53:F8
+  mac_myri0: 00:60:DD:47:86:49
+  mac_eth1: 00:11:25:C4:53:F9
+  mac_bmc: 00:11:25:91:47:A8
+gdx-230: 
+  mac_eth0: 00:11:25:C4:35:A6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:A7
+  mac_bmc: 00:11:25:91:45:B4
+gdx-310: 
+  mac_eth0: 00:11:25:C4:33:D0
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:33:D1
+  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: 00:11:25:C4:4C:FC
+  mac_myri0: 00:60:DD:47:86:48
+  mac_eth1: 00:11:25:C4:4C:FD
+  mac_bmc: 00:11:25:91:45:F5
+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: 00:11:25:C4:3E:3D
+  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: 00:11:25:C4:4E:B1
+  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: 00:11:25:C4:4F:04
+  mac_myri0: 00:60:DD:47:86:46
+  mac_eth1: 00:11:25:C4:4F:05
+  mac_bmc: 00:11:25:91:46:16
+gdx-231: 
+  mac_eth0: 00:11:25:C4:3C:78
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:79
+  mac_bmc: 00:11:25:91:47:E5
+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: 00:11:25:C4:4D:C9
+  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: 00:11:25:C4:4F:14
+  mac_myri0: 00:60:DD:47:C4:3F
+  mac_eth1: 00:11:25:C4:4F:15
+  mac_bmc: 00:11:25:91:47:95
+gdx-232: 
+  mac_eth0: 00:11:25:C4:38:CA
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:38:CB
+  mac_bmc: 00:11:25:91:45:79
+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: 00:11:25:C4:51:F9
+  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: 00:11:25:C4:52:64
+  mac_myri0: 00:60:DD:47:86:5E
+  mac_eth1: 00:11:25:C4:52:65
+  mac_bmc: 00:11:25:91:46:54
+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: 00:11:25:C4:53:0F
+  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: 00:11:25:C4:4F:B4
+  mac_myri0: 00:60:DD:47:86:59
+  mac_eth1: 00:11:25:C4:4F:B5
+  mac_bmc: 00:11:25:91:48:D5
+gdx-233: 
+  mac_eth0: 00:11:25:C4:3C:20
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:21
+  mac_bmc: 00:11:25:91:45:96
+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: 00:11:25:C4:4F:E6
+  mac_myri0: 00:60:DD:47:59:31
+  mac_eth1: 00:11:25:C4:4F:E7
+  mac_bmc: 00:11:25:91:45:8F
+gdx-208: 
+  mac_eth0: 00:11:25:C4:4F:AE
+  mac_myri0: 00:60:DD:47:86:5A
+  mac_eth1: 00:11:25:C4:4F:AF
+  mac_bmc: 00:11:25:91:46:7D
+gdx-234: 
+  mac_eth0: 00:11:25:C4:3C:42
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:43
+  mac_bmc: 00:11:25:91:46:08
+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: 00:11:25:C4:53:4A
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:53:4B
+  mac_bmc: 00:11:25:91:45:DD
+gdx-209: 
+  mac_eth0: 00:11:25:C4:4E:C4
+  mac_myri0: 00:60:DD:47:89:84
+  mac_eth1: 00:11:25:C4:4E:C5
+  mac_bmc: 00:11:25:91:45:82
+gdx-235: 
+  mac_eth0: 00:11:25:C4:35:50
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:51
+  mac_bmc: 00:11:25:91:47:EB
+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: 00:11:25:C4:52:88
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:52:89
+  mac_bmc: 00:11:25:91:47:A0
+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: 00:11:25:C4:4F:5E
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:5F
+  mac_bmc: 00:11:25:91:47:91
+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: 00:11:25:C4:33:7C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:33:7D
+  mac_bmc: 00:11:25:91:48:A4
+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: 00:11:25:C4:4E:08
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:09
+  mac_bmc: 00:11:25:91:46:3B
+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: 00:11:25:C4:34:65
+  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: 00:11:25:C4:53:B6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:53:B7
+  mac_bmc: 00:11:25:91:46:A0
+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: 00:11:25:C4:4E:48
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4E:49
+  mac_bmc: 00:11:25:91:47:F6
+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: 00:11:25:C4:4E:70
+  mac_myri0: 00:60:DD:47:86:54
+  mac_eth1: 00:11:25:C4:4E:71
+  mac_bmc: 00:11:25:91:48:58
+gdx-267: 
+  mac_eth0: 00:11:25:C4:35:36
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:37
+  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: 00:11:25:C4:52:4E
+  mac_myri0: 00:60:DD:47:7C:63
+  mac_eth1: 00:11:25:C4:52:4F
+  mac_bmc: 00:11:25:91:47:30
+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: 00:11:25:C4:52:46
+  mac_myri0: 00:60:DD:47:86:57
+  mac_eth1: 00:11:25:C4:52:47
+  mac_bmc: 00:11:25:91:48:5F
+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: 00:11:25:C4:51:A5
+  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: 00:11:25:C4:50:31
+  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: 00:11:25:C4:3E:2D
+  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: 00:11:25:C4:4E:11
+  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: 00:11:25:C4:4F:C7
+  mac_bmc: 00:11:25:91:48:7F
+gdx-220: 
+  mac_eth0: 00:11:25:C4:3C:6A
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:6B
+  mac_bmc: 00:11:25:91:48:39
+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: 00:11:25:C4:3C:63
+  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: 00:11:25:C4:51:49
+  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: 00:11:25:C4:3D:96
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3D:97
+  mac_bmc: 00:11:25:91:45:C3
+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: 00:11:25:C4:3B:B5
+  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: 00:11:25:C4:53:01
+  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: 00:11:25:C4:39:87
+  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: 00:11:25:C4:4E:45
+  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: 00:11:25:C4:39:54
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:39:55
+  mac_bmc: 00:11:25:91:48:16
+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: 00:11:25:C4:51:4D
+  mac_bmc: 00:11:25:91:46:1C
+gdx-116: 
+  mac_eth0: 00:11:25:C4:52:A2
+  mac_myri0: 00:60:DD:47:59:39
+  mac_eth1: 00:11:25:C4:52:A3
+  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: 00:11:25:C4:3C:14
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:15
+  mac_bmc: 00:11:25:91:48:A4
+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: 00:11:25:C4:3C:4C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:4D
+  mac_bmc: 00:11:25:91:46:C0
+gdx-66: 
+  mac_eth0: 00:11:25:C4:3B:E0
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3B:E1
+  mac_bmc: 00:11:25:91:46:E1
+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: 00:11:25:C4:52:ED
+  mac_bmc: 00:11:25:91:45:94
+gdx-92: 
+  mac_eth0: 00:11:25:C4:4D:82
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4D:83
+  mac_bmc: 00:11:25:91:46:4D
+gdx-170: 
+  mac_eth0: 00:11:25:C4:4D:00
+  mac_myri0: 00:60:DD:47:59:66
+  mac_eth1: 00:11:25:C4:4D:01
+  mac_bmc: 00:11:25:91:48:3D
+gdx-224: 
+  mac_eth0: 00:11:25:C4:39:00
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:39:01
+  mac_bmc: 00:11:25:91:46:7E
+gdx-93: 
+  mac_eth0: 00:11:25:C4:4F:A6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:A7
+  mac_bmc: 00:11:25:91:48:2F
+gdx-67: 
+  mac_eth0: 00:11:25:C4:35:66
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:67
+  mac_bmc: 00:11:25:91:47:09
+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: 00:11:25:C4:53:EB
+  mac_bmc: 00:11:25:91:48:5B
+gdx-171: 
+  mac_eth0: 00:11:25:C4:4D:08
+  mac_myri0: 00:60:DD:47:65:A9
+  mac_eth1: 00:11:25:C4:4D:09
+  mac_bmc: 00:11:25:91:45:FC
+gdx-225: 
+  mac_eth0: 00:11:25:C4:38:D0
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:38:D1
+  mac_bmc: 00:11:25:91:46:AE
+gdx-119: 
+  mac_eth0: 00:11:25:C4:51:AC
+  mac_myri0: 00:60:DD:47:65:C1
+  mac_eth1: 00:11:25:C4:51:AD
+  mac_bmc: 00:11:25:91:46:15
+gdx-94: 
+  mac_eth0: 00:11:25:C4:53:FC
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:53:FD
+  mac_bmc: 00:11:25:91:48:05
+gdx-68: 
+  mac_eth0: 00:11:25:C4:3C:18
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:19
+  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: 00:11:25:C4:54:18
+  mac_myri0: 00:60:DD:47:65:BF
+  mac_eth1: 00:11:25:C4:54:19
+  mac_bmc: 00:11:25:91:45:92
+gdx-226: 
+  mac_eth0: 00:11:25:C4:38:F6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:38:F7
+  mac_bmc: 00:11:25:91:48:35
+gdx-307: 
+  mac_eth0: 00:11:25:C4:33:4C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:33:4D
+  mac_bmc: 00:11:25:91:46:FE
+gdx-95: 
+  mac_eth0: 00:11:25:C4:4F:30
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:31
+  mac_bmc: 00:11:25:91:45:F7
+gdx-69: 
+  mac_eth0: 00:11:25:C4:34:82
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:34:83
+  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: 00:11:25:C4:51:DA
+  mac_myri0: 00:60:DD:47:65:C3
+  mac_eth1: 00:11:25:C4:51:DB
+  mac_bmc: 00:11:25:91:45:EA
+gdx-227: 
+  mac_eth0: 00:11:25:C4:34:52
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:39:8F
+  mac_bmc: 00:14:5E:65:C6:4A
+gdx-308: 
+  mac_eth0: 00:11:25:C4:32:6A
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:32:6B
+  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: 00:11:25:C4:50:A7
+  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: 00:11:25:C4:4F:46
+  mac_myri0: 00:60:DD:47:65:A8
+  mac_eth1: 00:11:25:C4:4F:47
+  mac_bmc: 00:11:25:91:45:FA
+gdx-228: 
+  mac_eth0: 00:11:25:C4:32:A6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:32:A7
+  mac_bmc: 00:11:25:91:46:0C
+gdx-309: 
+  mac_eth0: 00:11:25:C4:33:30
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:33:31
+  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: 00:11:25:C4:4F:06
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:07
+  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: 00:11:25:C4:4F:AC
+  mac_myri0: 00:60:DD:47:65:BA
+  mac_eth1: 00:11:25:C4:4F:AD
+  mac_bmc: 00:11:25:91:48:EB
+gdx-229: 
+  mac_eth0: 00:11:25:C4:3C:76
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3C:77
+  mac_bmc: 00:11:25:91:45:8A
+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: 00:11:25:C4:4E:1B
+  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: 00:11:25:C4:4F:CA
+  mac_myri0: 00:60:DD:47:66:03
+  mac_eth1: 00:11:25:C4:4F:CB
+  mac_bmc: 00:11:25:91:48:EA
+gdx-99: 
+  mac_eth0: 00:11:25:C4:4F:3E
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:4F:3F
+  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: 00:11:25:C4:4F:C4
+  mac_myri0: 00:60:DD:47:66:04
+  mac_eth1: 00:11:25:C4:4F:C5
+  mac_bmc: 00:11:25:91:47:8B
+gdx-284: 
+  mac_eth0: 00:11:25:C4:49:DE
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:49:DF
+  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: 00:11:25:C4:50:0A
+  mac_myri0: 00:60:DD:47:65:D8
+  mac_eth1: 00:11:25:C4:50:0B
+  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: 00:11:25:C4:50:76
+  mac_myri0: 00:60:DD:47:65:B4
+  mac_eth1: 00:11:25:C4:50:77
+  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: 00:11:25:C4:35:A8
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:A9
+  mac_bmc: 00:11:25:91:47:F8
+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: 00:11:25:C4:35:1C
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:1D
+  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: 00:11:25:C4:4E:94
+  mac_myri0: 00:60:DD:47:89:D0
+  mac_eth1: 00:11:25:C4:4E:95
+  mac_bmc: 00:11:25:91:45:AA
+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: 00:11:25:C4:35:92
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:35:93
+  mac_bmc: 00:11:25:91:46:05
+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: 00:11:25:C4:3B:F6
+  mac_myri0: nil
+  mac_eth1: 00:11:25:C4:3B:F7
+  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: 00:11:25:C4:35:C3
+  mac_bmc: 00:11:25:91:46:3F
+gdx-211: 
+  mac_eth0: 00:11:25:C4:4F:94
+  mac_myri0: 00:60:DD:47:86:5C
+  mac_eth1: 00:11:25:C4:4F:95
+  mac_bmc: 00:11:25:91:48:38
diff --git a/generators/input/orsay-links.yaml b/generators/input/orsay-links.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2b34b1912f3c2c8407e518390655c396c6098c95
--- /dev/null
+++ b/generators/input/orsay-links.yaml
@@ -0,0 +1,55 @@
+--- 
+links-eth0: 
+  gdx:
+    switch-eth0-0: "1,18"
+    switch-eth0-1: "19,36"
+    switch-eth0-2: "37,54"
+    switch-eth0-3: "55,72"
+    switch-eth0-4: "73,90"
+    switch-eth0-5: "91,108"
+    switch-eth0-6: "109,126"
+    switch-eth0-7: "127,144"
+    switch-eth0-8: "145,162"
+    switch-eth0-9: "163,180"
+    switch-eth0-10: "181,198"
+    switch-eth0-11: "199,216"
+    switch-eth0-12: "217,234"
+    switch-eth0-13: "235,252"
+    switch-eth0-14: "253,270"
+    switch-eth0-15: "271,288"
+    switch-eth0-16: "289,306"
+    switch-eth0-17: "307,310"
+  netgdx:
+    switch-gw: "1,30"
+links-bmc:
+  gdx:
+    switch-bmc-0: "1,36"
+    switch-bmc-1: "37,72"
+    switch-bmc-2: "73,108"
+    switch-bmc-3: "109,144"
+    switch-bmc-4: "145,180"
+    switch-eth0-10: "181,186"
+    switch-eth0-11: "187,192"
+    switch-bmc-5: "193,216"
+    switch-bmc-6: "217,252"
+    switch-bmc-7: "253,288"
+    switch-bmc-8: "289,310"
+  netgdx:
+    switch-gw: "1,30"
+links-rsa:
+  gdx:
+    switch-rsa-0: "1,36"
+    switch-rsa-1: "37,72"
+    switch-rsa-2: "73,108"
+    switch-rsa-3: "109,144"
+    switch-rsa-4: "145,180"
+    switch-rsa-5: "181,216"
+    switch-rsa-6: "217,252"
+    switch-rsa-7: "253,288"
+    switch-rsa-8: "289,310"
+  netgdx:
+    switch-rsa-netgdx: "1,30"
+links-mx:
+  gdx:
+    switch-mx: "1,310"
+    
\ No newline at end of file
diff --git a/generators/input/orsay-netgdx.rb b/generators/input/orsay-netgdx.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c2d119342b8242b0c9a1ca04f217e6f9b430ae34
--- /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 => false,
+            :mounted => false,
+            :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..98c9927e984d7f57d3e89004c776930b7cbc95db
--- /dev/null
+++ b/generators/input/orsay-network.yaml
@@ -0,0 +1,326 @@
+--- 
+switch-nil:
+  name: nil
+  rate: 0
+  ip: nil
+  mac: nil
+  next_switch : nil
+  next_switch_rate : 0
+switch-eth0-0:
+  name: "switch11"
+  nodes: "gdx-[1-18]"
+  rate: 1.G
+  ip: 172.26.120.111
+  mac: 00:12:01:73:21:C2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-1:
+  name: "switch12"
+  nodes: "gdx-[19-36]"
+  rate: 1.G  
+  ip: 172.26.120.112
+  mac: 00:12:01:73:27:C2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-2:
+  name: "switch09"
+  nodes: "gdx-[37-54]"
+  rate: 1.G  
+  ip: 172.26.120.109
+  mac: 00:24:F9:3E:81:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-3:
+  name: "switch08"
+  nodes: "gdx-[55-72]"
+  rate: 1.G  
+  ip: 172.26.120.108
+  mac: 00:11:BB:3E:FD:C2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-4:
+  name: "switch06"
+  nodes: "gdx-[73-90]"
+  rate: 1.G  
+  ip: 172.26.120.106
+  mac: 00:24:f9:3e:e7:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-5:
+  name: "switch05"
+  nodes: "gdx-[91-108]"
+  rate: 1.G  
+  ip: 172.26.120.105
+  mac: 00:12:00:44:53:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-6:
+  name: "switch03"
+  nodes: "gdx-[109-126]"
+  rate: 1.G  
+  ip: 172.26.120.103
+  mac: 00:24:f9:3e:a7:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-7:
+  name: "switch02"
+  nodes: "gdx-[127-144]"
+  rate: 1.G  
+  ip: 172.26.120.102
+  mac: 00:12:00:4c:f5:c2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-8:
+  name: "procurve17"
+  nodes: "gdx-[145-162]"
+  rate: 100.M  
+  ip: 172.26.120.197
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-9:
+  name: "procurve18"
+  nodes: "gdx-[163-180]"
+  rate: 100.M  
+  ip: 172.26.120.198
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-10:
+  name: "switch14"
+  nodes: "gdx-[181-198]"
+  rate: 1.G  
+  ip: 172.26.120.114
+  mac: 00:11:bb:17:e8:c2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-11:
+  name: "switch15"
+  nodes: "gdx-[199-216]"
+  rate: 1.G  
+  ip: 172.26.120.115
+  mac: 00:12:00:4c:a7:c2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-12:
+  name: "procurve-04-07"
+  nodes: "gdx-[217-234]"
+  rate: 1.G  
+  ip: 172.26.120.107
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-13:
+  name: "procurve-04-07"
+  nodes: "gdx-[235-252]"
+  rate: 1.G  
+  ip: 172.26.120.104
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-14:
+  name: "switch10"
+  nodes: "gdx-[253-270]"
+  rate: 1.G  
+  ip: 172.26.120.110
+  mac: 00:12:01:72:cd:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-15:
+  name: "switch16"
+  nodes: "gdx-[271-288]"
+  rate: 1.G  
+  ip: 172.26.120.116
+  mac: 00:12:01:5b:af:42
+  next_switch : "switch-gw"
+  next_switch_rate : 3.G
+switch-eth0-16:
+  name: "switch07"
+  nodes: "gdx-[289-306]"
+  rate: 1.G  
+  ip: 172.26.120.107
+  mac: 00:12:00:44:68:42
+  next_switch : "switch-gw"
+  next_switch_rate : 3.G
+switch-eth0-17:
+  name: "switch13"
+  nodes: "gdx-[307-310]"
+  rate: 1.G  
+  ip: 172.26.120.113
+  mac: 00:24:f9:2a:0e:41
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-bmc-0:
+  name: "netgear01"
+  nodes: "gdx-[1-36]"
+  rate: 1.G  
+  ip: 172.26.120.151
+  mac: 00:0f:b5:fc:0d:26
+  next_switch : "switch-eth0-1"
+  next_switch_rate : 1.G
+switch-bmc-1:
+  name: "netgear02"
+  nodes: "gdx-[37-72]"
+  rate: 1.G  
+  ip: 172.26.120.152
+  mac: 00:22:3f:e6:f8:ce
+  next_switch : "switch-eth0-3"
+  next_switch_rate : 1.G
+switch-bmc-2:
+  name: "netgear03"
+  nodes: "gdx-[73-108]"
+  rate: 1.G  
+  ip: 172.26.120.153
+  mac: 00:0f:b5:fb:70:89
+  next_switch : "switch-eth0-5"
+  next_switch_rate : 1.G
+switch-bmc-3:
+  name: "netgear04"
+  nodes: "gdx-[109-144]"
+  rate: 1.G  
+  ip: 172.26.120.154
+  mac: 00:0f:b5:f5:79:2a
+  next_switch : "switch-eth0-7"
+  next_switch_rate : 1.G
+switch-bmc-4:
+  name: "netgear05"
+  nodes: "gdx-[145-180]"
+  rate: 1.G  
+  ip: 172.26.120.155
+  mac: 00:0f:b5:fb:70:a5
+  next_switch : "switch-eth0-9"
+  next_switch_rate : 1.G
+switch-bmc-5:
+  name: "netgear06"
+  nodes: "gdx-[181-216]"
+  rate: 1.G  
+  ip: 172.26.120.156
+  mac: nil
+  next_switch : "switch-eth0-11"
+  next_switch_rate : 1.G
+switch-bmc-6:
+  name: "netgear07"
+  nodes: "gdx-[216-252]"
+  rate: 1.G  
+  ip: 172.26.120.157
+  mac: nil
+  next_switch : "switch-eth0-13"
+  next_switch_rate : 1.G
+switch-bmc-7:
+  name: "netgear08"
+  nodes: "gdx-[253-288]"
+  rate: 1.G  
+  ip: 172.26.120.158
+  mac: 00:0f:b5:fc:0d:aa
+  next_switch : "switch-eth0-15"
+  next_switch_rate : 1.G
+switch-bmc-8:
+  name: "procurve-bmc-09"
+  nodes: "gdx-[289-310]"
+  rate: 100.M  
+  ip: 172.26.120.159
+  mac: nil
+  next_switch : "switch-eth0-17"
+  next_switch_rate : 1.G
+switch-bmc-netgdx:
+  name: "netgearxy"
+  nodes: "netgdx-[1-30]"
+  rate: 1.G  
+  ip: 172.26.120.150
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 1.G
+switch-rsa-0:
+  name: "mrv01"
+  nodes: "gdx-[1-36]"
+  rate: 1.G  
+  ip: 172.26.120.201
+  mac: nil
+  next_switch : "switch-eth0-1"
+  next_switch_rate : 1.G
+switch-rsa-1:
+  name: "mrv02"
+  nodes: "gdx-[37-72]"
+  rate: 1.G  
+  ip: 172.26.120.202
+  mac: 00:a0:9c:00:16:41
+  next_switch : "switch-eth0-3"
+  next_switch_rate : 1.G
+switch-rsa-2:
+  name: "mrv03"
+  nodes: "gdx-[73-108]"
+  rate: 1.G  
+  ip: 172.26.120.203
+  mac: 00:a0:9c:00:12:dd
+  next_switch : "switch-eth0-5"
+  next_switch_rate : 1.G
+switch-rsa-3:
+  name: "mrv04"
+  nodes: "gdx-[109-144]"
+  rate: 1.G  
+  ip: 172.26.120.204
+  mac: 00:a0:9c:00:12:e4
+  next_switch : "switch-eth0-7"
+  next_switch_rate : 1.G
+switch-rsa-4:
+  name: "mrv05"
+  nodes: "gdx-[145-180]"
+  rate: 1.G  
+  ip: 172.26.120.205
+  mac: 00:a0:9c:00:10:ae
+  next_switch : "switch-eth0-9"
+  next_switch_rate : 1.G
+switch-rsa-5:
+  name: "mrv06"
+  nodes: "gdx-[181-216]"
+  rate: 1.G  
+  ip: 172.26.120.206
+  mac: 00:a0:9c:00:16:42
+  next_switch : "switch-eth0-11"
+  next_switch_rate : 1.G
+switch-rsa-6:
+  name: "mrv07"
+  nodes: "gdx-[217-252]"
+  rate: 1.G  
+  ip: 172.26.120.207
+  mac: nil
+  next_switch : "switch-eth0-13"
+  next_switch_rate : 1.G
+switch-rsa-7:
+  name: "mrv08"
+  nodes: "gdx-[253-288]"
+  rate: 1.G  
+  ip: 172.26.120.208
+  mac: nil
+  next_switch : "switch-eth0-15"
+  next_switch_rate : 1.G
+switch-rsa-8:
+  name: "mrv09"
+  nodes: "gdx-[289-310]"
+  rate: 1.G  
+  ip: 172.26.120.209
+  mac: 00:a0:9c:00:25:4a
+  next_switch : "switch-eth0-17"
+  next_switch_rate : 1.G
+switch-rsa-netgdx:
+  name: "mrv00"
+  nodes: "netgdx-[1-30]"
+  rate: 1.G 
+  ip: 172.26.120.200
+  mac: nil
+switch-mx:
+  name: "switch-mx"
+  nodes: "gdx-[1-310]"
+  rate: 10.G  
+  ip: nil
+  mac: nil
+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