diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
index 13ba9a3928e9873f5521a8f91de8c4753d2f698d..a50beeb10a6e4b42c0a7705911bbb4c5cb26cc67 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "DQM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.1",
+      "ip6": "fe80::862b:2bff:fe72:d47f",
       "mac": "84:2b:2b:72:d4:7f",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-1.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/7",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.1",
       "mac": "84:2b:2b:72:d4:80",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-1-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/7",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.101",
       "mac": "84:2b:2b:72:d4:81",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-1-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-1-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
index 68fe1c68e47bc96787454af3c7c031ad97e04983..bd9d5c792847bf3b20f3c0d4c4d894a454c7a6bc 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "9QM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.10",
+      "ip6": "fe80::862b:2bff:fe72:d449",
       "mac": "84:2b:2b:72:d4:49",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-10.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/16",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.10",
       "mac": "84:2b:2b:72:d4:4a",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-10-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/16",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.110",
       "mac": "84:2b:2b:72:d4:4b",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-10-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-10-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
index 3656cce4d0b4f739e3460661474a727ed1e23f3f..001e6e7a9e2f039f9973bfc5ae92ee3719d34be1 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "BRM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.11",
+      "ip6": "fe80::862b:2bff:fe70:c99d",
       "mac": "84:2b:2b:70:c9:9d",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-11.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/17",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.11",
       "mac": "84:2b:2b:70:c9:9e",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-11-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/17",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.111",
       "mac": "84:2b:2b:70:c9:9f",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-11-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-11-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2394000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
index b6b23de08cc65e670b5816b1d54d61f229451ff0..812504b3e65ea58a5fb5a426e8fa3c428439c881 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "BQM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.12",
+      "ip6": "fe80::862b:2bff:fe70:c621",
       "mac": "84:2b:2b:72:d5:ea",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-12.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/18",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.12",
       "mac": "84:2b:2b:72:d5:eb",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-12-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/18",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.112",
       "mac": "84:2b:2b:72:d5:ec",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-12-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-12-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
index 4219cb1459886f5359183b55e436cbe87a7bb1f8..9497dc44368107ef5d87dfa2d61a77d294ec5066 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "9RM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.13",
+      "ip6": "fe80::862b:2bff:fe70:c621",
       "mac": "84:2b:2b:71:f1:24",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-13.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/19",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.13",
       "mac": "84:2b:2b:71:f1:25",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-13-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/19",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.113",
       "mac": "84:2b:2b:71:f1:26",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-13-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-13-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
index c3337c5c5918152e3546f0196a299a024938b9e8..70395daa6b7bc4409efb48e61682cab7174d99de 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "CQM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.14",
+      "ip6": "fe80::862b:2bff:fe72:d567",
       "mac": "84:2b:2b:72:d5:67",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-14.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/20",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.14",
       "mac": "84:2b:2b:72:d5:68",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-14-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/20",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.114",
       "mac": "84:2b:2b:72:d5:69",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-14-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-14-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
index bd2a859c0f88f666ec346d6f3bf95e0a70bc036c..91175b93e2558577099715f3a6bd003324d6d34d 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "HQM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.15",
+      "ip6": "fe80::862b:2bff:fe72:d77a",
       "mac": "84:2b:2b:72:d7:7a",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-15.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/23",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.15",
       "mac": "84:2b:2b:72:d7:7b",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-15-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/23",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.115",
       "mac": "84:2b:2b:72:d7:7c",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-15-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-15-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
index a7d76369de12d0314444ca302a0b23cb3d61f21c..98180c0de47816d0192e9b6b8764c811fcd0fd9a 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "JQM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.16",
+      "ip6": "fe80::862b:2bff:fe72:d5db",
       "mac": "84:2b:2b:72:d5:db",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-16.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/22",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.16",
       "mac": "84:2b:2b:72:d5:dc",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-16-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/22",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.116",
       "mac": "84:2b:2b:72:d5:dd",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-16-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-16-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2394000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
