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

---
 .../clusters/bordereau/nodes/bordereau-1.json |   30 +-
 .../bordereau/nodes/bordereau-10.json         |   30 +-
 .../bordereau/nodes/bordereau-11.json         |   30 +-
 .../bordereau/nodes/bordereau-12.json         |   30 +-
 .../bordereau/nodes/bordereau-13.json         |   30 +-
 .../bordereau/nodes/bordereau-14.json         |   30 +-
 .../bordereau/nodes/bordereau-15.json         |   30 +-
 .../bordereau/nodes/bordereau-16.json         |   30 +-
 .../bordereau/nodes/bordereau-17.json         |   30 +-
 .../bordereau/nodes/bordereau-18.json         |   30 +-
 .../bordereau/nodes/bordereau-19.json         |   30 +-
 .../clusters/bordereau/nodes/bordereau-2.json |   30 +-
 .../bordereau/nodes/bordereau-20.json         |   30 +-
 .../bordereau/nodes/bordereau-21.json         |   30 +-
 .../bordereau/nodes/bordereau-22.json         |   30 +-
 .../bordereau/nodes/bordereau-23.json         |   30 +-
 .../bordereau/nodes/bordereau-24.json         |   30 +-
 .../bordereau/nodes/bordereau-25.json         |   30 +-
 .../bordereau/nodes/bordereau-26.json         |   30 +-
 .../bordereau/nodes/bordereau-27.json         |   30 +-
 .../bordereau/nodes/bordereau-28.json         |   30 +-
 .../bordereau/nodes/bordereau-29.json         |   30 +-
 .../clusters/bordereau/nodes/bordereau-3.json |   30 +-
 .../bordereau/nodes/bordereau-30.json         |   30 +-
 .../bordereau/nodes/bordereau-31.json         |   30 +-
 .../bordereau/nodes/bordereau-32.json         |   30 +-
 .../bordereau/nodes/bordereau-33.json         |   30 +-
 .../bordereau/nodes/bordereau-34.json         |   30 +-
 .../bordereau/nodes/bordereau-35.json         |   30 +-
 .../bordereau/nodes/bordereau-36.json         |   30 +-
 .../bordereau/nodes/bordereau-37.json         |   30 +-
 .../bordereau/nodes/bordereau-38.json         |   30 +-
 .../bordereau/nodes/bordereau-39.json         |   30 +-
 .../clusters/bordereau/nodes/bordereau-4.json |   32 +-
 .../bordereau/nodes/bordereau-40.json         |   30 +-
 .../bordereau/nodes/bordereau-41.json         |   30 +-
 .../bordereau/nodes/bordereau-42.json         |   30 +-
 .../bordereau/nodes/bordereau-43.json         |   30 +-
 .../bordereau/nodes/bordereau-44.json         |   30 +-
 .../bordereau/nodes/bordereau-45.json         |   30 +-
 .../bordereau/nodes/bordereau-46.json         |   30 +-
 .../bordereau/nodes/bordereau-47.json         |   30 +-
 .../bordereau/nodes/bordereau-48.json         |   30 +-
 .../bordereau/nodes/bordereau-49.json         |   30 +-
 .../clusters/bordereau/nodes/bordereau-5.json |   30 +-
 .../bordereau/nodes/bordereau-50.json         |   30 +-
 .../bordereau/nodes/bordereau-51.json         |   30 +-
 .../bordereau/nodes/bordereau-52.json         |   30 +-
 .../bordereau/nodes/bordereau-53.json         |   30 +-
 .../bordereau/nodes/bordereau-54.json         |   30 +-
 .../bordereau/nodes/bordereau-55.json         |   30 +-
 .../bordereau/nodes/bordereau-56.json         |   30 +-
 .../bordereau/nodes/bordereau-57.json         |   30 +-
 .../bordereau/nodes/bordereau-58.json         |   30 +-
 .../bordereau/nodes/bordereau-59.json         |   30 +-
 .../clusters/bordereau/nodes/bordereau-6.json |   30 +-
 .../bordereau/nodes/bordereau-60.json         |   30 +-
 .../bordereau/nodes/bordereau-61.json         |   30 +-
 .../bordereau/nodes/bordereau-62.json         |   30 +-
 .../bordereau/nodes/bordereau-63.json         |   30 +-
 .../bordereau/nodes/bordereau-64.json         |   30 +-
 .../bordereau/nodes/bordereau-65.json         |   30 +-
 .../bordereau/nodes/bordereau-66.json         |   30 +-
 .../bordereau/nodes/bordereau-67.json         |   30 +-
 .../bordereau/nodes/bordereau-68.json         |   30 +-
 .../bordereau/nodes/bordereau-69.json         |   30 +-
 .../clusters/bordereau/nodes/bordereau-7.json |   30 +-
 .../bordereau/nodes/bordereau-70.json         |   30 +-
 .../bordereau/nodes/bordereau-71.json         |   30 +-
 .../bordereau/nodes/bordereau-72.json         |   30 +-
 .../bordereau/nodes/bordereau-73.json         |   30 +-
 .../bordereau/nodes/bordereau-74.json         |   30 +-
 .../bordereau/nodes/bordereau-75.json         |   30 +-
 .../bordereau/nodes/bordereau-76.json         |   30 +-
 .../bordereau/nodes/bordereau-77.json         |   30 +-
 .../bordereau/nodes/bordereau-78.json         |   30 +-
 .../bordereau/nodes/bordereau-79.json         |   30 +-
 .../clusters/bordereau/nodes/bordereau-8.json |   30 +-
 .../bordereau/nodes/bordereau-80.json         |   30 +-
 .../bordereau/nodes/bordereau-81.json         |   30 +-
 .../bordereau/nodes/bordereau-82.json         |   30 +-
 .../bordereau/nodes/bordereau-83.json         |   30 +-
 .../bordereau/nodes/bordereau-84.json         |   30 +-
 .../bordereau/nodes/bordereau-85.json         |   30 +-
 .../bordereau/nodes/bordereau-86.json         |   30 +-
 .../bordereau/nodes/bordereau-87.json         |   30 +-
 .../bordereau/nodes/bordereau-88.json         |   30 +-
 .../bordereau/nodes/bordereau-89.json         |   30 +-
 .../clusters/bordereau/nodes/bordereau-9.json |   30 +-
 .../bordereau/nodes/bordereau-90.json         |   30 +-
 .../bordereau/nodes/bordereau-91.json         |   30 +-
 .../bordereau/nodes/bordereau-92.json         |   30 +-
 .../bordereau/nodes/bordereau-93.json         |   30 +-
 .../sites/bordeaux/clusters/bordereau.rb      |  209 +-
 .../sites/bordeaux/clusters/bordereau.yaml    | 5785 ++++++++++++++---
 95 files changed, 6589 insertions(+), 2197 deletions(-)

diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
index 7b97874d10c..962ed903928 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.1",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": null,
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-1.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.1",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-1"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
index aad6bcc539f..76cd8ea6ba4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWH"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.10",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6b:ca",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-10.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.10",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6b:cb",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-10"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
index 445dceb3199..353eeee190f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXW"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.11",
+      "ip6": "fe80::214:5eff:fe55:5c81",
       "mac": "00:14:5e:55:5c:81",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-11.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.11",
+      "ip6": "fe80::214:5eff:fe55:5c81",
       "mac": "00:14:5e:55:5c:82",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-11"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
index 36b09d96c9f..58968cf2e86 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
@@ -10,6 +10,7 @@
     "version": "1.30-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZR"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.12",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:58:f7",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-12.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.12",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:58:f8",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-12"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
index 585308c76e7..7f410217b80 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXK"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.13",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:63",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-13.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.13",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:64",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-13"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
index f17eabb3976..e5bd3279271 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZF"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.14",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:5d",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-14.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.14",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:5e",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-14"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
index 78750bf0185..3283a9f9867 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWB"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.15",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6a:f2",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-15.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.15",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6a:f3",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-15"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
index 399f71c8ee5..124f1645182 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXD"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.16",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:ec",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-16.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.16",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:ed",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-16"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
index fa2f693bc1b..a3328ba5042 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYW"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.17",
+      "ip6": "fe80::214:5eff:fe55:5ea9",
       "mac": "00:14:5e:55:5e:a9",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-17.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.17",
+      "ip6": "fe80::214:5eff:fe55:5ea9",
       "mac": "00:14:5e:55:5e:aa",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-17"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
index 2e71c02944d..592d5424f0d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYN"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.18",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:64:0d",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-18.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.18",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:64:0e",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-18"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
index 568c80822c8..dd279a7b6ec 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXN"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.19",
+      "ip6": "fe80::214:5eff:fe55:6867",
       "mac": "00:14:5e:55:68:67",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-19.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.19",
+      "ip6": "fe80::214:5eff:fe55:6867",
       "mac": "00:14:5e:55:68:68",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-19"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
