From 36236f8591d8bad82c4d28fb4e996cf056d0e3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20Morel?= <emile.morel@inria.fr>
Date: Fri, 3 May 2013 15:03:53 +0200
Subject: [PATCH] [bordeaux] bordeplage - values from g5kchecks

---
 .../bordeplage/nodes/bordeplage-1.json        |   46 +-
 .../bordeplage/nodes/bordeplage-10.json       |   46 +-
 .../bordeplage/nodes/bordeplage-11.json       |   46 +-
 .../bordeplage/nodes/bordeplage-12.json       |   46 +-
 .../bordeplage/nodes/bordeplage-13.json       |   46 +-
 .../bordeplage/nodes/bordeplage-14.json       |   46 +-
 .../bordeplage/nodes/bordeplage-15.json       |   46 +-
 .../bordeplage/nodes/bordeplage-16.json       |   46 +-
 .../bordeplage/nodes/bordeplage-17.json       |   46 +-
 .../bordeplage/nodes/bordeplage-18.json       |   46 +-
 .../bordeplage/nodes/bordeplage-19.json       |   46 +-
 .../bordeplage/nodes/bordeplage-2.json        |   46 +-
 .../bordeplage/nodes/bordeplage-20.json       |   46 +-
 .../bordeplage/nodes/bordeplage-21.json       |   46 +-
 .../bordeplage/nodes/bordeplage-22.json       |   46 +-
 .../bordeplage/nodes/bordeplage-23.json       |   46 +-
 .../bordeplage/nodes/bordeplage-24.json       |   46 +-
 .../bordeplage/nodes/bordeplage-25.json       |   46 +-
 .../bordeplage/nodes/bordeplage-26.json       |   46 +-
 .../bordeplage/nodes/bordeplage-27.json       |   46 +-
 .../bordeplage/nodes/bordeplage-28.json       |   46 +-
 .../bordeplage/nodes/bordeplage-29.json       |   46 +-
 .../bordeplage/nodes/bordeplage-3.json        |   46 +-
 .../bordeplage/nodes/bordeplage-30.json       |   46 +-
 .../bordeplage/nodes/bordeplage-31.json       |   46 +-
 .../bordeplage/nodes/bordeplage-32.json       |   46 +-
 .../bordeplage/nodes/bordeplage-33.json       |   46 +-
 .../bordeplage/nodes/bordeplage-34.json       |   46 +-
 .../bordeplage/nodes/bordeplage-35.json       |   46 +-
 .../bordeplage/nodes/bordeplage-36.json       |   46 +-
 .../bordeplage/nodes/bordeplage-37.json       |   46 +-
 .../bordeplage/nodes/bordeplage-38.json       |   46 +-
 .../bordeplage/nodes/bordeplage-39.json       |   46 +-
 .../bordeplage/nodes/bordeplage-4.json        |   46 +-
 .../bordeplage/nodes/bordeplage-40.json       |   46 +-
 .../bordeplage/nodes/bordeplage-41.json       |   46 +-
 .../bordeplage/nodes/bordeplage-42.json       |   46 +-
 .../bordeplage/nodes/bordeplage-43.json       |   46 +-
 .../bordeplage/nodes/bordeplage-44.json       |   46 +-
 .../bordeplage/nodes/bordeplage-45.json       |   46 +-
 .../bordeplage/nodes/bordeplage-46.json       |   46 +-
 .../bordeplage/nodes/bordeplage-47.json       |   46 +-
 .../bordeplage/nodes/bordeplage-48.json       |   46 +-
 .../bordeplage/nodes/bordeplage-49.json       |   46 +-
 .../bordeplage/nodes/bordeplage-5.json        |   46 +-
 .../bordeplage/nodes/bordeplage-50.json       |   46 +-
 .../bordeplage/nodes/bordeplage-51.json       |   46 +-
 .../bordeplage/nodes/bordeplage-6.json        |   46 +-
 .../bordeplage/nodes/bordeplage-7.json        |   46 +-
 .../bordeplage/nodes/bordeplage-8.json        |   46 +-
 .../bordeplage/nodes/bordeplage-9.json        |   46 +-
 .../sites/bordeaux/clusters/bordeplage.rb     |  242 +-
 .../sites/bordeaux/clusters/bordeplage.yaml   | 3711 +++++++++++++++--
 53 files changed, 4819 insertions(+), 1480 deletions(-)

diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
index e1f8927fd68..20ba65882f4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "6PFGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.1",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:d9:ec",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-1.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.1",
       "mac": "00:14:22:0c:d9:ed",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:56",
       "interface": "InfiniBand",
       "ip": "172.18.0.1",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-1-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:57",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:d9:ec",
       "interface": "Ethernet",
       "ip": "172.17.0.1",
+      "mac": "00:14:22:0c:d9:ec",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K4G7",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
index 62c6cc70afc..a2ee704ed72 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "6PFGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.10",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": null,
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-10.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.10",
       "mac": null,
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
       "ip": "172.18.0.10",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-10-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": null,
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:76",
       "interface": "Ethernet",
       "ip": "172.17.0.10",
+      "mac": "00:14:22:0c:da:76",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K4G7",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
index dfa67b98e00..67ce60460ee 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "FC5GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.11",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:d9:bc",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-11.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.11",
       "mac": "00:14:22:0c:d9:bd",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2a",
       "interface": "InfiniBand",
       "ip": "172.18.0.11",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-11-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2b",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:d9:bc",
       "interface": "Ethernet",
       "ip": "172.17.0.11",
+      "mac": "00:14:22:0c:d9:bc",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2FTKM",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
index d5fc5258001..12fe0ccf26e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "2D5GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.12",
+      "ip6": "fe80::214:22ff:fe0c:da74",
       "mac": "00:14:22:0c:da:74",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-12.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.12",
       "mac": "00:14:22:0c:da:75",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3e",
       "interface": "InfiniBand",
       "ip": "172.18.0.12",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-12-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3f",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:74",
       "interface": "Ethernet",
       "ip": "172.17.0.12",
+      "mac": "00:14:22:0c:da:74",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2HKM6",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
index 4e102df8a5b..c10abc09909 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "9D5GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.13",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:82",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-13.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.13",
       "mac": "00:14:22:0c:da:83",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7b",
       "interface": "InfiniBand",
       "ip": "172.18.0.13",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-13-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7c",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:82",
       "interface": "Ethernet",
       "ip": "172.17.0.13",
+      "mac": "00:14:22:0c:da:82",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JD77",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
index b60cde10aaa..2daa657a910 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "HC5GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.14",
+      "ip6": "fe80::214:22ff:fe0c:da90",
       "mac": "00:14:22:0c:da:90",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-14.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.14",
       "mac": "00:14:22:0c:da:91",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:52",
       "interface": "InfiniBand",
       "ip": "172.18.0.14",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-14-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:53",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:90",
       "interface": "Ethernet",
       "ip": "172.17.0.14",
+      "mac": "00:14:22:0c:da:90",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2HSD8",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
index 217f0b88c65..c5ca06d4663 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "2PFGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.15",
+      "ip6": "fe80::214:22ff:fe0c:dac0",
       "mac": "00:14:22:0c:da:c0",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-15.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.15",
       "mac": "00:14:22:0c:da:c1",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:41",
       "interface": "InfiniBand",
       "ip": "172.18.0.15",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-15-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:42",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:c0",
       "interface": "Ethernet",
       "ip": "172.17.0.15",
+      "mac": "00:14:22:0c:da:c0",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2A96S",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
index 200f86e064a..ba9441c156a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "JPFGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.16",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:44",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-16.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.16",
       "mac": "00:14:22:0c:da:45",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:74",
       "interface": "InfiniBand",
       "ip": "172.18.0.16",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-16-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:75",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:44",
       "interface": "Ethernet",
       "ip": "172.17.0.16",
+      "mac": "00:14:22:0c:da:44",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2HS2A",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
index 547bfd822c2..fc9832c1472 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "GPFGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.17",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:62",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-17.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.17",
       "mac": "00:14:22:0c:da:63",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c5",
       "interface": "InfiniBand",
       "ip": "172.18.0.17",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-17-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:62",
       "interface": "Ethernet",
       "ip": "172.17.0.17",