index 304b12a50fb760d97b71c44388c7d764edd2c6bc..4e081af1f59940ec09d5bfa5f7ea1d2409e2fdeb 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "8QM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.17",
+      "ip6": "fe80::862b:2bff:fe70:f692",
       "mac": "84:2b:2b:70:f6:92",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-17.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/21",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.17",
       "mac": "84:2b:2b:70:f6:93",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-17-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/21",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.117",
       "mac": "84:2b:2b:70:f6:94",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-17-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-17-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2394000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
index 6efafe84a64f9cb7da44454213cd17e2a80d47f5..2ba6a0bb2908c0eadf5b561cf428674c49578d97 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "GQM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.18",
+      "ip6": "fe80::862b:2bff:fe72:d789",
       "mac": "84:2b:2b:72:d7:89",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-18.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/24",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.18",
       "mac": "84:2b:2b:72:d7:8a",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-18-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/24",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.118",
       "mac": "84:2b:2b:72:d7:8b",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-18-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-18-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2394000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
index 2fc1e07706214c089608bb400f36a50033c08a6a..3aba8371eb51e9a4b0923593abbb93aebeebf9b7 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "1RM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.19",
+      "ip6": "fe80::862b:2bff:fe70:c621",
       "mac": "84:2b:2b:70:c6:21",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-19.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/28",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.19",
       "mac": "84:2b:2b:70:c6:22",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-19-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/28",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.119",
       "mac": "84:2b:2b:70:c6:23",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-19-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-19-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
index bfd5f7ec695a98dd83a29ea6fb18d2eb611c78ee..f0715dc2192b838d9b837301990609be8d80939e 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "8RM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.2",
+      "ip6": "fe80::862b:2bff:fe70:4f4c",
       "mac": "84:2b:2b:70:4f:4c",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-2.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/9",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.2",
       "mac": "84:2b:2b:70:4f:4d",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-2-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/9",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.102",
       "mac": "84:2b:2b:70:4f:4e",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-2-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-2-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2394000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
index 8f75cfffb44b8565605acc1ad97741d74017e739..f6aceef16a623aad5ee15d8c3b56eb1c76924d0c 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "7RM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.20",
+      "ip6": "fe80::862b:2bff:fe70:c3d5",
       "mac": "84:2b:2b:70:c3:d5",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-20.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/27",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.20",
       "mac": "84:2b:2b:70:c3:d6",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-20-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/27",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.120",
       "mac": "84:2b:2b:70:c3:d7",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-20-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-20-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2394000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
index 97f8fc59bd4b04ae7dcd8ef01781729efa648cf9..e0de0c5ecbc7d3f6a4691d9d997a89ad65ac02aa 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "2RM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.3",
+      "ip6": "fe80::862b:2bff:fe70:c621",
       "mac": "84:2b:2b:70:4e:1e",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-3.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/8",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.3",
       "mac": "84:2b:2b:70:4e:1f",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-3-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/8",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.103",
       "mac": "84:2b:2b:70:4e:20",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-3-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-3-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
index 6970936ce2bacb020f4b1035888fe70d414079b1..bd5b038b4e532b0a59869d430f98dce800034122 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "3RM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.4",
+      "ip6": "fe80::862b:2bff:fe70:c621",
       "mac": "84:2b:2b:70:cc:89",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-4.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/11",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.4",
       "mac": "84:2b:2b:70:cc:8a",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-4-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/11",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.104",
       "mac": "84:2b:2b:70:cc:8b",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-4-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-4-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
index d9ce9bf68c4fed11f7133c7b6f72b68fd194909d..1d307aa76e7d90ada180b36edaf655f42761abd2 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "6RM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.5",
+      "ip6": "fe80::862b:2bff:fe70:cc92",
       "mac": "84:2b:2b:70:cc:92",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-5.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/10",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.5",
       "mac": "84:2b:2b:70:cc:93",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-5-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/10",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.105",
       "mac": "84:2b:2b:70:cc:94",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-5-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-5-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2394000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