index e7134ddcc4c..5b07763211b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.2",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:2c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-2.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.2",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:2d",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-2"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
index 72289136a0f..5a139da06e4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXB"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.20",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:62:b1",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-20.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.20",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:62:b2",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-20"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
index 7b8e5b33391..87b10556704 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXV"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.21",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5a:98",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-21.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.21",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5a:99",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-21"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
index da00bccb627..44b545ecab5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWY"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.22",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:84",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-22.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.22",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:85",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-22"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
index 1a4d6193fc8..45b32874c49 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWM"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.23",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:62:96",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-23.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.23",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:62:97",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-23"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
index cf4c3b51db2..dc78d3f069a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDTAA"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.24",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:da",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-24.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.24",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:db",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-24"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
index a25c372a9b2..f21e346d3e0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYT"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.25",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:b9",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-25.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.25",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:ba",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-25"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
index b2b3598617a..64cd661cc54 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRVW"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.26",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6d:2f",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-26.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.26",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6d:30",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-26"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
index c70abe2cc82..a84715afbb7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDTAG"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.27",
+      "ip6": "fe80::214:5eff:fe55:5c69",
       "mac": "00:14:5e:55:5c:69",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-27.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.27",
+      "ip6": "fe80::214:5eff:fe55:5c69",
       "mac": "00:14:5e:55:5c:6a",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2592000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-27"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
index 764600f58fb..1339128d465 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYZ"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.28",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:88",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-28.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.28",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:89",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-28"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
index 17ad0765cbc..bc66c30e5db 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDTAH"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.29",
+      "ip6": "fe80::214:5eff:fe55:5cc3",
       "mac": "00:14:5e:55:5c:c3",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-29.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.29",
+      "ip6": "fe80::214:5eff:fe55:5cc3",
       "mac": "00:14:5e:55:5c:c4",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-29"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
index 4129bcba929..d2a99190db4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZH"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.3",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:42",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-3.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.3",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:43",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-3"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
index 4d7e675cb8f..91f582165be 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.30",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:d6",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-30.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.30",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:d7",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-30"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
index 0eaf83aaf5c..928f919cc26 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWL"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.31",
+      "ip6": "fe80::214:5eff:fe55:59b7",
       "mac": "00:14:5e:55:59:b7",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-31.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.31",
+      "ip6": "fe80::214:5eff:fe55:59b7",
       "mac": "00:14:5e:55:59:b8",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2592000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-31"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
index 17ee9871401..e942b48632c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXA"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.32",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:bd",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-32.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.32",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:be",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-32"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
index d69a6ced207..76cf120d3cf 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYH"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.33",
+      "ip6": "fe80::214:5eff:fe55:5eb2",
       "mac": "00:14:5e:55:5e:b2",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-33.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.33",
+      "ip6": "fe80::214:5eff:fe55:5eb2",
       "mac": "00:14:5e:55:5e:b3",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2592000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-33"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
index 88bb6d64f39..1c69393c586 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.34",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:02",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-34.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.34",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:03",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-34"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
index 8f803917d68..d72b4cd6545 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZZ"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.35",
+      "ip6": "fe80::214:5eff:fe55:5e22",
       "mac": "00:14:5e:55:5e:22",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-35.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.35",
+      "ip6": "fe80::214:5eff:fe55:5e22",
       "mac": "00:14:5e:55:5e:23",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-35"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
index 1eb92687711..28820d7c89e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDTAC"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.36",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:69:f0",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-36.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.36",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:69:f1",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-36"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
index 35153fbc4b9..fdf8ab11a5f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZL"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.37",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5f:d2",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-37.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.37",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5f:d3",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-37"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
index 21d843b2e07..0d54fb1d6f0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZP"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.38",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5f:0f",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-38.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.38",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5f:10",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-38"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
index 6ac08c37402..a72dcad24bb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYG"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.39",
+      "ip6": "fe80::214:5eff:fe55:632f",
       "mac": "00:14:5e:55:63:2f",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-39.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.39",
+      "ip6": "fe80::214:5eff:fe55:632f",
       "mac": "00:14:5e:55:63:30",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-39"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
index 96940b164fa..3fd2fa1d7fd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.4",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:68:c7",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-4.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.4",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:68:c8",
       "management": false,
       "mountable": true,
@@ -62,7 +66,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.4.4",
-      "mac": "00:14:5e:55:68:c9",
+      "mac": "00:14:5E:55:68:C9",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-4"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
index f6bc0a52073..7e9cde2df6b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.40",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": null,
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-40.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.40",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-40"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
index 573d3175f37..4ad0c15d6de 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.41",
+      "ip6": "fe80::214:5eff:fe55:5900",
       "mac": "00:14:5e:55:59:00",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-41.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.41",
+      "ip6": "fe80::214:5eff:fe55:5900",
       "mac": "00:14:5e:55:59:01",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-41"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
index 507961e7112..f3f5a0e3538 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYF"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.42",
+      "ip6": "fe80::214:5eff:fe55:6095",
       "mac": "00:14:5e:55:60:95",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-42.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.42",
+      "ip6": "fe80::214:5eff:fe55:6095",
       "mac": "00:14:5e:55:60:96",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-42"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
index 87809a114d3..bcf5daae349 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWD"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.43",
+      "ip6": "fe80::214:5eff:fe55:6c00",
       "mac": "00:14:5e:55:6c:00",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-43.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.43",
+      "ip6": "fe80::214:5eff:fe55:6c00",
       "mac": "00:14:5e:55:6c:01",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-43"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
index 8d31b5b0c83..9da35519208 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXL"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.44",
+      "ip6": "fe80::214:5eff:fe55:59d2",
       "mac": "00:14:5e:55:59:d2",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-44.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.44",
+      "ip6": "fe80::214:5eff:fe55:59d2",
       "mac": "00:14:5e:55:59:d3",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-44"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
index f3cc392bfc9..64c693e88c4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWZ"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.45",
+      "ip6": "fe80::214:5eff:fe55:5cbd",
       "mac": "00:14:5e:55:5c:bd",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-45.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.45",
+      "ip6": "fe80::214:5eff:fe55:5cbd",
       "mac": "00:14:5e:55:5c:be",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-45"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
index 83c227d3edb..1b1fd6544d3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYY"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.46",
+      "ip6": "fe80::214:5eff:fe55:5c60",
       "mac": "00:14:5e:55:5c:60",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-46.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.46",
+      "ip6": "fe80::214:5eff:fe55:5c60",
       "mac": "00:14:5e:55:5c:61",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-46"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
index b953fea8b85..6aabc382ce4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWA"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.47",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6c:a8",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-47.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.47",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6c:a9",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-47"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
index 87f331c83f8..24fbd3883d9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZV"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.48",
+      "ip6": "fe80::214:5eff:fe55:58fd",
       "mac": "00:14:5e:55:58:fd",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-48.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.48",
+      "ip6": "fe80::214:5eff:fe55:58fd",
       "mac": "00:14:5e:55:58:fe",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-48"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
index 46150bee33f..209b56f6e9f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZA"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.49",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:62:e7",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-49.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.49",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:62:e8",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-49"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
index 79b0548bb83..34e7103375d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXT"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.5",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:61:94",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-5.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.5",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:61:95",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-5"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
index 36cca9f6893..39711bb309a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYR"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.50",
+      "ip6": "fe80::214:5eff:fe55:5eac",
       "mac": "00:14:5e:55:5e:ac",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-50.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.50",
+      "ip6": "fe80::214:5eff:fe55:5eac",
       "mac": "00:14:5e:55:5e:ad",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-50"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
index c80759eb794..fac0b698dcc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYA"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.51",
+      "ip6": "fe80::214:5eff:fe55:5cd5",
       "mac": "00:14:5e:55:5c:d5",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-51.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.51",
+      "ip6": "fe80::214:5eff:fe55:5cd5",
       "mac": "00:14:5e:55:5c:d6",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-51"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
index 3ec9c7f8461..d3d93416f5a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYP"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.52",
+      "ip6": "fe80::214:5eff:fe55:5db3",
       "mac": "00:14:5e:55:5d:b3",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-52.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.52",
+      "ip6": "fe80::214:5eff:fe55:5db3",
       "mac": "00:14:5e:55:5d:b4",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2592000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-52"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
index 6465282e745..12df04a268b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRVV"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.53",
+      "ip6": "fe80::214:5eff:fe55:6c1b",
       "mac": "00:14:5e:55:6c:1b",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-53.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.53",
+      "ip6": "fe80::214:5eff:fe55:6c1b",
       "mac": "00:14:5e:55:6c:1c",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-53"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
index ceeb0e6764d..c0d8037f7f0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZX"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.54",
+      "ip6": "fe80::214:5eff:fe55:63b6",
       "mac": "00:14:5e:55:63:b6",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-54.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.54",
+      "ip6": "fe80::214:5eff:fe55:63b6",
       "mac": "00:14:5e:55:63:b7",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-54"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