+      "mac": "00:14:22:0c:da:62",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K4E4",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
index bacdd37a63a..afc681ab62e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "335GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.18",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:a2",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-18.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.18",
       "mac": "00:14:22:0c:da:a3",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:09",
       "interface": "InfiniBand",
       "ip": "172.18.0.18",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-18-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:0a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:a2",
       "interface": "Ethernet",
       "ip": "172.17.0.18",
+      "mac": "00:14:22:0c:da:a2",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT22VDZ",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
index 3ada51c8d89..5632bf78930 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "B35GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.19",
+      "ip6": "fe80::214:22ff:fe0c:b400",
       "mac": "00:14:22:0c:b4:00",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-19.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.19",
       "mac": "00:14:22:0c:b4:01",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b5",
       "interface": "InfiniBand",
       "ip": "172.18.0.19",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-19-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:b4:00",
       "interface": "Ethernet",
       "ip": "172.17.0.19",
+      "mac": "00:14:22:0c:b4:00",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2HBCP",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
index c62c9ffcd68..fb325509f5c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "8PFGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.2",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:46",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-2.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.2",
       "mac": "00:14:22:0c:da:47",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:25",
       "interface": "InfiniBand",
       "ip": "172.18.0.2",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-2-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:26",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:46",
       "interface": "Ethernet",
       "ip": "172.17.0.2",
+      "mac": "00:14:22:0c:da:46",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K2PG",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
index f144416b269..0b01a5a3c71 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "331KV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.20",
+      "ip6": "fe80::214:22ff:fe0c:b31c",
       "mac": "00:14:22:0c:b3:1c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-20.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.20",
       "mac": "00:14:22:0c:b3:1d",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b9",
       "interface": "InfiniBand",
       "ip": "172.18.0.20",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-20-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:ba",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:b3:1c",
       "interface": "Ethernet",
       "ip": "172.17.0.20",
+      "mac": "00:14:22:0c:b3:1c",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2N397",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
index 558557df05f..bbb4093ee07 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "DKMGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.21",
+      "ip6": "fe80::214:22ff:fe0c:e148",
       "mac": "00:14:22:0c:e1:48",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-21.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.21",
       "mac": "00:14:22:0c:e1:49",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1a",
       "interface": "InfiniBand",
       "ip": "172.18.0.21",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-21-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1b",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:48",
       "interface": "Ethernet",
       "ip": "172.17.0.21",
+      "mac": "00:14:22:0c:e1:48",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JNMQ",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
index d55ac916be3..c930f884fb8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "JMZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.22",
+      "ip6": "fe80::214:22ff:fe0c:dd02",
       "mac": "00:14:22:0c:dd:02",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-22.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.22",
       "mac": "00:14:22:0c:dd:03",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:42",
       "interface": "InfiniBand",
       "ip": "172.18.0.22",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-22-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:43",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:dd:02",
       "interface": "Ethernet",
       "ip": "172.17.0.22",
+      "mac": "00:14:22:0c:dd:02",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JKP2",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
index 8e441bd8518..978e82d7af6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "HLZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.23",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:e1:4c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-23.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.23",
       "mac": "00:14:22:0c:e1:4d",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:89",
       "interface": "InfiniBand",
       "ip": "172.18.0.23",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-23-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:8a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:4c",
       "interface": "Ethernet",
       "ip": "172.17.0.23",
+      "mac": "00:14:22:0c:e1:4c",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K4K3",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
index 4b41bf444b8..05004ecd094 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "1NZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.24",
+      "ip6": "fe80::214:22ff:fe0c:e0e0",
       "mac": "00:14:22:0c:e0:e0",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-24.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.24",
       "mac": "00:14:22:0c:e0:e1",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ed",
       "interface": "InfiniBand",
       "ip": "172.18.0.24",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-24-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ee",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e0:e0",
       "interface": "Ethernet",
       "ip": "172.17.0.24",
+      "mac": "00:14:22:0c:e0:e0",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K3TT",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
index e1a698d45f1..e00e5c1dbfe 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "9LZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.25",
+      "ip6": "fe80::214:22ff:fe0c:e176",
       "mac": "00:14:22:0c:e1:76",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-25.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.25",
       "mac": "00:14:22:0c:e1:77",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4b",
       "interface": "InfiniBand",
       "ip": "172.18.0.25",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-25-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4c",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:76",
       "interface": "Ethernet",
       "ip": "172.17.0.25",
+      "mac": "00:14:22:0c:e1:76",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JKTM",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
index b84ee2a4c58..38f20ca8d8a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "3MZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.26",
+      "ip6": "fe80::214:22ff:fe0c:e152",
       "mac": "00:14:22:0c:e1:52",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-26.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.26",
       "mac": "00:14:22:0c:e1:53",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:95",
       "interface": "InfiniBand",
       "ip": "172.18.0.26",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-26-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:96",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:52",
       "interface": "Ethernet",
       "ip": "172.17.0.26",
+      "mac": "00:14:22:0c:e1:52",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JP96",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
index ed11e9d9f2f..c18702ef540 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "6MZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.27",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:e1:7e",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-27.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.27",
       "mac": "00:14:22:0c:e1:7f",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:56",
       "interface": "InfiniBand",
       "ip": "172.18.0.27",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-27-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:57",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:7e",
       "interface": "Ethernet",
       "ip": "172.17.0.27",
+      "mac": "00:14:22:0c:e1:7e",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2H3BS",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
index 9475223e0d3..23a5d9d53eb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "BMZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.28",
+      "ip6": "fe80::214:22ff:fe0c:e18c",
       "mac": "00:14:22:0c:e1:8c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-28.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.28",
       "mac": "00:14:22:0c:e1:8d",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:99",
       "interface": "InfiniBand",
       "ip": "172.18.0.28",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-28-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:9a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:8c",
       "interface": "Ethernet",
       "ip": "172.17.0.28",
+      "mac": "00:14:22:0c:e1:8c",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K428",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
index d1d41e9807d..5af4738ab5a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "FMZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.29",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:e1:0a",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-29.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.29",
       "mac": "00:14:22:0c:e1:0b",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3a",
       "interface": "InfiniBand",
       "ip": "172.18.0.29",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-29-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3b",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:0a",
       "interface": "Ethernet",
       "ip": "172.17.0.29",
+      "mac": "00:14:22:0c:e1:0a",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JMGF",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
index 8fa5882af36..141f148320e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "9KMGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.3",
+      "ip6": "fe80::214:22ff:fe0c:e166",
       "mac": "00:14:22:0c:e1:66",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-3.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.3",
       "mac": "00:14:22:0c:e1:67",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:72",
       "interface": "InfiniBand",
       "ip": "172.18.0.3",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-3-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:73",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:66",
       "interface": "Ethernet",
       "ip": "172.17.0.3",
+      "mac": "00:14:22:0c:e1:66",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JR3S",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
index 80382d71289..2113ba9d33d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "GMZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.30",
+      "ip6": "fe80::214:22ff:fe0c:e192",
       "mac": "00:14:22:0c:e1:92",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-30.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.30",
       "mac": "00:14:22:0c:e1:93",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fd",
       "interface": "InfiniBand",
       "ip": "172.18.0.30",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-30-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fe",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:92",
       "interface": "Ethernet",
       "ip": "172.17.0.30",
+      "mac": "00:14:22:0c:e1:92",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JQL0",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
index e5d0c39ec0c..30800cddae9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.31",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:e1:ba",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-31.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.31",
       "mac": null,
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
       "ip": "172.18.0.31",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-31-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": null,
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:ba",
       "interface": "Ethernet",
       "ip": "172.17.0.31",
+      "mac": "00:14:22:0c:e1:ba",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": null,
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
index 6c9274551ef..c4b2083d835 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "635GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.32",
+      "ip6": "fe80::214:22ff:fe0c:dab6",
       "mac": "00:14:22:0c:da:b6",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-32.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.32",
       "mac": "00:14:22:0c:da:b7",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:98",
       "interface": "InfiniBand",
       "ip": "172.18.0.32",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-32-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:99",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:b6",
       "interface": "Ethernet",
       "ip": "172.17.0.32",
+      "mac": "00:14:22:0c:da:b6",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT1XVC4",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
index bb31a8d795f..fd21046ca38 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "725GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.33",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:94",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-33.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.33",
       "mac": "00:14:22:0c:da:95",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76",
       "interface": "InfiniBand",
       "ip": "172.18.0.33",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-33-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:94",
       "interface": "Ethernet",
       "ip": "172.17.0.33",