index ce3a1810daa665a0483d83ab82502c0428ed8d9e..202372041ab931e9a8ebf3dc01459e1a616f4e7e 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "FQM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.6",
+      "ip6": "fe80::862b:2bff:fe72:d59e",
       "mac": "84:2b:2b:72:d5:9e",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-6.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/12",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.6",
       "mac": "84:2b:2b:72:d5:9f",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-6-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/12",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.106",
       "mac": "84:2b:2b:72:d5:a0",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-6-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-6-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2394000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
index 1c7bfb4cf50ae95faed7737d1c5753bffe6d362c..487663f147ea83f59fd8f180de25e85e3536898a 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "5RM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.7",
+      "ip6": "fe80::862b:2bff:fe72:b344",
       "mac": "84:2b:2b:72:b3:44",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-7.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/14",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.7",
       "mac": "84:2b:2b:72:b3:45",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-7-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/14",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.107",
       "mac": "84:2b:2b:72:b3:46",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-7-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-7-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
index f9c84efa3500983878a9414cd1a69bbd036c4e4b..f978e4a2079de1fe3a28cc0aacbdc7f8f09ae056 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "CRM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.8",
+      "ip6": "fe80::862b:2bff:fe72:dac3",
       "mac": "84:2b:2b:72:da:c3",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-8.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/13",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.8",
       "mac": "84:2b:2b:72:da:c4",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-8-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/13",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.108",
       "mac": "84:2b:2b:72:da:c5",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-8-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-8-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2394000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