index 17ebf463421..70a683077d2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZY"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.55",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:ed",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-55.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.55",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:ee",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-55"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
index 0bd831c557d..b4b426876a3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZT"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.56",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:60:cb",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-56.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.56",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:60:cc",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-56"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
index 971f07a3391..80aca6070f5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.57",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": null,
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-57.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.57",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": null,
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-57"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
index 8716ae5efce..75de6f1005b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
@@ -10,6 +10,7 @@
     "version": "1.35-[C0E135AUS-1.35]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZC"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.58",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:a6",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-58.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.58",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:a7",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-58"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
index 68844a78e6b..3b7b7efee39 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZD"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.59",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:d8",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-59.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.59",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:d9",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-59"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
index 943348edf06..957b9540f46 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZM"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.6",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:58:ee",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-6.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.6",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:58:ef",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-6"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
index 1d8c35854dd..084ee4981f0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZN"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.60",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5b:5b",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-60.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.60",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5b:5c",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-60"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
index 0989e533e63..7a407e86f5f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDTAL"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.61",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:58:49",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-61.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.61",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:58:4a",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-61"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
index ccec5955f69..9dac3cf384d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWT"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.62",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:63:26",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-62.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.62",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:63:27",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-62"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
index 63682a37020..766ea3e54e6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZB"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.63",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:6c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-63.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.63",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:6d",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-63"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
index 0c1b1ca04d7..b44b66d850f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDTAD"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.64",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:cf",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-64.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.64",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:d0",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-64"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
index 4af8029afbf..01e648b0afc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
@@ -10,6 +10,7 @@
     "version": "1.35-[C0E135AUS-1.35]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWX"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.65",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:f9",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-65.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.65",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:fa",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-65"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
index 7769c606d62..e24dd466a71 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYX"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.66",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:19",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-66.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.66",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:1a",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-66"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
index b1cb97bf3af..d53b51b5bfe 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZW"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.67",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:1b",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-67.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.67",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:1c",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-67"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
index f2ec023e495..60c182ada36 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXZ"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.68",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:57:89",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-68.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.68",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:57:8a",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-68"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
index 74113aacaf6..08b9e22107a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWW"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.69",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:63:ce",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-69.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.69",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:63:cf",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-69"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
index 2d15b46496f..824e58a1a26 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRVP"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.7",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:7c",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-7.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.7",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:7d",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-7"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
index b2ac0efe4fe..ffcb8e26def 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWC"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.70",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6a:fe",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-70.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.70",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6a:ff",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-70"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
index c228f5c2efe..4b5596ee3a3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRZK"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.71",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:44",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-71.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.71",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:45",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-71"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
index 6c9f304adfe..27660f3bbe5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXM"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.72",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5a:3e",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-72.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.72",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5a:3f",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-72"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
index ee5c9620a35..d1d4c29ada7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDTAK"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.73",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6a:1a",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-73.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.73",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6a:1b",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-73"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
index 508465115d9..4002f0e6674 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYM"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.74",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:64:04",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-74.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.74",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:64:05",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-74"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
index b081c3cb050..5dbb0ac69d4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWV"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.75",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:af",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-75.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.75",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:b0",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-75"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
index 7ed4815b9aa..ffb8dd466dc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDTAF"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.76",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:08",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-76.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.76",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5d:09",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-76"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
index 618985964cf..9b61c1bccae 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWN"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.77",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:63:5f",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-77.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.77",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:63:60",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-77"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
index b401eeaca2d..4a5d99b22cc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXP"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.78",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:63:fb",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-78.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.78",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:63:fc",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-78"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
index 187c3301800..1ea7901b9f6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": null
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.79",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:62:ed",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-79.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.79",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:62:ee",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-79"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
index 8a934c209f1..f83f70082b9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRVT"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.8",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:60:f8",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-8.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.8",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:60:f9",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-8"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
index 34b605c41c0..09738e4a477 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYL"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.80",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:ae",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-80.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.80",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:af",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-80"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
index 7ade9e876fc..63fa7abf1d7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYV"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.81",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:58:a6",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-81.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.81",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:58:a7",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-81"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
index 058ce76bb52..f5a72ec67f5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRVZ"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.82",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:68:85",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-82.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.82",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:68:86",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-82"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
index d2394f38115..58e4772bc2e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRVY"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.83",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6d:23",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-83.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.83",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6d:24",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-83"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
index a881f475ea6..c34e48bea8f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWR"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.84",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:48",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-84.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.84",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:49",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-84"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
index 6680291d35d..910a863cac0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYC"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.85",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:41",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-85.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.85",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:59:42",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-85"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
index acb111448cc..45d1792e6a2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYK"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.86",
+      "ip6": "fe80::214:5eff:fe55:68ca",
       "mac": "00:14:5e:55:68:ca",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-86.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.86",
+      "ip6": "fe80::214:5eff:fe55:68ca",
       "mac": "00:14:5e:55:68:cb",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-86"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
index 2e3ec733c80..5003b26923f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXC"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.87",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:28",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-87.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.87",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5e:29",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-87"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
index 4093399d47f..3e4378c6900 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXF"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.88",
+      "ip6": "fe80::214:5eff:fe55:5d6b",
       "mac": "00:14:5e:55:5d:6b",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-88.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.88",
+      "ip6": "fe80::214:5eff:fe55:5d6b",
       "mac": "00:14:5e:55:5d:6c",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-88"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
index 638e5153ac6..0350dc831a3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWF"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.89",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6d:05",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-89.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.89",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6d:06",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-89"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
index 84c85d82b30..f43cdd872f5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRXX"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.9",
+      "ip6": "fe80::214:5eff:fe55:5ee8",
       "mac": "00:14:5e:55:5e:e8",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-9.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.9",
+      "ip6": "fe80::214:5eff:fe55:5ee8",
       "mac": "00:14:5e:55:5e:e9",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-9"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
index 514408dda8e..77f199b3cb7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
@@ -10,6 +10,7 @@
     "version": "1.40-[C0E140AUS-1.40]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWG"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.90",
+      "ip6": "fe80::214:5eff:fe55:6d29",
       "mac": "00:14:5e:55:6d:29",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-90.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.90",
+      "ip6": "fe80::214:5eff:fe55:6d29",
       "mac": "00:14:5e:55:6d:2a",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-90"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
index 051951634ce..9fa751a912d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDTAB"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.91",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:c6",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-91.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.91",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:5c:c7",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-91"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
index 6e968f79e01..2447873235a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRYD"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.92",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6a:4a",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-92.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.92",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6a:4b",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-92"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
index 5a938d8e5d4..c3007240759 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
@@ -10,6 +10,7 @@
     "version": "1.32-[C0E132AUS-1.32]-"
   },
   "chassis": {
+    "manufacturer": "IBM",
     "name": "IBM System x3455-[7986Z1J]-",
     "serial": "KDDDRWP"
   },