+      "mac": "00:14:22:0c:da:94",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2HG5S",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
index e57b38177e0..bb4a95b76a3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "F25GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.34",
+      "ip6": "fe80::214:22ff:fe0c:da12",
       "mac": "00:14:22:0c:da:12",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-34.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.34",
       "mac": "00:14:22:0c:da:13",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:69",
       "interface": "InfiniBand",
       "ip": "172.18.0.34",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-34-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:6a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:12",
       "interface": "Ethernet",
       "ip": "172.17.0.34",
+      "mac": "00:14:22:0c:da:12",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2182C",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
index 11922ca294c..708bc2b09a4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "BKMGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.35",
+      "ip6": "fe80::214:22ff:fe0c:e136",
       "mac": "00:14:22:0c:e1:36",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-35.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.35",
       "mac": "00:14:22:0c:e1:37",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:37",
       "interface": "InfiniBand",
       "ip": "172.18.0.35",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-35-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:38",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:36",
       "interface": "Ethernet",
       "ip": "172.17.0.35",
+      "mac": "00:14:22:0c:e1:36",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JBZM",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
index b869930d161..cc75656bf0d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "6KMGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.36",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:e1:6a",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-36.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.36",
       "mac": "00:14:22:0c:e1:6b",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:22",
       "interface": "InfiniBand",
       "ip": "172.18.0.36",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-36-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:23",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:6a",
       "interface": "Ethernet",
       "ip": "172.17.0.36",
+      "mac": "00:14:22:0c:e1:6a",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JRDS",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
index 033902c2ab1..282ff53be4f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "H25GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.37",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:b1:7a",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-37.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.37",
       "mac": "00:14:22:0c:b1:7b",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f1",
       "interface": "InfiniBand",
       "ip": "172.18.0.37",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-37-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:b1:7a",
       "interface": "Ethernet",
       "ip": "172.17.0.37",
+      "mac": "00:14:22:0c:b1:7a",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JKTE",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
index 4db4efaca8e..a74b244be49 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "FWRJZ91"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.38",
+      "ip6": "fe80::213:72ff:fe69:a8b6",
       "mac": "00:13:72:69:a8:b6",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-38.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.38",
       "mac": "00:13:72:69:a8:b7",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e1",
       "interface": "InfiniBand",
       "ip": "172.18.0.38",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-38-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:13:72:69:a8:b6",
       "interface": "Ethernet",
       "ip": "172.17.0.38",
+      "mac": "00:13:72:69:a8:b6",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K4EP",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
index 0de3be97129..dd597636662 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "CD5GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.39",
+      "ip6": "fe80::214:22ff:fe0c:da7c",
       "mac": "00:14:22:0c:da:7c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-39.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.39",
       "mac": "00:14:22:0c:da:7d",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:05",
       "interface": "InfiniBand",
       "ip": "172.18.0.39",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-39-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:06",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:7c",
       "interface": "Ethernet",
       "ip": "172.17.0.39",
+      "mac": "00:14:22:0c:da:7c",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2H2G3",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
index d2ddb7bdce1..282f00f57cc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "7D5GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.4",
+      "ip6": "fe80::214:22ff:fe0c:d9fa",
       "mac": "00:14:22:0c:d9:fa",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-4.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.4",
       "mac": "00:14:22:0c:d9:fb",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e9",
       "interface": "InfiniBand",
       "ip": "172.18.0.4",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-4-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ea",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:d9:fa",
       "interface": "Ethernet",
       "ip": "172.17.0.4",
+      "mac": "00:14:22:0c:d9:fa",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K3TZ",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
index 398ce531e8f..1c458db8fea 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "8XXGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.40",
+      "ip6": "fe80::213:72ff:fe69:864c",
       "mac": "00:13:72:69:86:4c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-40.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.40",
       "mac": "00:13:72:69:86:4d",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:8f",
       "interface": "InfiniBand",
       "ip": "172.18.0.40",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-40-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:90",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:13:72:69:86:4c",
       "interface": "Ethernet",
       "ip": "172.17.0.40",
+      "mac": "00:13:72:69:86:4c",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JNWF",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
index 877461cbc30..96a8e7aeb84 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "D35GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2110054400,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.41",
+      "ip6": "fe80::214:22ff:fe0c:b392",
       "mac": "00:14:22:0c:b3:92",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-41.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.41",
       "mac": "00:14:22:0c:b3:93",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5e",
       "interface": "InfiniBand",
       "ip": "172.18.0.41",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-41-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5f",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:b3:92",
       "interface": "Ethernet",
       "ip": "172.17.0.41",
+      "mac": "00:14:22:0c:b3:92",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT21F0M",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
index d41221714bd..542690275a4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "4KMGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.42",
+      "ip6": "fe80::214:22ff:fe0c:e1a4",
       "mac": "00:14:22:0c:e1:a4",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-42.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.42",
       "mac": "00:14:22:0c:e1:a5",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:81",
       "interface": "InfiniBand",
       "ip": "172.18.0.42",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-42-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:82",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:a4",
       "interface": "Ethernet",
       "ip": "172.17.0.42",
+      "mac": "00:14:22:0c:e1:a4",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K38Q",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
index 40d66c9dc5e..557983da05a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "GC5GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.43",
+      "ip6": "fe80::214:22ff:fe0c:da8c",
       "mac": "00:14:22:0c:da:8c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-43.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.43",
       "mac": "00:14:22:0c:da:8d",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:75",
       "interface": "InfiniBand",
       "ip": "172.18.0.43",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-43-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:76",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:8c",
       "interface": "Ethernet",
       "ip": "172.17.0.43",
+      "mac": "00:14:22:0c:da:8c",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JNLS",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
index 4e4252ea028..77559f967e3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "835GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.44",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:b1:1c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-44.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.44",
       "mac": "00:14:22:0c:b1:1d",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:92",
       "interface": "InfiniBand",
       "ip": "172.18.0.44",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-44-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:93",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:b1:1c",
       "interface": "Ethernet",
       "ip": "172.17.0.44",
+      "mac": "00:14:22:0c:b1:1c",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2EA4V",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
index db3e310129f..a81c64c99eb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "3D5GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.45",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:88",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-45.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.45",
       "mac": "00:14:22:0c:da:89",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:89",
       "interface": "InfiniBand",
       "ip": "172.18.0.45",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-45-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:8a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:88",
       "interface": "Ethernet",
       "ip": "172.17.0.45",
+      "mac": "00:14:22:0c:da:88",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K25Q",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
index c73afa62bd7..5e58d5db414 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "2LMGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.46",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:e1:7c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-46.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.46",
       "mac": "00:14:22:0c:e1:7d",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:62",
       "interface": "InfiniBand",
       "ip": "172.18.0.46",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-46-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:63",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:7c",
       "interface": "Ethernet",
       "ip": "172.17.0.46",
+      "mac": "00:14:22:0c:e1:7c",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2H8ET",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
index 404a7268287..979fc525b5b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "6LZGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.47",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:de:34",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-47.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.47",
       "mac": "00:14:22:0c:de:35",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2c",
       "interface": "InfiniBand",
       "ip": "172.18.0.47",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-47-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2d",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:de:34",
       "interface": "Ethernet",
       "ip": "172.17.0.47",
+      "mac": "00:14:22:0c:de:34",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2K3MZ",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
index 4fcbee5b081..fe6af9b28a8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "4LMGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.48",
+      "ip6": "fe80::214:22ff:fe0c:dbca",
       "mac": "00:14:22:0c:db:ca",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-48.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.48",
       "mac": "00:14:22:0c:db:cb",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:59",
       "interface": "InfiniBand",
       "ip": "172.18.0.48",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-48-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:5a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:db:ca",
       "interface": "Ethernet",
       "ip": "172.17.0.48",
+      "mac": "00:14:22:0c:db:ca",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2H2ZB",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
index 918ac845d02..ba6beb81896 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.49",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:30",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-49.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.49",
       "mac": null,
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
       "ip": "172.18.0.49",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-49-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": null,
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": null,
       "interface": "Ethernet",
       "ip": "172.17.0.49",
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": null,
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
index ad5adaa1022..674a592364e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "JKMGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.5",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:e1:74",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-5.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.5",
       "mac": "00:14:22:0c:e1:75",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b5",
       "interface": "InfiniBand",
       "ip": "172.18.0.5",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-5-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:74",
       "interface": "Ethernet",
       "ip": "172.17.0.5",