index b06cacdedafc7df11e20d6b85c55fde27ab95ab2..026f532a791d0452eefeeb2a2bcd7a873fb988dc 100644
--- a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
@@ -4,11 +4,21 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "10/22/2010",
+    "vendor": "Dell Inc.",
+    "version": "1.5.3"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R410",
+    "serial": "4RM1Z4J"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16850722816,
     "virtual_size": null
   },
   "monitoring": {
@@ -22,6 +32,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.33.9",
+      "ip6": "fe80::862b:2bff:fe70:c621",
       "mac": "84:2b:2b:72:cb:e3",
       "management": false,
       "mountable": true,
@@ -29,45 +40,44 @@
       "network_address": "chimint-9.lille.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-lille",
+      "switch_port": "Gi3/15",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "bridged": false,
       "device": "eth1",
       "driver": "bnx2",
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "172.17.33.9",
       "mac": "84:2b:2b:72:cb:e4",
       "management": false,
       "mountable": true,
       "mounted": false,
-      "network_address": "chimint-9-eth0.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "switch_port": "Gi3/15",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5716"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.33.109",
       "mac": "84:2b:2b:72:cb:e5",
       "management": true,
       "mountable": false,
-      "network_address": "chimint-9-ipmi.lille.grid5000.fr",
+      "mounted": false,
+      "network_address": "chimint-9-impi.lille.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-lille",
-      "vendor": "Dell",
-      "version": "1.54"
+      "switch": null,
+      "switch_port": null
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "2.6.32-5-amd64",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": "6.0.6"
   },
   "performance": {
     "core_flops": 7456000000,
@@ -75,22 +85,27 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2400000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 12582912,
+    "clock_speed": 2393000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
     "vendor": "Intel",
     "version": "E5620"
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "megaraid_sas",
       "interface": "SATA",
+      "model": "PERC H700",
       "raid": "0",
-      "size": 279396772384.644
+      "rev": 2.1,
+      "size": 292326211584,
+      "vendor": "DELL"
     }
   ],
   "supported_job_types": {
diff --git a/generators/input/sites/lille/clusters/chimint.rb b/generators/input/sites/lille/clusters/chimint.rb
index 8757b0f1db3327cb1ffec6d5e708597923cc41e2..a7a5df496a75183596222079594f6ad3ba6d6fab 100644
--- a/generators/input/sites/lille/clusters/chimint.rb
+++ b/generators/input/sites/lille/clusters/chimint.rb
@@ -4,100 +4,133 @@ site :lille do |site_uid|
     model "Dell PowerEdge R410"
     created_at Time.parse("2011-03-25").httpdate
     kavlan true
+
     20.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
+
         performance({
-         :core_flops => 7456000000,
-         :node_flops => 55610000000
+        :core_flops => 7456000000,
+        :node_flops => 55610000000
+      })
+
+        supported_job_types({
+          :deploy       => true,
+          :besteffort   => true,
+          :virtual      => lookup('chimint', node_uid, 'supported_job_types', 'virtual')
         })
+
         architecture({
-          :smp_size => 2,
-          :smt_size => 8,
-          :platform_type => "x86_64"
+          :smp_size       => lookup('chimint', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('chimint', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('chimint', node_uid, 'architecture', 'platform_type')
         })
+
         processor({
-          :vendor => "Intel",
-          :model => "Intel Xeon",
-          :version => "E5620",
-          :clock_speed => 2.4.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 12.MiB
+          :vendor             => lookup('chimint', node_uid, 'processor', 'vendor'),
+          :model              => lookup('chimint', node_uid, 'processor', 'model'),
+          :version            => lookup('chimint', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('chimint', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('chimint', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('chimint', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('chimint', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('chimint', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('chimint', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('chimint', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('chimint', node_uid, 'processor', 'cache_l3')
         })
+
         main_memory({
-          :ram_size => 16.GiB, # bytes
+          :ram_size     => lookup('chimint', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
+
         operating_system({
-          :name => "Debian",
-          :release => "6.0",
-          :version => nil,
-          :kernel => "2.6.32"
+          :name     => lookup('chimint', node_uid, 'operating_system', 'name'),
+          :release  => "Squeeze",
+          :version  => lookup('chimint', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('chimint', node_uid, 'operating_system', 'kernel')
         })
-        storage_devices [
-          {:interface => 'SATA',
-            :size => 300.GB,
-            :driver => "megaraid_sas",
-          :raid => "0"}
-        ]
+
+        storage_devices [{
+          :interface  => 'SATA',
+          :size       => lookup('chimint', node_uid, 'block_devices', 'sda', 'size'),
+          :driver     => "megaraid_sas",
+          :device     => lookup('chimint', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('chimint', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('chimint', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('chimint', node_uid, 'block_devices', 'sda', 'rev'),
+          :raid       => "0"
+        }]
+
         network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :mac => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :vendor => 'Broadcom',
-          :version => 'NetXtreme II BCM5716',
-          :enabled => true,
-          :management => false,
-          :mountable => true,
-          :driver => 'bnx2',
-          :mounted => true,
-          :bridged => true,
-          :device => 'eth0',
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :switch => 'gw-lille'
-        },{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :mac => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :vendor => 'Broadcom',
-          :version => 'NetXtreme II BCM5716',
-          :enabled => true,
-          :management => false,
-          :mountable => true,
-          :driver => 'bnx2',
-          :mounted => false,
-          :device => 'eth1',
-          :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :switch => 'gw-lille',
-          :switch_port => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'switch_port')
-        },{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :mac => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :vendor => 'Dell',
-          :version => '1.54',
-          :enabled => true,
-          :management => true,
-          :mountable => false,
-          :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :switch => 'gw-lille'
+          :interface        => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => 1.G,
+          :enabled          => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :bridged          => true,
+          :device           => "eth0",
+          :vendor           => 'Broadcom',
+          :version          => 'NetXtreme II BCM5716',
+          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
+          :switch           => 'gw-lille',
+          :ip               => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch_port      => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :driver           => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :mac              => lookup('chimint', node_uid, 'network_interfaces', 'eth0', 'mac')
+        },
+        {
+          :interface        => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'rate'),
+          :enabled          => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :bridged          => false,
+          :device           => "eth1",
+          :vendor           => 'Broadcom',
+          :version          => 'NetXtreme II BCM5716',
+          :driver           => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('chimint', node_uid, 'network_interfaces', 'eth1', 'mac')
+        },
+        {
+          :interface            => 'Ethernet',
+          :rate                 => 1.G,
+          :network_address      => "#{node_uid}-impi.#{site_uid}.grid5000.fr",
+          :ip                   => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :switch               => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
+          :switch_port          => lookup('chimint', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
+          :enabled              => true,
+          :mounted              => false,
+          :mountable            => false,
+          :management           => true,
+          :device               => "bmc",
         }]
-          gpu({
+
+        chassis({
+          :serial       => lookup('chimint', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('chimint', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('chimint', node_uid, 'chassis', 'manufacturer')
+        })
+
+        bios({
+          :version      => lookup('chimint', node_uid, 'bios', 'version'),
+          :vendor       => lookup('chimint', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('chimint', node_uid, 'bios', 'release_date')
+        })
+
+        gpu({
           :gpu  => false
-           })
+        })
 
         monitoring({
           :wattmeter  => false
         })
+
       end
     end
   end # cluster chimint
-
 end
diff --git a/generators/input/sites/lille/clusters/chimint.yaml b/generators/input/sites/lille/clusters/chimint.yaml
index 252c923779237963242f94d187205425f98b3857..5b48ea6cba32e1e8f2d1cb6c1f1b249a69ef9d49 100644
--- a/generators/input/sites/lille/clusters/chimint.yaml
+++ b/generators/input/sites/lille/clusters/chimint.yaml
@@ -1,520 +1,1301 @@
+---
 chimint-1:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: PERC H700
+      device: sda
+      size: 292326211584
+      rev: 2.1
+      vendor: DELL
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:d4:81
-      ip: 172.17.33.101
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:d4:7f
+      ip6: fe80::862b:2bff:fe72:d47f
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.1
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/7
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:d4:80
-      ip: 172.17.33.1
-      switch_port: Gi3/7
+      ip6: fe80::862b:2bff:fe72:d480
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:d4:81
+      ip: 172.17.33.101
+  supported_job_types:
+    virtual: ivt
   chassis:
     serial_number: DQM1Z4J
     manufacturer: Dell Inc.
     product_name: PowerEdge R410
-  block_devices:
-    sda:
-      model: PERC H700
-      size: 570949632
-      rev: 2.10
-      vendor: DELL
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-2:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: PERC H700
+      device: sda
+      size: 292326211584
+      rev: 2.1
+      vendor: DELL
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:70:4f:4e
-      ip: 172.17.33.102
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:70:4f:4c
+      ip6: fe80::862b:2bff:fe70:4f4c
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.2
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/9
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:70:4f:4d
-      ip: 172.17.33.2
-      switch_port: Gi3/9
+      ip6: fe80::862b:2bff:fe70:4f4d
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:70:4f:4e
+      ip: 172.17.33.102
   chassis:
     serial_number: 8RM1Z4J
     manufacturer: Dell Inc.
     product_name: PowerEdge R410
-  block_devices:
-    sda:
-      model: PERC H700
-      size: 570949632
-      rev: 2.10
-      vendor: DELL
+  supported_job_types:
+    virtual: ivt
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2394000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  main_memory:
+    ram_size: 16850722816
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-3:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:70:4e:20
-      ip: 172.17.33.103
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:70:4e:1e
+      ip6: fe80::862b:2bff:fe70:c621
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.3
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/8
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:70:4e:1f
-      ip: 172.17.33.3
-      switch_port: Gi3/8
-  chassis:
-    serial_number: 2RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe70:c622
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:70:4e:20
+      ip: 172.17.33.103
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: 2RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-4:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:70:cc:8b
-      ip: 172.17.33.104
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:70:cc:89
+      ip6: fe80::862b:2bff:fe70:c621
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.4
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/11
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:70:cc:8a
-      ip: 172.17.33.4
-      switch_port: Gi3/11
-  chassis:
-    serial_number: 3RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe70:c622
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:70:cc:8b
+      ip: 172.17.33.104
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: 3RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-5:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  block_devices:
+    sda:
+      model: PERC H700
+      device: sda
+      size: 292326211584
+      rev: 2.1
+      vendor: DELL
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:70:cc:94
-      ip: 172.17.33.105
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:70:cc:92
+      ip6: fe80::862b:2bff:fe70:cc92
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.5
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/10
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:70:cc:93
-      ip: 172.17.33.5
-      switch_port: Gi3/10
+      ip6: fe80::862b:2bff:fe70:cc93
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:70:cc:94
+      ip: 172.17.33.105
   chassis:
     serial_number: 6RM1Z4J
     manufacturer: Dell Inc.
     product_name: PowerEdge R410
-  block_devices:
-    sda:
-      model: PERC H700
-      size: 570949632
-      rev: 2.10
-      vendor: DELL
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2394000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-6:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  block_devices:
+    sda:
+      model: PERC H700
+      device: sda
+      size: 292326211584
+      rev: 2.1
+      vendor: DELL
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:d5:a0
-      ip: 172.17.33.106
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:d5:9e
+      ip6: fe80::862b:2bff:fe72:d59e
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.6
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/12
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:d5:9f
-      ip: 172.17.33.6 
-      switch_port: Gi3/12
+      ip6: fe80::862b:2bff:fe72:d59f
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:d5:a0
+      ip: 172.17.33.106
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  supported_job_types:
+    virtual: ivt
   chassis:
     serial_number: FQM1Z4J
     manufacturer: Dell Inc.
     product_name: PowerEdge R410
-  block_devices:
-    sda:
-      model: PERC H700
-      size: 570949632
-      rev: 2.10
-      vendor: DELL
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2394000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  main_memory:
+    ram_size: 16850722816
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-7:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:b3:46
-      ip: 172.17.33.107
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:b3:44
+      ip6: fe80::862b:2bff:fe72:b344
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.7
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/14
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:b3:45
-      ip: 172.17.33.7
-      switch_port: Gi3/14
-  chassis:
-    serial_number: 5RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe72:b345
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:b3:46
+      ip: 172.17.33.107
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  chassis:
+    serial_number: 5RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  supported_job_types:
+    virtual: ivt
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  main_memory:
+    ram_size: 16850722816
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-8:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: PERC H700
+      device: sda
+      size: 292326211584
+      rev: 2.1
+      vendor: DELL
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:da:c5
-      ip: 172.17.33.108
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:da:c3
+      ip6: fe80::862b:2bff:fe72:dac3
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.8
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/13
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:da:c4
-      ip: 172.17.33.8
-      switch_port: Gi3/13
+      ip6: fe80::862b:2bff:fe72:dac4
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:da:c5
+      ip: 172.17.33.108
   chassis:
     serial_number: CRM1Z4J
     manufacturer: Dell Inc.
     product_name: PowerEdge R410
-  block_devices:
-    sda:
-      model: PERC H700
-      size: 570949632
-      rev: 2.10
-      vendor: DELL
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2394000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-9:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:cb:e5
-      ip: 172.17.33.109
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:cb:e3
+      ip6: fe80::862b:2bff:fe70:c621
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.9
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/15
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:cb:e4
-      ip: 172.17.33.9  
-      switch_port: Gi3/15
-  chassis:
-    serial_number: 4RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe70:c622
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:cb:e5
+      ip: 172.17.33.109
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: 4RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-10:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:d4:4b
-      ip: 172.17.33.110
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:d4:49
+      ip6: fe80::862b:2bff:fe72:d449
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.10
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/16
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:d4:4a
-      ip: 172.17.33.10
-      switch_port: Gi3/16
-  chassis:
-    serial_number: 9QM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe72:d44a
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:d4:4b
+      ip: 172.17.33.110
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  supported_job_types:
+    virtual: ivt
+  chassis:
+    serial_number: 9QM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-11:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:70:c9:9f
-      ip: 172.17.33.111
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:70:c9:9d
+      ip6: fe80::862b:2bff:fe70:c99d
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.11
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/17
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:70:c9:9e
-      ip: 172.17.33.11
-      switch_port: Gi3/17
-  chassis:
-    serial_number: BRM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe70:c99e
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:70:c9:9f
+      ip: 172.17.33.111
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  supported_job_types:
+    virtual: ivt
+  chassis:
+    serial_number: BRM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2394000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  main_memory:
+    ram_size: 16850722816
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-12:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:d5:ec
-      ip: 172.17.33.112
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:d5:ea
+      ip6: fe80::862b:2bff:fe70:c621
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.12
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/18
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:d5:eb
-      ip: 172.17.33.12
-      switch_port: Gi3/18
-  chassis:
-    serial_number: BQM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe70:c622
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:d5:ec
+      ip: 172.17.33.112
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: BQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-13:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:71:f1:26
-      ip: 172.17.33.113
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:71:f1:24
+      ip6: fe80::862b:2bff:fe70:c621
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.13
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/19
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:71:f1:25
-      ip: 172.17.33.13
-      switch_port: Gi3/19
-  chassis:
-    serial_number: 9RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe70:c622
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:71:f1:26
+      ip: 172.17.33.113
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: 9RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-14:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: PERC H700
+      device: sda
+      size: 292326211584
+      rev: 2.1
+      vendor: DELL
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:d5:69
-      ip: 172.17.33.114
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:d5:67
+      ip6: fe80::862b:2bff:fe72:d567
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.14
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/20
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:d5:68
-      ip: 172.17.33.14
-      switch_port: Gi3/20
+      ip6: fe80::862b:2bff:fe72:d568
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:d5:69
+      ip: 172.17.33.114
+  supported_job_types:
+    virtual: ivt
   chassis:
     serial_number: CQM1Z4J
     manufacturer: Dell Inc.
     product_name: PowerEdge R410
-  block_devices:
-    sda:
-      model: PERC H700
-      size: 570949632
-      rev: 2.10
-      vendor: DELL
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  main_memory:
+    ram_size: 16850722816
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-15:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  block_devices:
+    sda:
+      model: PERC H700
+      device: sda
+      size: 292326211584
+      rev: 2.1
+      vendor: DELL
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:d7:7c
-      ip: 172.17.33.115
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:d7:7a
+      ip6: fe80::862b:2bff:fe72:d77a
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.15
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/23
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:d7:7b
-      ip: 172.17.33.15
-      switch_port: Gi3/23
+      ip6: fe80::862b:2bff:fe72:d77b
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:d7:7c
+      ip: 172.17.33.115
+  supported_job_types:
+    virtual: ivt
   chassis:
     serial_number: HQM1Z4J
     manufacturer: Dell Inc.
     product_name: PowerEdge R410
-  block_devices:
-    sda:
-      model: PERC H700
-      size: 570949632
-      rev: 2.10
-      vendor: DELL
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-16:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:d5:dd
-      ip: 172.17.33.116
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:d5:db
+      ip6: fe80::862b:2bff:fe72:d5db
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.16
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/22
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:d5:dc
-      ip: 172.17.33.16
-      switch_port: Gi3/22
-  chassis:
-    serial_number: JQM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe72:d5dc
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:d5:dd
+      ip: 172.17.33.116
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  supported_job_types:
+    virtual: ivt
+  chassis:
+    serial_number: JQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2394000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  main_memory:
+    ram_size: 16850722816
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-17:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:70:f6:94
-      ip: 172.17.33.117
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:70:f6:92
+      ip6: fe80::862b:2bff:fe70:f692
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.17
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/21
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:70:f6:93
-      ip: 172.17.33.17
-      switch_port: Gi3/21
-  chassis:
-    serial_number: 8QM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe70:f693
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:70:f6:94
+      ip: 172.17.33.117
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  supported_job_types:
+    virtual: ivt
+  chassis:
+    serial_number: 8QM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2394000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-18:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  block_devices:
+    sda:
+      model: PERC H700
+      device: sda
+      size: 292326211584
+      rev: 2.1
+      vendor: DELL
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:72:d7:8b
-      ip: 172.17.33.118
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:72:d7:89
+      ip6: fe80::862b:2bff:fe72:d789
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.18
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/24
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:72:d7:8a
-      ip: 172.17.33.18
-      switch_port: Gi3/24
+      ip6: fe80::862b:2bff:fe72:d78a
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:72:d7:8b
+      ip: 172.17.33.118
   chassis:
     serial_number: GQM1Z4J
     manufacturer: Dell Inc.
     product_name: PowerEdge R410
-  block_devices:
-    sda:
-      model: PERC H700
-      size: 570949632
-      rev: 2.10
-      vendor: DELL
+  supported_job_types:
+    virtual: ivt
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2394000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  main_memory:
+    ram_size: 16850722816
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-19:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:70:c6:23
-      ip: 172.17.33.119
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:70:c6:21
+      ip6: fe80::862b:2bff:fe70:c621
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.19
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/28
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:70:c6:22
-      ip: 172.17.33.19
-      switch_port:  Gi3/28
-  chassis:
-    serial_number: 1RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe70:c622
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:70:c6:23
+      ip: 172.17.33.119
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
+  chassis:
+    serial_number: 1RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16850722816
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2393000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8
 chimint-20:
   bios:
     version: 1.5.3
-    vendor: Dell Inc.
     release_date: 10/22/2010
+    vendor: Dell Inc.
+  operating_system:
+    kernel: 2.6.32-5-amd64
+    name: debian
+    version: 6.0.6
   network_interfaces:
-    bmc:
-      mac: 84:2b:2b:70:c3:d7
-      ip: 172.17.33.120
     eth0:
+      mounted: true
+      rate: 1000000000
       mac: 84:2b:2b:70:c3:d5
+      ip6: fe80::862b:2bff:fe70:c3d5
+      management: false
+      enabled: true
+      interface: Ethernet
       ip: 172.16.33.20
+      driver: bnx2
+      mountable: true
+      switch_port: Gi3/27
     eth1:
+      mounted: false
+      rate: 1000000000
       mac: 84:2b:2b:70:c3:d6
-      ip: 172.17.33.20
-      switch_port: Gi3/27
-  chassis:
-    serial_number: 7RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
+      ip6: fe80::862b:2bff:fe70:c3d6
+      management: false
+      enabled: true
+      interface: Ethernet
+      driver: bnx2
+      mountable: true
+    bmc:
+      mac: 84:2b:2b:70:c3:d7
+      ip: 172.17.33.120
   block_devices:
     sda:
       model: PERC H700
-      size: 570949632
-      rev: 2.10
+      device: sda
+      size: 292326211584
+      rev: 2.1
       vendor: DELL
+  supported_job_types:
+    virtual: ivt
+  chassis:
+    serial_number: 7RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  processor:
+    model: Intel Xeon
+    cache_l1d: 32768
+    clock_speed: 2394000000
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    version: E5620
+    cache_l2: 262144
+    cache_l3: 12582912
+    vendor: Intel
+    instruction_set: x86-64
+    cache_l1i: 32768
+  main_memory:
+    ram_size: 16850722816
+  architecture:
+    smp_size: 2
+    platform_type: x86_64
+    smt_size: 8