@@ -17,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 4294967296,
+    "ram_size": 4157911040,
     "virtual_size": null
   },
   "monitoring": {
@@ -31,10 +32,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.93",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6d:14",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "bordereau-93.bordeaux.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-bordeaux",
@@ -43,11 +45,13 @@
       "version": "BCM5704"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.4.93",
+      "ip6": "fe80::214:5eff:fe55:6ca8",
       "mac": "00:14:5e:55:6d:15",
       "management": false,
       "mountable": true,
@@ -71,10 +75,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": 4433200000,
@@ -85,27 +89,29 @@
     "cache_l1d": 65536,
     "cache_l1i": 65536,
     "cache_l2": 1048576,
-    "clock_speed": 2600000000.0,
+    "cache_l3": 0,
+    "clock_speed": 2593000000,
     "instruction_set": "x86-64",
     "model": "AMD Opteron",
-    "other_description": "",
+    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
     "vendor": "AMD",
-    "version": "2218"
+    "version": 2218
   },
   "storage_devices": [
     {
       "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "model": "HDS721680PLA380",
-      "rev": "P21OAB1A",
-      "size": 74505805969.2383
+      "model": "Hitachi HDS72168",
+      "rev": "P21O",
+      "size": 80032038912,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": false
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "bordereau-93"
diff --git a/generators/input/sites/bordeaux/clusters/bordereau.rb b/generators/input/sites/bordeaux/clusters/bordereau.rb
index 8a1553afc5f..1258d759c77 100644
--- a/generators/input/sites/bordeaux/clusters/bordereau.rb
+++ b/generators/input/sites/bordeaux/clusters/bordereau.rb
@@ -5,109 +5,130 @@ site :bordeaux do |site_uid|
     created_at Time.parse("2007-10-01 12:00 GMT").httpdate
     misc "IPMI 2.0"
     kavlan false
+
     93.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
+
         performance({
-          :core_flops => 4433200000,
-          :node_flops => 16330000000
-        }) 
-       architecture({
-                       :smp_size 		=> 2,
-                       :smt_size 		=> 4,
-          :platform_type	=> "x86_64"
-                     })
+        :core_flops => 4433200000,
+        :node_flops => 16330000000
+      })
+
+        supported_job_types({
+          :deploy       => true,
+          :besteffort   => true,
+          :virtual      => lookup('bordereau', node_uid, 'supported_job_types', 'virtual')
+        })
+
+        architecture({
+          :smp_size       => lookup('bordereau', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('bordereau', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('bordereau', node_uid, 'architecture', 'platform_type')
+        })
+
         processor({
-                    :vendor 		=> "AMD",
-                    :model 		=> "AMD Opteron",
-                    :version 		=> "2218",
-                    :clock_speed 		=> 2.6.G,
-                    :instruction_set 	=> "x86-64",
-                    :other_description 	=> "",
-                    :cache_l1 		=> nil,
-                    :cache_l1i 		=> 64.KiB,
-                    :cache_l1d 		=> 64.KiB,
-                    :cache_l2 		=> 1.MiB
-                  })
+          :vendor             => lookup('bordereau', node_uid, 'processor', 'vendor'),
+          :model              => lookup('bordereau', node_uid, 'processor', 'model'),
+          :version            => lookup('bordereau', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('bordereau', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('bordereau', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('bordereau', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('bordereau', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('bordereau', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('bordereau', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('bordereau', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('bordereau', node_uid, 'processor', 'cache_l3')
+        })
+
         main_memory({
-                      :ram_size 		=> 4.GiB,
-                      :virtual_size 	=> nil
-                    })
+          :ram_size     => lookup('bordereau', node_uid, 'main_memory', 'ram_size'),
+          :virtual_size => nil
+        })
+
         operating_system({
-                           :name 		=> "Debian",
-                           :release 		=> "Squeeze",
-                           :version 		=> "6.0",
-                           :Kernel 		=> "2.6.32"
-                         })
+          :name     => lookup('bordereau', node_uid, 'operating_system', 'name'),
+          :release  => "Squeeze",
+          :version  => lookup('bordereau', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('bordereau', node_uid, 'operating_system', 'kernel')
+        })
         storage_devices [{
-                           :interface 		=> 'SATA',
-                           :size 		=> 80.GB,
-                           :device		=> "sda",
-                           :driver 		=> "sata_svw",
-                           :model 		=> lookup('bordereau', node_uid, 'block_devices', 'sda', 'model'),
-                           :rev 			=> lookup('bordereau', node_uid, 'block_devices', 'sda', 'rev'),
-                         }]
+          :interface  => 'SATA',
+          :size       => lookup('bordereau', node_uid, 'block_devices', 'sda', 'size'),
+          :driver     => "sata_svw",
+          :device     => lookup('bordereau', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('bordereau', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('bordereau', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('bordereau', node_uid, 'block_devices', 'sda', 'rev')
+        }]
         network_adapters [{
-                            :interface 		=> 'Ethernet',
-                            :rate 		=> 1.G,
-                            :network_address 	=> "#{node_uid}.#{site_uid}.grid5000.fr",
-                            :ip 			=> lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'ip'),
-                            :mac 			=> lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'mac'),
-                            :switch_port => lookup('bordereau',node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-                            :vendor 		=> "Broadcom",
-                            :version 		=> "BCM5704",
-                            :enabled 		=> true,
-                            :switch             => "gw-bordeaux",
-                            :mounted 		=> true,
-                            :mountable 	=> true,
-                            :bridged 		=> true,
-                            :driver 		=> "tg3",
-                            :management => false,
-                            :device 		=> "eth0"
-                          },
-                          {
-                            :interface 		=> 'Ethernet',
-                            :rate 		=> 1.G,
-                            :network_address 	=> "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-                            :ip 			=> lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'ip'),
-                            :mac 			=> lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'mac'),
-                            :vendor 		=> "Broadcom",
-                            :version 		=> "BCM5704",
-                            :enabled 		=> true,
-                            :mounted 		=> false,
-                            :mountable 		=> true,
-                            :driver 		=> "tg3",
-                            :management 		=> false,
-                            :device 		=> "eth1"
-                          },
-                          {
-                            :interface 		=> 'Ethernet',
-                            :rate 		=> 100.M,
-                            :network_address 	=> "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-                            :ip 			=> lookup('bordereau', node_uid, 'network_interfaces', 'bmc', 'ip'),
-                            :mac 			=> lookup('bordereau', node_uid, 'network_interfaces', 'bmc', 'mac'),
-                            :enabled 		=> true,
-                            :mounted 		=> false,
-                            :mountable 		=> false,
-                            :management 		=> true,
-                            :device 		=> "bmc"
-                          }]
-	bios({
-               :version              => lookup('bordereau', node_uid, 'bios', 'version'),
-               :vendor               => lookup('bordereau', node_uid, 'bios', 'vendor'),
-               :release_date         => lookup('bordereau', node_uid, 'bios', 'release_date')
-             })
-	chassis({
-                  :serial               => lookup('bordereau', node_uid, 'chassis', 'serial_number'),
-                  :name                 => lookup('bordereau', node_uid, 'chassis', 'product_name')
-                })
-     gpu({
-            :gpu  => false
-              })
+          :interface        => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :bridged          => true,
+          :device           => "eth0",
+          :vendor           => "Broadcom",
+          :version 	    => "BCM5704",
+          :driver           => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
+          :ip               => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => "gw-bordeaux",
+          :switch_port      => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'mac')
+        },
+        {
+          :interface        => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :bridged          => false,
+          :device           => "eth1",
+          :vendor           => "Broadcom",
+          :version 	    => "BCM5704",
+          :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
+          :ip               => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :ip6              => lookup('bordereau', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :driver           => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('bordereau', node_uid, 'network_interfaces', 'eth1', 'mac')
+        },
+        {
+          :interface            => 'Ethernet',
+          :rate                 => 100.M,
+          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :ip                   => lookup('bordereau', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('bordereau', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :enabled              => true,
+          :mounted              => false,
+          :mountable            => false,
+          :management           => true,
+          :device               => "bmc"
+        }]
+
+        chassis({
+          :serial       => lookup('bordereau', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('bordereau', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('bordereau', node_uid, 'chassis', 'manufacturer')
+        })
+
+        bios({
+          :version      => lookup('bordereau', node_uid, 'bios', 'version'),
+          :vendor       => lookup('bordereau', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('bordereau', node_uid, 'bios', 'release_date')
+        })
+
+        gpu({
+          :gpu  => false
+        })
+
+        monitoring({
+          :wattmeter  => false
+        })
 
-    monitoring({
-                  :wattmeter  => false
-                })
       end
     end
   end # cluster bordereau
diff --git a/generators/input/sites/bordeaux/clusters/bordereau.yaml b/generators/input/sites/bordeaux/clusters/bordereau.yaml
index db832ccf469..604770de4b8 100644
--- a/generators/input/sites/bordeaux/clusters/bordereau.yaml
+++ b/generators/input/sites/bordeaux/clusters/bordereau.yaml
@@ -6,25 +6,66 @@ bordereau-1:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number:
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac:
-      ip: 172.17.4.1
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
-      mac:
+      mounted: false
+      rate: 1000000000
+      mac: 
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.1
       switch_port: Gi/C1
     eth1:
-      mac:
+      mounted: false
+      mac: 
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.1
+    bmc:
+      mac: 
+      ip: 172.17.4.1
+  chassis:
+    serial_number: 
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-2:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -32,25 +73,66 @@ bordereau-2:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number:
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5d:2e
-      ip: 172.17.4.2
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5d:2c
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.2
       switch_port: Gi/C2
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5d:2d
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.2
+    bmc:
+      mac: 00:14:5e:55:5d:2e
+      ip: 172.17.4.2
+  chassis:
+    serial_number: 
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-3:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -58,25 +140,66 @@ bordereau-3:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZH
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:44
-      ip: 172.17.4.3
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:42
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.3
       switch_port: Gi/C3
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:43
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.3
+    bmc:
+      mac: 00:14:5e:55:5c:44
+      ip: 172.17.4.3
+  chassis:
+    serial_number: KDDDRZH
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-4:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -84,25 +207,66 @@ bordereau-4:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number:
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5E:55:68:C9
-      ip: 172.17.4.4
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:68:c7
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.4
       switch_port: Gi/C4
     eth1:
+      mounted: false
       mac: 00:14:5e:55:68:c8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.4
+    bmc:
+      mac: 00:14:5E:55:68:C9
+      ip: 172.17.4.4
+  chassis:
+    serial_number: 
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-5:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -110,25 +274,66 @@ bordereau-5:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXT
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:61:96
-      ip: 172.17.4.5
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:61:94
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.5
       switch_port: Gi/C5
     eth1:
+      mounted: false
       mac: 00:14:5e:55:61:95
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.5
+    bmc:
+      mac: 00:14:5e:55:61:96
+      ip: 172.17.4.5
+  chassis:
+    serial_number: KDDDRXT
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-6:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -136,25 +341,66 @@ bordereau-6:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZM
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:58:f0
-      ip: 172.17.4.6
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:58:ee
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.6
       switch_port: Gi/C6
     eth1:
+      mounted: false
       mac: 00:14:5e:55:58:ef
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.6
+    bmc:
+      mac: 00:14:5e:55:58:f0
+      ip: 172.17.4.6
+  chassis:
+    serial_number: KDDDRZM
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-7:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -162,25 +408,66 @@ bordereau-7:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRVP
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:7e
-      ip: 172.17.4.7
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:7c
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.7
       switch_port: Gi/C7
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:7d
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.7
+    bmc:
+      mac: 00:14:5e:55:5e:7e
+      ip: 172.17.4.7
+  chassis:
+    serial_number: KDDDRVP
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-8:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -188,51 +475,133 @@ bordereau-8:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRVT
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:60:fa
-      ip: 172.17.4.8
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:60:f8
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.8
       switch_port: Gi/C8
     eth1:
+      mounted: false
       mac: 00:14:5e:55:60:f9
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.8
+    bmc:
+      mac: 00:14:5e:55:60:fa
+      ip: 172.17.4.8
+  chassis:
+    serial_number: KDDDRVT
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-9:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXX
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:ea
-      ip: 172.17.4.9
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:e8
+      ip6: fe80::214:5eff:fe55:5ee8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.9
       switch_port: Gi/C9
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:e9
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.9
+    bmc:
+      mac: 00:14:5e:55:5e:ea
+      ip: 172.17.4.9
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRXX
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-10:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -240,51 +609,133 @@ bordereau-10:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWH
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6b:cc
-      ip: 172.17.4.10
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6b:ca
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.10
       switch_port: Gi/C10
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6b:cb
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.10
+    bmc:
+      mac: 00:14:5e:55:6b:cc
+      ip: 172.17.4.10
+  chassis:
+    serial_number: KDDDRWH
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-11:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
     release_date: (09/15/2008)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXW
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:83
-      ip: 172.17.4.11
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:81
+      ip6: fe80::214:5eff:fe55:5c81
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.11
       switch_port: Gi/C11
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:82
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.11
+    bmc:
+      mac: 00:14:5e:55:5c:83
+      ip: 172.17.4.11
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRXW
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-12:
   bios:
     version: 1.30-[C0E140AUS-1.40]-
@@ -292,25 +743,66 @@ bordereau-12:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZR
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:58:f9
-      ip: 172.17.4.12
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:58:f7
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.12
       switch_port: Gi/C12
     eth1:
+      mounted: false
       mac: 00:14:5e:55:58:f8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.12
+    bmc:
+      mac: 00:14:5e:55:58:f9
+      ip: 172.17.4.12
+  chassis:
+    serial_number: KDDDRZR
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-13:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -318,25 +810,66 @@ bordereau-13:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXK
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:65
-      ip: 172.17.4.13
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:63
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.13
       switch_port: Gi/C13
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:64
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.13
+    bmc:
+      mac: 00:14:5e:55:59:65
+      ip: 172.17.4.13
+  chassis:
+    serial_number: KDDDRXK
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-14:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -344,25 +877,66 @@ bordereau-14:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZF
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:5f
-      ip: 172.17.4.14
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:5d
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.14
       switch_port: Gi/C14
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:5e
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.14
+    bmc:
+      mac: 00:14:5e:55:59:5f
+      ip: 172.17.4.14
+  chassis:
+    serial_number: KDDDRZF
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-15:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -370,25 +944,66 @@ bordereau-15:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWB
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6a:f4
-      ip: 172.17.4.15
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6a:f2
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.15
       switch_port: Gi/C15
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6a:f3
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.15
+    bmc:
+      mac: 00:14:5e:55:6a:f4
+      ip: 172.17.4.15
+  chassis:
+    serial_number: KDDDRWB
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-16:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -396,51 +1011,133 @@ bordereau-16:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXD
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5d:ee
-      ip: 172.17.4.16
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5d:ec
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.16
       switch_port: Gi/C16
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5d:ed
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.16
+    bmc:
+      mac: 00:14:5e:55:5d:ee
+      ip: 172.17.4.16
+  chassis:
+    serial_number: KDDDRXD
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-17:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYW
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:ab
-      ip: 172.17.4.17
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:a9
+      ip6: fe80::214:5eff:fe55:5ea9
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.17
       switch_port: Gi/C17
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:aa
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.17
+    bmc:
+      mac: 00:14:5e:55:5e:ab
+      ip: 172.17.4.17
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  chassis:
+    serial_number: KDDDRYW
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-18:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -448,25 +1145,66 @@ bordereau-18:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYN
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:64:0f
-      ip: 172.17.4.18
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:64:0d
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.18
       switch_port: Gi/C18
     eth1:
+      mounted: false
       mac: 00:14:5e:55:64:0e
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.18
+    bmc:
+      mac: 00:14:5e:55:64:0f
+      ip: 172.17.4.18
+  chassis:
+    serial_number: KDDDRYN
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-19:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -474,25 +1212,66 @@ bordereau-19:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXN
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:68:69
-      ip: 172.17.4.19
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:68:67
+      ip6: fe80::214:5eff:fe55:6867
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.19
       switch_port: Gi/C19
     eth1:
+      mounted: false
       mac: 00:14:5e:55:68:68
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.19
+    bmc:
+      mac: 00:14:5e:55:68:69
+      ip: 172.17.4.19
+  chassis:
+    serial_number: KDDDRXN
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-20:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -500,25 +1279,66 @@ bordereau-20:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXB
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:62:b3
-      ip: 172.17.4.20
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:62:b1
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.20
       switch_port: Gi/C20
     eth1:
+      mounted: false
       mac: 00:14:5e:55:62:b2
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.20
+    bmc:
+      mac: 00:14:5e:55:62:b3
+      ip: 172.17.4.20
+  chassis:
+    serial_number: KDDDRXB
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-21:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -526,25 +1346,66 @@ bordereau-21:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXV
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5a:9a
-      ip: 172.17.4.21
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5a:98
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.21
       switch_port: Gi/C21
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5a:99
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.21
+    bmc:
+      mac: 00:14:5e:55:5a:9a
+      ip: 172.17.4.21
+  chassis:
+    serial_number: KDDDRXV
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-22:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -552,25 +1413,66 @@ bordereau-22:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWY
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:86
-      ip: 172.17.4.22
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:84
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.22
       switch_port: Gi/C22
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:85
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.22
+    bmc:
+      mac: 00:14:5e:55:59:86
+      ip: 172.17.4.22
+  chassis:
+    serial_number: KDDDRWY
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-23:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -578,25 +1480,66 @@ bordereau-23:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWM
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:62:98
-      ip: 172.17.4.23
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:62:96
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.23
       switch_port: Gi/C23
     eth1:
+      mounted: false
       mac: 00:14:5e:55:62:97
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.23
+    bmc:
+      mac: 00:14:5e:55:62:98
+      ip: 172.17.4.23
+  chassis:
+    serial_number: KDDDRWM
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-24:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -604,25 +1547,66 @@ bordereau-24:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDTAA
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5d:dc
-      ip: 172.17.4.24
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5d:da
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.24
-      switch_port:
+      switch_port: 
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5d:db
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.24
+    bmc:
+      mac: 00:14:5e:55:5d:dc
+      ip: 172.17.4.24
+  chassis:
+    serial_number: KDDDTAA
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-25:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -630,25 +1614,66 @@ bordereau-25:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYT
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5d:bb
-      ip: 172.17.4.25
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5d:b9
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.25
-      switch_port:
+      switch_port: 
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5d:ba
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.25
+    bmc:
+      mac: 00:14:5e:55:5d:bb
+      ip: 172.17.4.25
+  chassis:
+    serial_number: KDDDRYT
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-26:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -656,25 +1681,66 @@ bordereau-26:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRVW
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6d:31
-      ip: 172.17.4.26
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6d:2f
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.26
-      switch_port:
+      switch_port: 
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6d:30
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.26
+    bmc:
+      mac: 00:14:5e:55:6d:31
+      ip: 172.17.4.26
+  chassis:
+    serial_number: KDDDRVW
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-27:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -682,25 +1748,66 @@ bordereau-27:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDTAG
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5d:6b
-      ip: 172.17.4.27
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:69
+      ip6: fe80::214:5eff:fe55:5c69
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.27
-      switch_port:
+      switch_port: 
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:6a
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.27
+    bmc:
+      mac: 00:14:5e:55:5d:6b
+      ip: 172.17.4.27
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: KDDDTAG
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2592000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-28:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -708,51 +1815,133 @@ bordereau-28:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYZ
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:8a
-      ip: 172.17.4.28
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:88
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.28
       switch_port: Gi/E4
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:89
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.28
+    bmc:
+      mac: 00:14:5e:55:5e:8a
+      ip: 172.17.4.28
+  chassis:
+    serial_number: KDDDRYZ
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-29:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDTAH
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:c5
-      ip: 172.17.4.29
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:c3
+      ip6: fe80::214:5eff:fe55:5cc3
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.29
       switch_port: Gi/E5
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:c4
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.29
+    bmc:
+      mac: 00:14:5e:55:5c:c5
+      ip: 172.17.4.29
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  chassis:
+    serial_number: KDDDTAH
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-30:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -760,51 +1949,133 @@ bordereau-30:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number:
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:d8
-      ip: 172.17.4.30
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:d6
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.30
       switch_port: Gi/E6
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:d7
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.30
+    bmc:
+      mac: 00:14:5e:55:5e:d8
+      ip: 172.17.4.30
+  chassis:
+    serial_number: 
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-31:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWL
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:b9
-      ip: 172.17.4.31
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:b7
+      ip6: fe80::214:5eff:fe55:59b7
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.31
       switch_port: Gi/E7
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:b8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.31
+    bmc:
+      mac: 00:14:5e:55:59:b9
+      ip: 172.17.4.31
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRWL
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2592000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-32:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -812,25 +2083,66 @@ bordereau-32:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXA
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:bf
-      ip: 172.17.4.32
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:bd
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.32
       switch_port: Gi/E8
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:be
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.32
+    bmc:
+      mac: 00:14:5e:55:59:bf
+      ip: 172.17.4.32
+  chassis:
+    serial_number: KDDDRXA
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-33:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -838,25 +2150,66 @@ bordereau-33:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYH
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:b4
-      ip: 172.17.4.33
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:b2
+      ip6: fe80::214:5eff:fe55:5eb2
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.33
       switch_port: Gi/E9
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:b3
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.33
+    bmc:
+      mac: 00:14:5e:55:5e:b4
+      ip: 172.17.4.33
+  chassis:
+    serial_number: KDDDRYH
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2592000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-34:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -864,51 +2217,133 @@ bordereau-34:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number:
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5d:04
-      ip: 172.17.4.34
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5d:02
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.34
       switch_port: Gi/E10
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5d:03
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.34
+    bmc:
+      mac: 00:14:5e:55:5d:04
+      ip: 172.17.4.34
+  chassis:
+    serial_number: 
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-35:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZZ
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:24
-      ip: 172.17.4.35
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:22
+      ip6: fe80::214:5eff:fe55:5e22
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.35
       switch_port: Gi/E11
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:23
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.35
+    bmc:
+      mac: 00:14:5e:55:5e:24
+      ip: 172.17.4.35
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  chassis:
+    serial_number: KDDDRZZ
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-36:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -916,25 +2351,66 @@ bordereau-36:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDTAC
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:69:f2
-      ip: 172.17.4.36
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:69:f0
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.36
       switch_port: Gi/E12
     eth1:
+      mounted: false
       mac: 00:14:5e:55:69:f1
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.36
+    bmc:
+      mac: 00:14:5e:55:69:f2
+      ip: 172.17.4.36
+  chassis:
+    serial_number: KDDDTAC
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-37:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -942,25 +2418,66 @@ bordereau-37:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZL
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5f:d4
-      ip: 172.17.4.37
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5f:d2
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.37
       switch_port: Gi/E13
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5f:d3
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.37
+    bmc:
+      mac: 00:14:5e:55:5f:d4
+      ip: 172.17.4.37
+  chassis:
+    serial_number: KDDDRZL
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-38:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -968,51 +2485,133 @@ bordereau-38:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZP
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5f:11
-      ip: 172.17.4.38
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5f:0f
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.38
       switch_port: Gi/E14
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5f:10
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.38
+    bmc:
+      mac: 00:14:5e:55:5f:11
+      ip: 172.17.4.38
+  chassis:
+    serial_number: KDDDRZP
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-39:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYG
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:63:31
-      ip: 172.17.4.39
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:63:2f
+      ip6: fe80::214:5eff:fe55:632f
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.39
       switch_port: Gi/B1
     eth1:
+      mounted: false
       mac: 00:14:5e:55:63:30
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.39
+    bmc:
+      mac: 00:14:5e:55:63:31
+      ip: 172.17.4.39
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  chassis:
+    serial_number: KDDDRYG
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-40:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1020,181 +2619,468 @@ bordereau-40:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number:
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac:
-      ip: 172.17.4.40
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
-      mac:
+      mounted: false
+      rate: 1000000000
+      mac: 
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.40
       switch_port: Gi/B2
     eth1:
-      mac:
+      mounted: false
+      mac: 
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.40
+    bmc:
+      mac: 
+      ip: 172.17.4.40
+  chassis:
+    serial_number: 
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-41:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number:
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:02
-      ip: 172.17.4.41
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:00
+      ip6: fe80::214:5eff:fe55:5900
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.41
       switch_port: Gi/B3
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:01
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.41
+    bmc:
+      mac: 00:14:5e:55:59:02
+      ip: 172.17.4.41
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  chassis:
+    serial_number: 
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-42:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYF
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:60:97
-      ip: 172.17.4.42
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:60:95
+      ip6: fe80::214:5eff:fe55:6095
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.42
       switch_port: Gi/B4
     eth1:
+      mounted: false
       mac: 00:14:5e:55:60:96
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.42
+    bmc:
+      mac: 00:14:5e:55:60:97
+      ip: 172.17.4.42
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  chassis:
+    serial_number: KDDDRYF
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-43:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWD
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6c:02
-      ip: 172.17.4.43
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6c:00
+      ip6: fe80::214:5eff:fe55:6c00
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.43
       switch_port: Gi/B5
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6c:01
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.43
+    bmc:
+      mac: 00:14:5e:55:6c:02
+      ip: 172.17.4.43
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  chassis:
+    serial_number: KDDDRWD
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-44:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXL
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:d4
-      ip: 172.17.4.44
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:d2
+      ip6: fe80::214:5eff:fe55:59d2
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.44
       switch_port: Gi/B6
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:d3
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.44
+    bmc:
+      mac: 00:14:5e:55:59:d4
+      ip: 172.17.4.44
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  chassis:
+    serial_number: KDDDRXL
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-45:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWZ
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:bf
-      ip: 172.17.4.45
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:bd
+      ip6: fe80::214:5eff:fe55:5cbd
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.45
       switch_port: Gi/B7
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:be
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.45
+    bmc:
+      mac: 00:14:5e:55:5c:bf
+      ip: 172.17.4.45
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRWZ
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-46:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYY
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:62
-      ip: 172.17.4.46
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:60
+      ip6: fe80::214:5eff:fe55:5c60
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.46
       switch_port: Gi/B8
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:61
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.46
+    bmc:
+      mac: 00:14:5e:55:5c:62
+      ip: 172.17.4.46
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRYY
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-47:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1202,51 +3088,133 @@ bordereau-47:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWA
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6c:aa
-      ip: 172.17.4.47
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6c:a8
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.47
       switch_port: Gi/B9
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6c:a9
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.47
+    bmc:
+      mac: 00:14:5e:55:6c:aa
+      ip: 172.17.4.47
+  chassis:
+    serial_number: KDDDRWA
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-48:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
     release_date: (09/15/2008)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZV
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:58:ff
-      ip: 172.17.4.48
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:58:fd
+      ip6: fe80::214:5eff:fe55:58fd
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.48
       switch_port: Gi/B10
     eth1:
+      mounted: false
       mac: 00:14:5e:55:58:fe
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.48
+    bmc:
+      mac: 00:14:5e:55:58:ff
+      ip: 172.17.4.48
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRZV
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-49:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1254,25 +3222,66 @@ bordereau-49:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZA
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:62:d9
-      ip: 172.17.4.49
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:62:e7
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.49
       switch_port: Gi/B11
     eth1:
+      mounted: false
       mac: 00:14:5e:55:62:e8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.49
+    bmc:
+      mac: 00:14:5e:55:62:d9
+      ip: 172.17.4.49
+  chassis:
+    serial_number: KDDDRZA
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-50:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -1280,25 +3289,66 @@ bordereau-50:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYR
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:ae
-      ip: 172.17.4.50
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:ac
+      ip6: fe80::214:5eff:fe55:5eac
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.50
       switch_port: Gi/B12
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:ad
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.50
+    bmc:
+      mac: 00:14:5e:55:5e:ae
+      ip: 172.17.4.50
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRYR
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-51:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1306,103 +3356,267 @@ bordereau-51:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYA
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:d7
-      ip: 172.17.4.51
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:d5
+      ip6: fe80::214:5eff:fe55:5cd5
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.51
       switch_port: Gi/B13
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:d6
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.51
+    bmc:
+      mac: 00:14:5e:55:5c:d7
+      ip: 172.17.4.51
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRYA
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-52:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYP
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5d:b5
-      ip: 172.17.4.52
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5d:b3
+      ip6: fe80::214:5eff:fe55:5db3
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.52
       switch_port: Gi/B14
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5d:b4
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.52
+    bmc:
+      mac: 00:14:5e:55:5d:b5
+      ip: 172.17.4.52
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: KDDDRYP
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2592000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-53:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRVV
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6c:1d
-      ip: 172.17.4.53
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6c:1b
+      ip6: fe80::214:5eff:fe55:6c1b
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.53
       switch_port: Gi/B15
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6c:1c
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.53
+    bmc:
+      mac: 00:14:5e:55:6c:1d
+      ip: 172.17.4.53
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRVV
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-54:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
-  block_devices:
-    sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
-      vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZX
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:63:b8
-      ip: 172.17.4.54
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:63:b6
+      ip6: fe80::214:5eff:fe55:63b6
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.54
       switch_port: Gi/B16
     eth1:
+      mounted: false
       mac: 00:14:5e:55:63:b7
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.54
+    bmc:
+      mac: 00:14:5e:55:63:b8
+      ip: 172.17.4.54
+  block_devices:
+    sda:
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
+      vendor: Hitachi
+  chassis:
+    serial_number: KDDDRZX
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-55:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1410,25 +3624,66 @@ bordereau-55:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZY
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:ef
-      ip: 172.17.4.55
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:ed
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.55
-      switch_port:
+      switch_port: 
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:ee
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.55
+    bmc:
+      mac: 00:14:5e:55:5c:ef
+      ip: 172.17.4.55
+  chassis:
+    serial_number: KDDDRZY
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-56:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1436,25 +3691,66 @@ bordereau-56:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZT
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:60:cd
-      ip: 172.17.4.56
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:60:cb
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.56
       switch_port: Gi/D1
     eth1:
+      mounted: false
       mac: 00:14:5e:55:60:cc
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.56
+    bmc:
+      mac: 00:14:5e:55:60:cd
+      ip: 172.17.4.56
+  chassis:
+    serial_number: KDDDRZT
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-57:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1462,25 +3758,66 @@ bordereau-57:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number:
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac:
-      ip: 172.17.4.57
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
-      mac:
+      mounted: false
+      rate: 1000000000
+      mac: 
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.57
       switch_port: Gi/D2
     eth1:
-      mac:
+      mounted: false
+      mac: 
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.57
+    bmc:
+      mac: 
+      ip: 172.17.4.57
+  chassis:
+    serial_number: 
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-58:
   bios:
     version: 1.35-[C0E135AUS-1.35]-
@@ -1488,25 +3825,66 @@ bordereau-58:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZC
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:a8
-      ip: 172.17.4.58
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:a6
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.58
       switch_port: Gi/D3
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:a7
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.58
+    bmc:
+      mac: 00:14:5e:55:5e:a8
+      ip: 172.17.4.58
+  chassis:
+    serial_number: KDDDRZC
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-59:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1514,25 +3892,66 @@ bordereau-59:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZD
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:da
-      ip: 172.17.4.59
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:d8
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.59
       switch_port: Gi/D4
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:d9
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.59
+    bmc:
+      mac: 00:14:5e:55:5c:da
+      ip: 172.17.4.59
+  chassis:
+    serial_number: KDDDRZD
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-60:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -1540,25 +3959,66 @@ bordereau-60:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZN
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5b:5d
-      ip: 172.17.4.60
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5b:5b
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.60
       switch_port: Gi/D5
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5b:5c
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.60
+    bmc:
+      mac: 00:14:5e:55:5b:5d
+      ip: 172.17.4.60
+  chassis:
+    serial_number: KDDDRZN
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-61:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -1566,25 +4026,66 @@ bordereau-61:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDTAL
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:58:4b
-      ip: 172.17.4.61
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:58:49
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.61
       switch_port: Gi/D6
     eth1:
+      mounted: false
       mac: 00:14:5e:55:58:4a
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.61
+    bmc:
+      mac: 00:14:5e:55:58:4b
+      ip: 172.17.4.61
+  chassis:
+    serial_number: KDDDTAL
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-62:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1592,25 +4093,66 @@ bordereau-62:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWT
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:63:28
-      ip: 172.17.4.62
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:63:26
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.62
       switch_port: Gi/D7
     eth1:
+      mounted: false
       mac: 00:14:5e:55:63:27
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.62
+    bmc:
+      mac: 00:14:5e:55:63:28
+      ip: 172.17.4.62
+  chassis:
+    serial_number: KDDDRWT
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-63:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1618,25 +4160,66 @@ bordereau-63:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZB
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:6e
-      ip: 172.17.4.63
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:6c
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.63
       switch_port: Gi/D8
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:6d
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.63
+    bmc:
+      mac: 00:14:5e:55:5c:6e
+      ip: 172.17.4.63
+  chassis:
+    serial_number: KDDDRZB
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-64:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1644,25 +4227,66 @@ bordereau-64:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDTAD
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:d1
-      ip: 172.17.4.64
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:cf
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.64
       switch_port: Gi/D9
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:d0
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.64
+    bmc:
+      mac: 00:14:5e:55:5c:d1
+      ip: 172.17.4.64
+  chassis:
+    serial_number: KDDDTAD
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-65:
   bios:
     version: 1.35-[C0E135AUS-1.35]-
@@ -1670,25 +4294,66 @@ bordereau-65:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWX
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:fb
-      ip: 172.17.4.65
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:f9
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.65
       switch_port: Gi/D10
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:fa
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.65
+    bmc:
+      mac: 00:14:5e:55:59:fb
+      ip: 172.17.4.65
+  chassis:
+    serial_number: KDDDRWX
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-66:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1696,25 +4361,66 @@ bordereau-66:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYX
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:1b
-      ip: 172.17.4.66
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:19
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.66
       switch_port: Gi/D11
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:1a
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.66
+    bmc:
+      mac: 00:14:5e:55:5e:1b
+      ip: 172.17.4.66
+  chassis:
+    serial_number: KDDDRYX
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-67:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1722,25 +4428,66 @@ bordereau-67:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZW
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:1d
-      ip: 172.17.4.67
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:1b
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.67
       switch_port: Gi/D12
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:1c
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.67
+    bmc:
+      mac: 00:14:5e:55:5c:1d
+      ip: 172.17.4.67
+  chassis:
+    serial_number: KDDDRZW
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-68:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1748,25 +4495,66 @@ bordereau-68:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXZ
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:57:8b
-      ip: 172.17.4.68
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:57:89
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.68
       switch_port: Gi/D13
     eth1:
+      mounted: false
       mac: 00:14:5e:55:57:8a
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.68
+    bmc:
+      mac: 00:14:5e:55:57:8b
+      ip: 172.17.4.68
+  chassis:
+    serial_number: KDDDRXZ
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-69:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1774,25 +4562,66 @@ bordereau-69:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWW
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:63:d0
-      ip: 172.17.4.69
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:63:ce
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.69
       switch_port: Gi/D14
     eth1:
+      mounted: false
       mac: 00:14:5e:55:63:cf
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.69
+    bmc:
+      mac: 00:14:5e:55:63:d0
+      ip: 172.17.4.69
+  chassis:
+    serial_number: KDDDRWW
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-70:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1800,25 +4629,66 @@ bordereau-70:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWC
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6b:00
-      ip: 172.17.4.70
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6a:fe
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.70
       switch_port: Gi/D15
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6a:ff
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.70
+    bmc:
+      mac: 00:14:5e:55:6b:00
+      ip: 172.17.4.70
+  chassis:
+    serial_number: KDDDRWC
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-71:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1826,25 +4696,66 @@ bordereau-71:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRZK
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:46
-      ip: 172.17.4.71
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:44
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.71
       switch_port: Gi/D16
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:45
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.71
+    bmc:
+      mac: 00:14:5e:55:59:46
+      ip: 172.17.4.71
+  chassis:
+    serial_number: KDDDRZK
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-72:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1852,25 +4763,66 @@ bordereau-72:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXM
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5a:40
-      ip: 172.17.4.72
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5a:3e
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.72
       switch_port: Gi/D17
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5a:3f
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.72
+    bmc:
+      mac: 00:14:5e:55:5a:40
+      ip: 172.17.4.72
+  chassis:
+    serial_number: KDDDRXM
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-73:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1878,25 +4830,66 @@ bordereau-73:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDTAK
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6a:1c
-      ip: 172.17.4.73
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6a:1a
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.73
       switch_port: Gi/D18
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6a:1b
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.73
+    bmc:
+      mac: 00:14:5e:55:6a:1c
+      ip: 172.17.4.73
+  chassis:
+    serial_number: KDDDTAK
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-74:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1904,25 +4897,66 @@ bordereau-74:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYM
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:64:06
-      ip: 172.17.4.74
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:64:04
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.74
       switch_port: Gi/D19
     eth1:
+      mounted: false
       mac: 00:14:5e:55:64:05
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.74
+    bmc:
+      mac: 00:14:5e:55:64:06
+      ip: 172.17.4.74
+  chassis:
+    serial_number: KDDDRYM
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-75:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1930,25 +4964,66 @@ bordereau-75:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWV
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:b1
-      ip: 172.17.4.75
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:af
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.75
       switch_port: Gi/D20
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:b0
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.75
+    bmc:
+      mac: 00:14:5e:55:5e:b1
+      ip: 172.17.4.75
+  chassis:
+    serial_number: KDDDRWV
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-76:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1956,25 +5031,66 @@ bordereau-76:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDTAF
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5d:0a
-      ip: 172.17.4.76
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5d:08
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.76
       switch_port: Gi/D21
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5d:09
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.76
+    bmc:
+      mac: 00:14:5e:55:5d:0a
+      ip: 172.17.4.76
+  chassis:
+    serial_number: KDDDTAF
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-77:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -1982,25 +5098,66 @@ bordereau-77:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWN
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:63:61
-      ip: 172.17.4.77
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:63:5f
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.77
       switch_port: Gi/D22
     eth1:
+      mounted: false
       mac: 00:14:5e:55:63:60
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.77
+    bmc:
+      mac: 00:14:5e:55:63:61
+      ip: 172.17.4.77
+  chassis:
+    serial_number: KDDDRWN
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-78:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2008,25 +5165,66 @@ bordereau-78:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXP
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:63:fd
-      ip: 172.17.4.78
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:63:fb
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.78
       switch_port: Gi/D23
     eth1:
+      mounted: false
       mac: 00:14:5e:55:63:fc
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.78
+    bmc:
+      mac: 00:14:5e:55:63:fd
+      ip: 172.17.4.78
+  chassis:
+    serial_number: KDDDRXP
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-79:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2034,25 +5232,66 @@ bordereau-79:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number:
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:62:ef
-      ip: 172.17.4.79
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:62:ed
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.79
       switch_port: 
     eth1:
+      mounted: false
       mac: 00:14:5e:55:62:ee
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.79
+    bmc:
+      mac: 00:14:5e:55:62:ef
+      ip: 172.17.4.79
+  chassis:
+    serial_number: 
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-80:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2060,25 +5299,66 @@ bordereau-80:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYL
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:b0
-      ip: 172.17.1.80
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:ae
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.80
       switch_port: Gi/F1
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:af
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.80
+    bmc:
+      mac: 00:14:5e:55:5c:b0
+      ip: 172.17.1.80
+  chassis:
+    serial_number: KDDDRYL
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-81:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -2086,25 +5366,66 @@ bordereau-81:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYV
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:58:a8
-      ip: 172.17.1.81
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:58:a6
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.81
       switch_port: Gi/F2
     eth1:
+      mounted: false
       mac: 00:14:5e:55:58:a7
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.81
+    bmc:
+      mac: 00:14:5e:55:58:a8
+      ip: 172.17.1.81
+  chassis:
+    serial_number: KDDDRYV
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-82:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2112,25 +5433,66 @@ bordereau-82:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRVZ
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:68:87
-      ip: 172.17.1.82
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:68:85
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.82
       switch_port: Gi/F3
     eth1:
+      mounted: false
       mac: 00:14:5e:55:68:86
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.82
+    bmc:
+      mac: 00:14:5e:55:68:87
+      ip: 172.17.1.82
+  chassis:
+    serial_number: KDDDRVZ
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-83:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2138,25 +5500,66 @@ bordereau-83:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRVY
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6d:25
-      ip: 172.17.1.83
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6d:23
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.83
       switch_port: Gi/F4
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6d:24
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.83
+    bmc:
+      mac: 00:14:5e:55:6d:25
+      ip: 172.17.1.83
+  chassis:
+    serial_number: KDDDRVY
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-84:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2164,25 +5567,66 @@ bordereau-84:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWR
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:4a
-      ip: 172.17.1.84
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:48
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.84
       switch_port: Gi/F5
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:49
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.84
+    bmc:
+      mac: 00:14:5e:55:5c:4a
+      ip: 172.17.1.84
+  chassis:
+    serial_number: KDDDRWR
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-85:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2190,25 +5634,66 @@ bordereau-85:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYC
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:59:43
-      ip: 172.17.1.85
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:59:41
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.85
       switch_port: Gi/F6
     eth1:
+      mounted: false
       mac: 00:14:5e:55:59:42
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.85
+    bmc:
+      mac: 00:14:5e:55:59:43
+      ip: 172.17.1.85
+  chassis:
+    serial_number: KDDDRYC
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-86:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2216,25 +5701,66 @@ bordereau-86:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYK
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:68:cc
-      ip: 172.17.1.86
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:68:ca
+      ip6: fe80::214:5eff:fe55:68ca
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.86
       switch_port: Gi/F8
     eth1:
+      mounted: false
       mac: 00:14:5e:55:68:cb
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.86
+    bmc:
+      mac: 00:14:5e:55:68:cc
+      ip: 172.17.1.86
+  supported_job_types:
+    virtual: amd-v
+  chassis:
+    serial_number: KDDDRYK
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-87:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2242,51 +5768,133 @@ bordereau-87:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXC
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5e:2a
-      ip: 172.17.1.87
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5e:28
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.87
       switch_port: Gi/F8
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5e:29
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.87
+    bmc:
+      mac: 00:14:5e:55:5e:2a
+      ip: 172.17.1.87
+  chassis:
+    serial_number: KDDDRXC
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-88:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
     release_date: (01/04/2007)
     vendor: IBM
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRXF
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5d:6d
-      ip: 172.17.1.88
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5d:6b
+      ip6: fe80::214:5eff:fe55:5d6b
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.88
       switch_port: Gi/F9
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5d:6c
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.88
+    bmc:
+      mac: 00:14:5e:55:5d:6d
+      ip: 172.17.1.88
+  chassis:
+    serial_number: KDDDRXF
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  main_memory:
+    ram_size: 4157911040
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-89:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2294,25 +5902,66 @@ bordereau-89:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWF
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6d:07
-      ip: 172.17.1.89
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6d:05
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.89
       switch_port: Gi/F10
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6d:06
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.89
+    bmc:
+      mac: 00:14:5e:55:6d:07
+      ip: 172.17.1.89
+  chassis:
+    serial_number: KDDDRWF
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-90:
   bios:
     version: 1.40-[C0E140AUS-1.40]-
@@ -2320,25 +5969,66 @@ bordereau-90:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWG
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6d:2b
-      ip: 172.17.1.90
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6d:29
+      ip6: fe80::214:5eff:fe55:6d29
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.90
       switch_port: Gi/F11
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6d:2a
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.90
+    bmc:
+      mac: 00:14:5e:55:6d:2b
+      ip: 172.17.1.90
+  chassis:
+    serial_number: KDDDRWG
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-91:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2346,25 +6036,66 @@ bordereau-91:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDTAB
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:5c:c8
-      ip: 172.17.1.91
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:5c:c6
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.91
       switch_port: Gi/F12
     eth1:
+      mounted: false
       mac: 00:14:5e:55:5c:c7
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.91
+    bmc:
+      mac: 00:14:5e:55:5c:c8
+      ip: 172.17.1.91
+  chassis:
+    serial_number: KDDDTAB
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-92:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2372,25 +6103,66 @@ bordereau-92:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRYD
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6a:4c
-      ip: 172.17.1.92
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6a:4a
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.92
       switch_port: Gi/F13
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6a:4b
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.92
+    bmc:
+      mac: 00:14:5e:55:6a:4c
+      ip: 172.17.1.92
+  chassis:
+    serial_number: KDDDRYD
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
 bordereau-93:
   bios:
     version: 1.32-[C0E132AUS-1.32]-
@@ -2398,22 +6170,63 @@ bordereau-93:
     vendor: IBM
   block_devices:
     sda:
-      model: HDS721680PLA380
-      size:
-      rev: P21OAB1A
+      model: Hitachi HDS72168
+      device: sda
+      size: 80032038912
+      rev: P21O
       vendor: Hitachi
-  chassis:
-      serial_number: KDDDRWP
-      manufacturer: IBM
-      product_name: IBM System x3455-[7986Z1J]-
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 00:14:5e:55:6d:16
-      ip: 172.17.1.93
+    br0:
+      rate: 0
+      interface: Bridge
     eth0:
+      mounted: false
+      rate: 1000000000
       mac: 00:14:5e:55:6d:14
+      ip6: fe80::214:5eff:fe55:6ca8
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.1.93
       switch_port: Gi/F14
     eth1:
+      mounted: false
       mac: 00:14:5e:55:6d:15
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: tg3
+      mountable: true
       ip: 172.16.4.93
+    bmc:
+      mac: 00:14:5e:55:6d:16
+      ip: 172.17.1.93
+  chassis:
+    serial_number: KDDDRWP
+    manufacturer: IBM
+    product_name: IBM System x3455-[7986Z1J]-
+  supported_job_types:
+    virtual: amd-v
+  processor:
+    model: AMD Opteron
+    cache_l1d: 65536
+    clock_speed: 2593000000
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    version: 2218
+    cache_l2: 1048576
+    cache_l3: 0
+    vendor: AMD
+    instruction_set: x86-64
+    cache_l1i: 65536
+  main_memory:
+    ram_size: 4157911040
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 4
-- 
GitLab