+      "mac": "00:14:22:0c:e1:74",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2H8A6",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
index 04010d53977..58910e60968 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "135GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.50",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:a6",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-50.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.50",
       "mac": "00:14:22:0c:da:a7",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:32",
       "interface": "InfiniBand",
       "ip": "172.18.0.50",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-50-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:33",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:a6",
       "interface": "Ethernet",
       "ip": "172.17.0.50",
+      "mac": "00:14:22:0c:da:a6",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2DQFZ",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
index 7c979abd3d2..c6c91dd5159 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "FPFGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.51",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:7e",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-51.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-2",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.51",
       "mac": "00:14:22:0c:da:7f",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:03",
       "interface": "InfiniBand",
       "ip": "172.18.0.51",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-51-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:04",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:7e",
       "interface": "Ethernet",
       "ip": "172.17.0.51",
+      "mac": "00:14:22:0c:da:7e",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2JLQ5",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
index ca4d94a3a4d..c5a49d04f4f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "5D5GV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.6",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:6e",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-6.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.6",
       "mac": "00:14:22:0c:da:6f",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:39",
       "interface": "InfiniBand",
       "ip": "172.18.0.6",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-6-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:3a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:6e",
       "interface": "Ethernet",
       "ip": "172.17.0.6",
+      "mac": "00:14:22:0c:da:6e",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2H2FP",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
index 938ce7db606..a307dae7d51 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A03"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": "FKMGV1J"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.7",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:e1:44",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-7.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.7",
       "mac": "00:14:22:0c:e1:45",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4e",
       "interface": "InfiniBand",
       "ip": "172.18.0.7",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-7-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4f",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:e1:44",
       "interface": "Ethernet",
       "ip": "172.17.0.7",
+      "mac": "00:14:22:0c:e1:44",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": "D7013KT2HKSX",
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
index 370f51e23e8..1e1769a7133 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.8",
+      "ip6": "fe80::214:22ff:fe0c:da94",
       "mac": "00:14:22:0c:da:40",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-8.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.8",
       "mac": "00:14:22:0c:da:41",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
       "ip": "172.18.0.8",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-8-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": null,
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:40",
       "interface": "Ethernet",
       "ip": "172.17.0.8",
+      "mac": "00:14:22:0c:da:40",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": null,
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
index e9bb7429fbe..5285104648d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
@@ -1,7 +1,7 @@
 {
   "architecture": {
     "platform_type": "x86_64",
-    "smp_size": 2,
+    "smp_size": null,
     "smt_size": 2
   },
   "bios": {
@@ -10,6 +10,7 @@
     "version": "A05"
   },
   "chassis": {
+    "manufacturer": "Dell Computer Corporation",
     "name": "PowerEdge 1855",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 2147483648,
+    "ram_size": 2109562880,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,20 +32,23 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.9",
+      "ip6": "fe80::214:22ff:fe0c:da50",
       "mac": "00:14:22:0c:da:50",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-9.bordeaux.grid5000.fr",
       "rate": 1000000000,
-      "switch": "sbordeplage-1",
+      "switch": "sbordeplage",
+      "switch_port": null,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "e1000",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "ip": "172.16.3.9",
       "mac": "00:14:22:0c:da:51",
@@ -58,34 +62,38 @@
     },
     {
       "device": "ib0",
-      "driver": "ib_mthca",
+      "driver": "mlx4_core",
       "enabled": true,
       "guid": null,
       "interface": "InfiniBand",
       "ip": "172.18.0.9",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordeplage-9-ib0.bordeaux.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": null,
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 10000000000,
       "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25208 (MT23108 compat mode)"
     },
     {
       "device": "bmc",
       "enabled": true,
-      "guid": "00:14:22:0c:da:50",
       "interface": "Ethernet",
       "ip": "172.17.0.9",
+      "mac": "00:14:22:0c:da:50",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -94,10 +102,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
     "release": "Squeeze",
-    "version": "6.0"
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 4820000000,
@@ -106,14 +114,15 @@
   "processor": {
     "cache_l1": null,
     "cache_l1d": 16384,
-    "cache_l1i": null,
+    "cache_l1i": 0,
     "cache_l2": 1048576,
+    "cache_l3": 0,
     "clock_speed": 3000000000,
-    "instruction_set": "",
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(TM) CPU 3.00GHz",
     "vendor": "Intel",
-    "version": "EM64T"
+    "version": "3.00GHz"
   },
   "storage_devices": [
     {
@@ -122,7 +131,8 @@
       "interface": "SCSI",
       "model": "ST373207LC",
       "rev": null,
-      "size": 65192580223.0835
+      "size": 73407820800,
+      "vendor": "SEAGATE"
     }
   ],
   "supported_job_types": {
diff --git a/generators/input/sites/bordeaux/clusters/bordeplage.rb b/generators/input/sites/bordeaux/clusters/bordeplage.rb
index 59627fc3b5e..811da5e356e 100644
--- a/generators/input/sites/bordeaux/clusters/bordeplage.rb
+++ b/generators/input/sites/bordeaux/clusters/bordeplage.rb
@@ -7,131 +7,155 @@ site :bordeaux do |site_uid|
 
     51.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
+
         performance({
-          :core_flops => 4820000000,
-          :node_flops => 9000000000
+        :core_flops => 4820000000,
+        :node_flops => 9000000000
+      })
+
+        supported_job_types({
+          :deploy       => true,
+          :besteffort   => true,
+          :virtual      => lookup('bordeplage', node_uid, 'supported_job_types', 'virtual')
         })
+
         architecture({
-          :smp_size 	 => 2,
-          :smt_size 	 => 2,
-          :platform_type => "x86_64"
+          :smp_size       => lookup('bordeplage', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('bordeplage', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('bordeplage', node_uid, 'architecture', 'platform_type')
         })
+
         processor({
-          :vendor 	     => "Intel",
-          :model 	     => "Intel Xeon",
-          :version 	     => "EM64T",
-          :clock_speed 	     => 3.G,
-          :instruction_set   => "",
-          :other_description => "",
-          :cache_l1 	     => nil,
-          :cache_l1i 	     => nil,
-          :cache_l1d 	     => 16.KiB,
-          :cache_l2 	     => 1.MiB
+          :vendor             => lookup('bordeplage', node_uid, 'processor', 'vendor'),
+          :model              => lookup('bordeplage', node_uid, 'processor', 'model'),
+          :version            => lookup('bordeplage', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('bordeplage', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('bordeplage', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('bordeplage', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('bordeplage', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('bordeplage', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('bordeplage', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('bordeplage', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('bordeplage', node_uid, 'processor', 'cache_l3')
         })
+
         main_memory({
-          :ram_size 	=> 2.GiB, # bytes
+          :ram_size     => lookup('bordeplage', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
+
         operating_system({
-          :name 	=> "Debian",
-          :release 	=> "Squeeze",
-          :version 	=> "6.0",
-	  :kernel   	=> "2.6.32"
+          :name     => lookup('bordeplage', node_uid, 'operating_system', 'name'),
+          :release  => "Squeeze",
+          :version  => lookup('bordeplage', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('bordeplage', node_uid, 'operating_system', 'kernel')
         })
+
         storage_devices [{
-      	  :interface 	=> 'SCSI',
-	  :size 	=> 70.GB,
-	  :driver 	=> "mptspi",
-	  :device       => "sda",
-	  :model        => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'model'),
-	  :rev          => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'rev')
-	}]
+          :interface  => 'SCSI',
+          :size       => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'size'),
+          :driver     => "mptspi",
+          :device     => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('bordeplage', node_uid, 'block_devices', 'sda', 'rev')
+        }]
+
         network_adapters [{
-	  :interface 	=> 'Ethernet',
-	  :rate 	=> 1.G,
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-	  :ip 		=> lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'ip'),
-	  :mac 		=> lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :vendor 	=> "Intel",
-	  :version 	=> "82546GB Gigabit Ethernet Controller",
-          :enabled 	=> true,
-          :switch       => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'switch'),
-          :mounted 	=> true,
-	  :mountable 	=> true,
-          :bridged      => true,
-	  :driver 	=> "e1000",
-	  :management 	=> false,
-	  :device 	=> "eth0"
-	},
+          :interface        => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :bridged          => true,
+          :device           => "eth0",
+          :vendor 	    => "Intel",
+          :version 	    => "82546GB Gigabit Ethernet Controller",
+          :driver           => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
+          :ip               => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => "sbordeplage",
+          :switch_port      => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('bordeplage', node_uid, 'network_interfaces', 'eth0', 'mac')
+        },
+        {
+          :interface        => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => 1.G,
+          :enabled          => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :bridged          => false,
+          :device           => "eth1",
+          :vendor 	    => "Intel",
+          :version 	    => "82546GB Gigabit Ethernet Controller",
+          :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
+          :ip               => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :driver           => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'mac')
+        },
         {
-	  :interface 	=> 'Ethernet',
-	  :rate 	=> 1.G,
-          :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-	  :ip 		=> lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'ip'),
-	  :mac 		=> lookup('bordeplage', node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :vendor 	=> "Intel",
-	  :version 	=> "82546GB Gigabit Ethernet Controller",
-          :enabled 	=> true,
-	  :mounted 	=> false,
-	  :mountable 	=> true,
-	  :driver 	=> "e1000",
-	  :management 	=> false,
-	  :device 	=> "eth1",
-	},
-	{
-	  :interface 	=> 'InfiniBand',
-	  :rate 	=> 10.G,
-          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-	  :ip 		=> lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'ip'),
-	  :guid 	=> lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'guid'),
-          :vendor 	=> 'Mellanox',
-	  :version 	=> "InfiniHost MT25208",
-          :enabled 	=> true,
-	  :mountable 	=> true,
-	  :mounted 	=> true,
-	  :driver 	=> "ib_mthca",
-	  :management 	=> false,
-	  :device 	=> "ib0"
-	},
-	{
-	  :interface 	=> 'InfiniBand',
-	  :rate 	=> 10.G,
-	  :guid 	=> lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'guid'),
-          :vendor 	=> 'Mellanox',
-	  :version 	=> "InfiniHost MT25208",
-          :enabled 	=> false,
-	  :device 	=> "ib1"
-	},
-	{
-	  :interface 	=> 'Ethernet',
-	  :rate 	=> 100.M,
-          :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-	  :ip 		=> lookup('bordeplage', node_uid, 'network_interfaces', 'bmc', 'ip'),
-	  :guid 	=> lookup('bordeplage', node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled 	=> true,
-	  :mountable 	=> false,
-	  :mounted 	=> false,
-	  :management 	=> true,
-	  :device 	=> "bmc"
-	}]
-	bios({
-	  :version	=> lookup('bordeplage', node_uid, 'bios', 'version'),
-	  :vendor	=> lookup('bordeplage', node_uid, 'bios', 'vendor'),
-	  :release_date => lookup('bordeplage', node_uid, 'bios', 'release_date')
-	})
-	chassis({
-	  :serial       => lookup('bordeplage', node_uid, 'chassis', 'serial_number'),
-	  :name		=> lookup('bordeplage', node_uid, 'chassis', 'product_name')
-	})
+          :interface        => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :device           => "ib0",
+          :enabled          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :vendor           => 'Mellanox',
+          :version          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'version'),
+          :driver           => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+          :ip               => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :guid             => lookup('bordeplage', node_uid, 'network_interfaces', 'ib0', 'guid')
+        },
+        {
+          :interface        => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :rate             => 10.G,
+          :device           => "ib1",
+          :enabled          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :vendor           => 'Mellanox',
+          :version          => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'version'),
+          :driver           => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('bordeplage', node_uid, 'network_interfaces', 'ib1', 'guid')
+        },
+        {
+          :interface            => 'Ethernet',
+          :rate                 => 100.M,
+          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :ip                   => lookup('bordeplage', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('bordeplage', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :enabled              => true,
+          :mounted              => false,
+          :mountable            => false,
+          :management           => true,
+          :device               => "bmc"
+        }]
+
+        chassis({
+          :serial       => lookup('bordeplage', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('bordeplage', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('bordeplage', node_uid, 'chassis', 'manufacturer')
+        })
 
-  gpu({
-    :gpu  => false
-     })
+        bios({
+          :version      => lookup('bordeplage', node_uid, 'bios', 'version'),
+          :vendor       => lookup('bordeplage', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('bordeplage', node_uid, 'bios', 'release_date')
+        })
+
+        gpu({
+          :gpu  => false
+        })
 
-    monitoring({
-      :wattmeter  => false
-    })
+        monitoring({
+          :wattmeter  => false
+        })
       end
     end
   end # cluster bordeplage
diff --git a/generators/input/sites/bordeaux/clusters/bordeplage.yaml b/generators/input/sites/bordeaux/clusters/bordeplage.yaml
index bda066f394d..411e88fe99e 100644
--- a/generators/input/sites/bordeaux/clusters/bordeplage.yaml
+++ b/generators/input/sites/bordeaux/clusters/bordeplage.yaml
@@ -4,342 +4,947 @@ bordeplage-1:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K4G7
       vendor: SEAGATE
-  chassis:
-      serial_number: 6PFGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:56
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.1
-    bmc:
-      mac: 00:14:22:0c:d9:ec
-      ip: 172.17.0.1
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:57
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:d9:ec
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.1
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:d9:ed
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.1
+    bmc:
+      mac: 00:14:22:0c:d9:ec
+      ip: 172.17.0.1
+  chassis:
+    serial_number: 6PFGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-2:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K2PG
       vendor: SEAGATE
-  chassis:
-      serial_number: 8PFGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:25
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.2
-    bmc:
-      mac: 00:14:22:0c:da:46
-      ip: 172.17.0.2
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:26
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:46
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.2
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:47
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.2
+    bmc:
+      mac: 00:14:22:0c:da:46
+      ip: 172.17.0.2
+  chassis:
+    serial_number: 8PFGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-3:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      size:
-      rev: D7013KT2JR3S
-      vendor: SEAGATE
-  chassis:
-      serial_number: 9KMGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:72
+      rate: 10000000000
+      ip6: fe80::205:ad00:2:b472
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.3
-    bmc:
-      mac: 00:14:22:0c:e1:66
-      ip: 172.17.0.3
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:73
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:66
+      ip6: fe80::214:22ff:fe0c:e166
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.3
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:67
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.3
+    bmc:
+      mac: 00:14:22:0c:e1:66
+      ip: 172.17.0.3
+  block_devices:
+    sda:
+      model: ST373207LC
+      device: sda
+      size: 73407820800
+      rev: D7013KT2JR3S
+      vendor: SEAGATE
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: 9KMGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  main_memory:
+    ram_size: 2109562880
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-4:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K3TZ
       vendor: SEAGATE
-  chassis:
-      serial_number: 7D5GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e9
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:61e9
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.4
-    bmc:
-      mac: 00:14:22:0c:d9:fa
-      ip: 172.17.0.4
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ea
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:d9:fa
+      ip6: fe80::214:22ff:fe0c:d9fa
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.4
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:d9:fb
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.4
+    bmc:
+      mac: 00:14:22:0c:d9:fa
+      ip: 172.17.0.4
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: 7D5GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-5:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2H8A6
       vendor: SEAGATE
-  chassis:
-      serial_number: JKMGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b5
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.5
-    bmc:
-      mac: 00:14:22:0c:e1:74
-      ip: 172.17.0.5
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b6
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:74
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.5
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:75
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.5
+    bmc:
+      mac: 00:14:22:0c:e1:74
+      ip: 172.17.0.5
+  chassis:
+    serial_number: JKMGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-6:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2H2FP
       vendor: SEAGATE
-  chassis:
-      serial_number: 5D5GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:39
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.6
-    bmc:
-      mac: 00:14:22:0c:da:6e
-      ip: 172.17.0.6
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:3a
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:6e
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.6
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:6f
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.6
+    bmc:
+      mac: 00:14:22:0c:da:6e
+      ip: 172.17.0.6
+  chassis:
+    serial_number: 5D5GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-7:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2HKSX
       vendor: SEAGATE
-  chassis:
-      serial_number: FKMGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4e
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.7
-    bmc:
-      mac: 00:14:22:0c:e1:44
-      ip: 172.17.0.7
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4f
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:44
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.7
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:45
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.7
+    bmc:
+      mac: 00:14:22:0c:e1:44
+      ip: 172.17.0.7
+  chassis:
+    serial_number: FKMGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-8:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev:
       vendor: SEAGATE
-  chassis:
-      serial_number:
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid:
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.8
-    bmc:
-      mac: 00:14:22:0c:da:40
-      ip: 172.17.0.8
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid:
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:40
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.8
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:41
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.8
+    bmc:
+      mac: 00:14:22:0c:da:40
+      ip: 172.17.0.8
+  chassis:
+    serial_number:
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-9:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      size:
-      rev:
-      vendor: SEAGATE
-  chassis:
-      serial_number:
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid:
+      rate: 10000000000
+      ip6: fe80::205:ad00:2:a580
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.9
-    bmc:
-      mac: 00:14:22:0c:da:50
-      ip: 172.17.0.9
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid:
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:50
+      ip6: fe80::214:22ff:fe0c:da50
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.9
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:51
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.9
+    bmc:
+      mac: 00:14:22:0c:da:50
+      ip: 172.17.0.9
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: ST373207LC
+      device: sda
+      size: 73407820800
+      rev:
+      vendor: SEAGATE
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number:
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-10:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K4G7
       vendor: SEAGATE
-  chassis:
-      serial_number: 6PFGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid:
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.10
-    bmc:
-      mac: 00:14:22:0c:da:76
-      ip: 172.17.0.10
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid:
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac:
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.10
       switch: sbordeplage-1
     eth1:
+      mounted: false
+      rate: 1000000000
       mac:
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.10
+    bmc:
+      mac: 00:14:22:0c:da:76
+      ip: 172.17.0.10
+  chassis:
+    serial_number: 6PFGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-11:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2FTKM
       vendor: SEAGATE
-  chassis:
-      serial_number: FC5GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2a
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.11
-    bmc:
-      mac: 00:14:22:0c:d9:bc
-      ip: 172.17.0.11
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2b
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:d9:bc
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.11
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:d9:bd
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.11
+    bmc:
+      mac: 00:14:22:0c:d9:bc
+      ip: 172.17.0.11
+  chassis:
+    serial_number: FC5GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-12:
   bios:
     version: A03
@@ -348,215 +953,600 @@ bordeplage-12:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2HKM6
       vendor: SEAGATE
-  chassis:
-      serial_number: 2D5GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3e
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a3e
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.12
-    bmc:
-      mac: 00:14:22:0c:da:74
-      ip: 172.17.0.12
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3f
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:74
+      ip6: fe80::214:22ff:fe0c:da74
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.12
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:75
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.12
+    bmc:
+      mac: 00:14:22:0c:da:74
+      ip: 172.17.0.12
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: 2D5GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  main_memory:
+    ram_size: 2110054400
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-13:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JD77
       vendor: SEAGATE
-  chassis:
-      serial_number: 9D5GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7b
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.13
-    bmc:
-      mac: 00:14:22:0c:da:82
-      ip: 172.17.0.13
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7c
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:82
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.13
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:83
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.13
+    bmc:
+      mac: 00:14:22:0c:da:82
+      ip: 172.17.0.13
+  chassis:
+    serial_number: 9D5GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-14:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      size:
-      rev: D7013KT2HSD8
-      vendor: SEAGATE
-  chassis:
-      serial_number: HC5GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:52
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a52
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.14
-    bmc:
-      mac: 00:14:22:0c:da:90
-      ip: 172.17.0.14
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:53
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:90
+      ip6: fe80::214:22ff:fe0c:da90
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.14
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:91
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.14
+    bmc:
+      mac: 00:14:22:0c:da:90
+      ip: 172.17.0.14
+  block_devices:
+    sda:
+      model: ST373207LC
+      device: sda
+      size: 73407820800
+      rev: D7013KT2HSD8
+      vendor: SEAGATE
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: HC5GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-15:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2A96S
       vendor: SEAGATE
-  chassis:
-      serial_number: 2PFGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:41
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:6241
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.15
-    bmc:
-      mac: 00:14:22:0c:da:c0
-      ip: 172.17.0.15
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:42
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:c0
+      ip6: fe80::214:22ff:fe0c:dac0
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.15
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:c1
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.15
+    bmc:
+      mac: 00:14:22:0c:da:c0
+      ip: 172.17.0.15
+  chassis:
+    serial_number: 2PFGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-16:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2HS2A
       vendor: SEAGATE
-  chassis:
-      serial_number: JPFGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:74
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.16
-    bmc:
-      mac: 00:14:22:0c:da:44
-      ip: 172.17.0.16
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:75
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:44
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.16
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:45
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.16
+    bmc:
+      mac: 00:14:22:0c:da:44
+      ip: 172.17.0.16
+  chassis:
+    serial_number: JPFGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-17:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K4E4
       vendor: SEAGATE
-  chassis:
-      serial_number: GPFGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c5
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.17
-    bmc:
-      mac: 00:14:22:0c:da:62
-      ip: 172.17.0.17
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c6
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:62
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.17
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:63
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.17
+    bmc:
+      mac: 00:14:22:0c:da:62
+      ip: 172.17.0.17
+  chassis:
+    serial_number: GPFGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-18:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT22VDZ
       vendor: SEAGATE
-  chassis:
-      serial_number: 335GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:09
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.18
-    bmc:
-      mac: 00:14:22:0c:da:a2
-      ip: 172.17.0.18
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:0a
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:a2
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.18
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:a3
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.18
+    bmc:
+      mac: 00:14:22:0c:da:a2
+      ip: 172.17.0.18
+  chassis:
+    serial_number: 335GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-19:
   bios:
     version: A03
@@ -565,29 +1555,84 @@ bordeplage-19:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2HBCP
       vendor: SEAGATE
-  chassis:
-      serial_number: B35GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b5
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:62b5
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.19
-    bmc:
-      mac: 00:14:22:0c:b4:00
-      ip: 172.17.0.19
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b6
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b4:00
+      ip6: fe80::214:22ff:fe0c:b400
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.19
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b4:01
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.19
+    bmc:
+      mac: 00:14:22:0c:b4:00
+      ip: 172.17.0.19
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: B35GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  main_memory:
+    ram_size: 2110054400
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-20:
   bios:
     version: A03
@@ -596,153 +1641,428 @@ bordeplage-20:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2N397
       vendor: SEAGATE
-  chassis:
-      serial_number: 331KV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b9
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:62b9
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.20
-    bmc:
-      mac: 00:14:22:0c:b3:1c
-      ip: 172.17.0.20
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:ba
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b3:1c
+      ip6: fe80::214:22ff:fe0c:b31c
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.20
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b3:1d
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.20
+    bmc:
+      mac: 00:14:22:0c:b3:1c
+      ip: 172.17.0.20
+  chassis:
+    serial_number: 331KV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2110054400
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-21:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JNMQ
       vendor: SEAGATE
-  chassis:
-      serial_number: DKMGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1a
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a1a
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.21
-    bmc:
-      mac: 00:14:22:0c:e1:48
-      ip: 172.17.0.21
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1b
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:48
+      ip6: fe80::214:22ff:fe0c:e148
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.21
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:49
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.21
+    bmc:
+      mac: 00:14:22:0c:e1:48
+      ip: 172.17.0.21
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: DKMGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  main_memory:
+    ram_size: 2110054400
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-22:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      size:
-      rev: D7013KT2JKP2
-      vendor: SEAGATE
-  chassis:
-      serial_number: JMZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:42
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a42
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.22
-    bmc:
-      mac: 00:14:22:0c:dd:02
-      ip: 172.17.0.22
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:43
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:dd:02
+      ip6: fe80::214:22ff:fe0c:dd02
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.22
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:dd:03
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.22
+    bmc:
+      mac: 00:14:22:0c:dd:02
+      ip: 172.17.0.22
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: ST373207LC
+      device: sda
+      size: 73407820800
+      rev: D7013KT2JKP2
+      vendor: SEAGATE
+  chassis:
+    serial_number: JMZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2110054400
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-23:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K4K3
       vendor: SEAGATE
-  chassis:
-      serial_number: HLZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:89
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.23
-    bmc:
-      mac: 00:14:22:0c:e1:4c
-      ip: 172.17.0.23
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:8a
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:4c
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.23
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:4d
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.23
+    bmc:
+      mac: 00:14:22:0c:e1:4c
+      ip: 172.17.0.23
+  chassis:
+    serial_number: HLZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-24:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      size:
-      rev: D7013KT2K3TT
-      vendor: SEAGATE
-  chassis:
-      serial_number: 1NZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ed
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:61ed
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.24
-    bmc:
-      mac: 00:14:22:0c:e0:e0
-      ip: 172.17.0.24
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ee
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e0:e0
+      ip6: fe80::214:22ff:fe0c:e0e0
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.24
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e0:e1
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.24
+    bmc:
+      mac: 00:14:22:0c:e0:e0
+      ip: 172.17.0.24
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: ST373207LC
+      device: sda
+      size: 73407820800
+      rev: D7013KT2K3TT
+      vendor: SEAGATE
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: 1NZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  main_memory:
+    ram_size: 2110054400
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-25:
   bios:
     version: A03
@@ -751,91 +2071,256 @@ bordeplage-25:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JKTM
       vendor: SEAGATE
-  chassis:
-      serial_number: 9LZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4b
+      rate: 10000000000
+      ip6: fe80::205:ad00:2:a44b
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.25
-    bmc:
-      mac: 00:14:22:0c:e1:76
-      ip: 172.17.0.25
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4c
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:76
+      ip6: fe80::214:22ff:fe0c:e176
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.25
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:77
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.25
+    bmc:
+      mac: 00:14:22:0c:e1:76
+      ip: 172.17.0.25
+  chassis:
+    serial_number: 9LZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  main_memory:
+    ram_size: 2110054400
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-26:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      size:
-      rev: D7013KT2JP96
-      vendor: SEAGATE
-  chassis:
-      serial_number: 3MZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:95
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:6295
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.26
-    bmc:
-      mac: 00:14:22:0c:e1:52
-      ip: 172.17.0.26
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:96
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:52
+      ip6: fe80::214:22ff:fe0c:e152
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.26
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:53
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.26
+    bmc:
+      mac: 00:14:22:0c:e1:52
+      ip: 172.17.0.26
+  block_devices:
+    sda:
+      model: ST373207LC
+      device: sda
+      size: 73407820800
+      rev: D7013KT2JP96
+      vendor: SEAGATE
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: 3MZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2110054400
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-27:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2H3BS
       vendor: SEAGATE
-  chassis:
-      serial_number: 6MZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:56
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.27
-    bmc:
-      mac: 00:14:22:0c:e1:7e
-      ip: 172.17.0.27
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:57
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:7e
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.27
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:7f
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.27
+    bmc:
+      mac: 00:14:22:0c:e1:7e
+      ip: 172.17.0.27
+  chassis:
+    serial_number: 6MZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-28:
   bios:
     version: A03
@@ -844,60 +2329,170 @@ bordeplage-28:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K428
       vendor: SEAGATE
-  chassis:
-      serial_number: BMZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:99
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:6299
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.28
-    bmc:
-      mac: 00:14:22:0c:e1:8c
-      ip: 172.17.0.28
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:9a
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:8c
+      ip6: fe80::214:22ff:fe0c:e18c
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.28
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:8d
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.28
+    bmc:
+      mac: 00:14:22:0c:e1:8c
+      ip: 172.17.0.28
+  chassis:
+    serial_number: BMZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2110054400
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-29:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JMGF
       vendor: SEAGATE
-  chassis:
-      serial_number: FMZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3a
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.29
-    bmc:
-      mac: 00:14:22:0c:e1:0a
-      ip: 172.17.0.29
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3b
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:0a
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.29
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:0b
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.29
+    bmc:
+      mac: 00:14:22:0c:e1:0a
+      ip: 172.17.0.29
+  chassis:
+    serial_number: FMZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-30:
   bios:
     version: A05
@@ -906,60 +2501,170 @@ bordeplage-30:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JQL0
       vendor: SEAGATE
-  chassis:
-      serial_number: GMZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fd
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:61fd
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.30
-    bmc:
-      mac: 00:14:22:0c:e1:92
-      ip: 172.17.0.30
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fe
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:92
+      ip6: fe80::214:22ff:fe0c:e192
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.30
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:93
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.30
+    bmc:
+      mac: 00:14:22:0c:e1:92
+      ip: 172.17.0.30
+  chassis:
+    serial_number: GMZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-31:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev:
       vendor: SEAGATE
-  chassis:
-      serial_number:
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid:
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.31
-    bmc:
-      mac: 00:14:22:0c:e1:ba
-      ip: 172.17.0.31
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid:
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:ba
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.31
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac:
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.31
+    bmc:
+      mac: 00:14:22:0c:e1:ba
+      ip: 172.17.0.31
+  chassis:
+    serial_number:
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-32:
   bios:
     version: A05
@@ -968,184 +2673,514 @@ bordeplage-32:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT1XVC4
       vendor: SEAGATE
-  chassis:
-      serial_number: 635GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:98
+      rate: 10000000000
+      ip6: fe80::205:ad00:2:a598
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.32
-    bmc:
-      mac: 00:14:22:0c:da:b6
-      ip: 172.17.0.32
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:99
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:b6
+      ip6: fe80::214:22ff:fe0c:dab6
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.32
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:b7
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.32
+    bmc:
+      mac: 00:14:22:0c:da:b6
+      ip: 172.17.0.32
+  chassis:
+    serial_number: 635GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-33:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2HG5S
       vendor: SEAGATE
-  chassis:
-      serial_number: 725GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.33
-    bmc:
-      mac: 00:14:22:0c:da:94
-      ip: 172.17.0.33
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:94
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.33
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:95
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.33
+    bmc:
+      mac: 00:14:22:0c:da:94
+      ip: 172.17.0.33
+  chassis:
+    serial_number: 725GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-34:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      size:
-      rev: D7013KT2182C
-      vendor: SEAGATE
-  chassis:
-      serial_number: F25GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:69
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:6269
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.34
-    bmc:
-      mac: 00:14:22:0c:da:12
-      ip: 172.17.0.34
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:6a
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:12
+      ip6: fe80::214:22ff:fe0c:da12
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.34
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:13
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.34
-bordeplage-35:
-  bios:
-    version: A05
-    release_date: (01/09/2006)
-    vendor: Dell Computer Corporation
+    bmc:
+      mac: 00:14:22:0c:da:12
+      ip: 172.17.0.34
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
-      rev: D7013KT2JBZM
+      device: sda
+      size: 73407820800
+      rev: D7013KT2182C
       vendor: SEAGATE
   chassis:
-      serial_number: BKMGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+    serial_number: F25GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  main_memory:
+    ram_size: 2109562880
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
+bordeplage-35:
+  bios:
+    version: A05
+    release_date: (01/09/2006)
+    vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:37
+      rate: 10000000000
+      ip6: fe80::205:ad00:2:b637
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.35
-    bmc:
-      mac: 00:14:22:0c:e1:36
-      ip: 172.17.0.35
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:38
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:36
+      ip6: fe80::214:22ff:fe0c:e136
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.35
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:37
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.35
+    bmc:
+      mac: 00:14:22:0c:e1:36
+      ip: 172.17.0.35
+  block_devices:
+    sda:
+      model: ST373207LC
+      device: sda
+      size: 73407820800
+      rev: D7013KT2JBZM
+      vendor: SEAGATE
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: BKMGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  main_memory:
+    ram_size: 2109562880
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-36:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JRDS
       vendor: SEAGATE
-  chassis:
-      serial_number: 6KMGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:22
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.36
-    bmc:
-      mac: 00:14:22:0c:e1:6a
-      ip: 172.17.0.36
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:23
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:6a
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.36
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:6b
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.36
+    bmc:
+      mac: 00:14:22:0c:e1:6a
+      ip: 172.17.0.36
+  chassis:
+    serial_number: 6KMGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-37:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JKTE
       vendor: SEAGATE
-  chassis:
-      serial_number: H25GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f1
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.37
-    bmc:
-      mac: 00:14:22:0c:b1:7a
-      ip: 172.17.0.37
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f2
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b1:7a
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.37
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b1:7b
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.37
+    bmc:
+      mac: 00:14:22:0c:b1:7a
+      ip: 172.17.0.37
+  chassis:
+    serial_number: H25GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-38:
   bios:
     version: A05
@@ -1154,60 +3189,170 @@ bordeplage-38:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K4EP
       vendor: SEAGATE
-  chassis:
-      serial_number: FWRJZ91
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e1
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:61e1
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.38
-    bmc:
-      mac: 00:13:72:69:a8:b6
-      ip: 172.17.0.38
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e2
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:13:72:69:a8:b6
+      ip6: fe80::213:72ff:fe69:a8b6
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.38
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:13:72:69:a8:b7
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.38
+    bmc:
+      mac: 00:13:72:69:a8:b6
+      ip: 172.17.0.38
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: FWRJZ91
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-39:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
-  block_devices:
-    sda:
-      model: ST373207LC
-      size:
-      rev: D7013KT2H2G3
-      vendor: SEAGATE
-  chassis:
-      serial_number: CD5GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:05
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:6205
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.39
-    bmc:
-      mac: 00:14:22:0c:da:7c
-      ip: 172.17.0.39
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:06
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:7c
+      ip6: fe80::214:22ff:fe0c:da7c
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.39
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:7d
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.39
+    bmc:
+      mac: 00:14:22:0c:da:7c
+      ip: 172.17.0.39
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: ST373207LC
+      device: sda
+      size: 73407820800
+      rev: D7013KT2H2G3
+      vendor: SEAGATE
+  chassis:
+    serial_number: CD5GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-40:
   bios:
     version: A05
@@ -1216,60 +3361,170 @@ bordeplage-40:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JNWF
       vendor: SEAGATE
-  chassis:
-      serial_number: 8XXGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:8f
+      rate: 10000000000
+      ip6: fe80::205:ad00:2:b38f
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.40
-    bmc:
-      mac: 00:13:72:69:86:4c
-      ip: 172.17.0.40
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:90
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:13:72:69:86:4c
+      ip6: fe80::213:72ff:fe69:864c
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.40
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:13:72:69:86:4d
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.40
+    bmc:
+      mac: 00:13:72:69:86:4c
+      ip: 172.17.0.40
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: 8XXGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-41:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT21F0M
       vendor: SEAGATE
-  chassis:
-      serial_number: D35GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5e
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a5e
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.41
-    bmc:
-      mac: 00:14:22:0c:b3:92
-      ip: 172.17.0.41
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5f
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b3:92
+      ip6: fe80::214:22ff:fe0c:b392
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.41
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b3:93
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.41
+    bmc:
+      mac: 00:14:22:0c:b3:92
+      ip: 172.17.0.41
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: D35GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  main_memory:
+    ram_size: 2110054400
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-42:
   bios:
     version: A05
@@ -1278,29 +3533,84 @@ bordeplage-42:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K38Q
       vendor: SEAGATE
-  chassis:
-      serial_number: 4KMGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:81
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:6281
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.42
-    bmc:
-      mac: 00:14:22:0c:e1:a4
-      ip: 172.17.0.42
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:82
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:a4
+      ip6: fe80::214:22ff:fe0c:e1a4
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.42
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:a5
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.42
+    bmc:
+      mac: 00:14:22:0c:e1:a4
+      ip: 172.17.0.42
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: 4KMGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  main_memory:
+    ram_size: 2109562880
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-43:
   bios:
     version: A05
@@ -1309,153 +3619,428 @@ bordeplage-43:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JNLS
       vendor: SEAGATE
-  chassis:
-      serial_number: GC5GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:75
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:6275
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.43
-    bmc:
-      mac: 00:14:22:0c:da:8c
-      ip: 172.17.0.43
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:76
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:8c
+      ip6: fe80::214:22ff:fe0c:da8c
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.43
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:8d
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.43
+    bmc:
+      mac: 00:14:22:0c:da:8c
+      ip: 172.17.0.43
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: GC5GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  main_memory:
+    ram_size: 2109562880
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-44:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2EA4V
       vendor: SEAGATE
-  chassis:
-      serial_number: 835GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:92
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.44
-    bmc:
-      mac: 00:14:22:0c:b1:1c
-      ip: 172.17.0.44
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:93
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b1:1c
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.44
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:b1:1d
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.44
+    bmc:
+      mac: 00:14:22:0c:b1:1c
+      ip: 172.17.0.44
+  chassis:
+    serial_number: 835GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-45:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K25Q
       vendor: SEAGATE
-  chassis:
-      serial_number: 3D5GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:89
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.45
-    bmc:
-      mac: 00:14:22:0c:da:88
-      ip: 172.17.0.45
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:8a
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:88
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.45
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:89
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.45
+    bmc:
+      mac: 00:14:22:0c:da:88
+      ip: 172.17.0.45
+  chassis:
+    serial_number: 3D5GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-46:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2H8ET
       vendor: SEAGATE
-  chassis:
-      serial_number: 2LMGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:62
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.46
-    bmc:
-      mac: 00:14:22:0c:e1:7c
-      ip: 172.17.0.46
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:63
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:7c
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.46
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:e1:7d
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.46
+    bmc:
+      mac: 00:14:22:0c:e1:7c
+      ip: 172.17.0.46
+  chassis:
+    serial_number: 2LMGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-47:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2K3MZ
       vendor: SEAGATE
-  chassis:
-      serial_number: 6LZGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2c
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.47
-    bmc:
-      mac: 00:14:22:0c:de:34
-      ip: 172.17.0.47
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2d
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:de:34
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.47
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:de:35
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.47
+    bmc:
+      mac: 00:14:22:0c:de:34
+      ip: 172.17.0.47
+  chassis:
+    serial_number: 6LZGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-48:
   bios:
     version: A05
@@ -1464,119 +4049,339 @@ bordeplage-48:
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2H2ZB
       vendor: SEAGATE
-  chassis:
-      serial_number: 4LMGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:59
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:6259
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.48
-    bmc:
-      mac: 00:14:22:0c:db:ca
-      ip: 172.17.0.48
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:5a
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:db:ca
+      ip6: fe80::214:22ff:fe0c:dbca
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.48
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:db:cb
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.48
+    bmc:
+      mac: 00:14:22:0c:db:ca
+      ip: 172.17.0.48
+  supported_job_types:
+    virtual: false
+  chassis:
+    serial_number: 4LMGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-49:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev:
       vendor: SEAGATE
-  chassis:
-      serial_number:
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid:
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.49
-    bmc:
-      mac:
-      ip: 172.17.0.49
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid:
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:30
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.49
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac:
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.49
+    bmc:
+      mac:
+      ip: 172.17.0.49
+  chassis:
+    serial_number:
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-50:
   bios:
     version: A03
     release_date: (05/12/2005)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2DQFZ
       vendor: SEAGATE
-  chassis:
-      serial_number: 135GV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:32
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.50
-    bmc:
-      mac: 00:14:22:0c:da:a6
-      ip: 172.17.0.50
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:33
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:a6
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.50
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:a7
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.50
+    bmc:
+      mac: 00:14:22:0c:da:a6
+      ip: 172.17.0.50
+  chassis:
+    serial_number: 135GV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
 bordeplage-51:
   bios:
     version: A05
     release_date: (01/09/2006)
     vendor: Dell Computer Corporation
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: ST373207LC
-      size:
+      device: sda
+      size: 73407820800
       rev: D7013KT2JLQ5
       vendor: SEAGATE
-  chassis:
-      serial_number: FPFGV1J
-      manufacturer: Dell Computer Corporation
-      product_name: PowerEdge 1855
   network_interfaces:
     ib0:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:03
+      rate: 10000000000
+      ip6: fe80::205:ad00:1:5a76
+      management: false
+      enabled: true
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
       ip: 172.18.0.51
-    bmc:
-      mac: 00:14:22:0c:da:7e
-      ip: 172.17.0.51
+      driver: mlx4_core
+      mountable: true
     ib1:
+      mounted: false
       guid: 20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:04
+      rate: 10000000000
+      management: false
+      enabled: false
+      interface: InfiniBand
+      version: MT25208 (MT23108 compat mode)
+      driver: mlx4_core
+      mountable: false
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:7e
+      ip6: fe80::214:22ff:fe0c:da94
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.0.51
       switch: sbordeplage-2
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:22:0c:da:7f
+      management: false
+      enabled: false
+      interface: Ethernet
+      driver: e1000
+      mountable: true
       ip: 172.16.3.51
+    bmc:
+      mac: 00:14:22:0c:da:7e
+      ip: 172.17.0.51
+  chassis:
+    serial_number: FPFGV1J
+    manufacturer: Dell Computer Corporation
+    product_name: PowerEdge 1855
+  supported_job_types:
+    virtual: false
+  main_memory:
+    ram_size: 2109562880
+  processor:
+    model: Intel Xeon
+    cache_l1d: 16384
+    clock_speed: 3000000000
+    other_description: Intel(R) Xeon(TM) CPU 3.00GHz
+    version: 3.00GHz
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 0
+  architecture:
+    platform_type: x86_64
+    smt_size: 2
-- 
GitLab